Merge branch 'main' into feat/release-source-branch

Add a `sourceBranch` workflow_dispatch input (default `main`) and use it
as the checkout ref in `bump_version`, so a patch can be cut from a
`release/vX.Y` branch instead of always releasing from main.

.github/workflows/build-mobile.yml

@@ -106,7 +106,7 @@ jobs:
         working-directory: ./mobile
         run: printf "%s" $KEY_JKS | base64 -d > android/key.jks
 
-      - uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
+      - uses: actions/setup-java@0f481fcb613427c0f801b606911222b5b6f3083a # v5.5.0
         with:
           distribution: 'zulu'
           java-version: '17'
@@ -241,7 +241,7 @@ jobs:
         run: flutter build ios --config-only --no-codesign
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@003a5c4d8d6321bd302e38f6f0ec593f77f06600 # v1.319.0
+        uses: ruby/setup-ruby@d45b1a4e94b71acab930e56e79c6aa188764e7f9 # v1.316.0
         with:
           ruby-version: '3.3'
           bundler-cache: true

.github/workflows/check-openapi.yml

@@ -25,7 +25,7 @@ jobs:
           persist-credentials: false
 
       - name: Check for breaking API changes
-        uses: oasdiff/oasdiff-action/breaking@024f6c399f9a21ada1addb0f9a36ce1bfac995f1 # v0.1.6
+        uses: oasdiff/oasdiff-action/breaking@291b6594ce617f22f49af5898ee038ed0b46e8fe # v0.1.5
         with:
           base: https://raw.githubusercontent.com/${{ github.repository }}/main/open-api/immich-openapi-specs.json
           revision: open-api/immich-openapi-specs.json

.github/workflows/close-duplicates.yml

@@ -39,7 +39,7 @@ jobs:
     needs: [get_body, should_run]
     if: ${{ needs.should_run.outputs.should_run == 'true' }}
     container:
-      image: ghcr.io/immich-app/mdq:main@sha256:d603f5618c1fc9f2b4d506ffed54ba6bcfec83d56b893b5fa8b3f899a402fa0a
+      image: ghcr.io/immich-app/mdq:main@sha256:e3fe456f346b02c2f479462100763aee3ba8245768dfeac3c4262acb068e5c62
     outputs:
       checked: ${{ steps.get_checkbox.outputs.checked }}
     steps:

.github/workflows/codeql-analysis.yml

@@ -58,7 +58,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1
+        uses: github/codeql-action/init@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v4.37.0
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -71,7 +71,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@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1
+        uses: github/codeql-action/autobuild@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v4.37.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
@@ -84,6 +84,6 @@ jobs:
       #   ./location_of_script_within_repo/buildscript.sh
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1
+        uses: github/codeql-action/analyze@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v4.37.0
         with:
           category: '/language:${{matrix.language}}'

.github/workflows/prepare-release.yml

@@ -3,6 +3,11 @@ name: Prepare new release
 on:
   workflow_dispatch:
     inputs:
+      sourceBranch:
+        description: 'Branch to release from'
+        required: false
+        default: 'main'
+        type: string
       releaseType:
         description: 'Release type'
         required: true
@@ -65,7 +70,7 @@ jobs:
         with:
           token: ${{ steps.token.outputs.token }}
           persist-credentials: true
-          ref: main
+          ref: ${{ inputs.sourceBranch }}
 
       - name: Setup Mise
         uses: immich-app/devtools/actions/use-mise@3bca63ca3c15020293b36b51737a3ee2c773340b # use-mise-action-v3.1.0
@@ -152,7 +157,7 @@ jobs:
           github-token: ${{ steps.generate-token.outputs.token }}
 
       - name: Create draft release
-        uses: softprops/action-gh-release@3d0d9888cb7fd7b750713d6e236d1fcb99157228 # v3.0.2
+        uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3.0.1
         with:
           draft: true
           prerelease: ${{ needs.bump_version.outputs.rc }}

deployment/mise.toml

@@ -1,6 +1,6 @@
 [tools]
-terragrunt = "1.1.1"
-opentofu = "1.12.4"
+terragrunt = "1.0.3"
+opentofu = "1.11.6"
 
 [tasks."tg:fmt"]
 run = "terragrunt hclfmt"

deployment/modules/cloudflare/docs-release/.terraform.lock.hcl

@@ -2,35 +2,37 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.opentofu.org/cloudflare/cloudflare" {
-  version     = "4.52.8"
-  constraints = "4.52.8"
+  version     = "4.52.7"
+  constraints = "4.52.7"
   hashes = [
-    "h1:2uxVaMaGPDJljXqYzuD6xtyfOKdNudtGIgawRTkFJIs=",
-    "h1:34HL1GDpqYdn2iEC+85pCi+NddZf30qH3fJ8y3P6CAM=",
-    "h1:4Z+uD+YY/7HrqdypM7DyUK+RtWepoLBc9fqtRQYZx4I=",
-    "h1:8Ss6wlJL2BHvkIZU1iaHvyUntqNhPFZ0fl6mjsxhctc=",
-    "h1:AYeWWMTWaNg01N3hivxr/6YlG41j1RietMnft9vLjUI=",
-    "h1:BGRNOzo8NUgbx5RwpWkWmr38f/s3txb7mzQhqfM5blI=",
-    "h1:EEXRMdC8bPlpLuOU8u+dE8mFJe3BpquFdH6vXcKseY4=",
-    "h1:ENp29e6O6OnaHJlbtmRlyjlAmm3Wt4mGctWUpBY3d0g=",
-    "h1:IAtBAbGVe1npj/n1NvCIZkSYGl7qaPYT+FnVdZ2CZ00=",
-    "h1:QRGGKngrxLORr4CImKXLDDJL5s67zUNBDAgk6FIIFNk=",
-    "h1:bNql6cC+MfDbaJK3q7a8C1m3A21o7e5mrjBIGtk0RdI=",
-    "h1:gmNv+PEOkYDdu+c15bfpcoAE3EI7pgmov9RMf3GZLsI=",
-    "h1:yieZ7NWRYQcLYHUevzDDrrmDkoQICM+3ZeX4i/mw9ME=",
-    "zh:08b305329a680a9213b2d8e642fbce7e4d97a524b1d2cef59e190ba9d678c477",
-    "zh:47975bd711ee18a46e589822171fa87474a552b332bfc8dea8fd1a64504eed8d",
-    "zh:5640d0d226bbafff3395542456c29feb942ca9c55ac01b4245a34c0590a33363",
-    "zh:5b0ad839fafba938c60a95d6b4a865843643591e97573ed2b9c4af3754064f74",
+    "h1:+O72J3QYiZtYmYYZM/Eh0f4NNfl1BvjX1eju43qTQsQ=",
+    "h1:0oqjYIPXcXh7XiDiKI085cHDYQQ5mh8kDl9dmBtvtog=",
+    "h1:4b4ESb87MGv5bnadgYe7sK5rEkKMZhbkQcwPubQTsR4=",
+    "h1:6mTr3eA1Ddb348lLmJuyvn98z4KF+ejqaUEJ76D1rzQ=",
+    "h1:9/3YH+9k9HqsvFtbmBf7SO2+xqZeZrXNKzLkjNuhUEA=",
+    "h1:Jcq4tBWgyH4/2JsojNBSRaN0mcItVMchO+lynonrlqc=",
+    "h1:Y4Vv/2RdP0Q+uxqhOxzOdKxuuEMjXPDcU0vPc5bCQzI=",
+    "h1:a0gW8FBKsbP9Fi0HEDoy49WIbEWVHk9+BR4/iwuBdDQ=",
+    "h1:gElv6iqJtg8OKN77gbw+MjrkrQmJHPkkMEi1J+0xkpU=",
+    "h1:oslXUugD/NQ+duJgT4BhKQyfGbuFOANknMvR73fiOeM=",
+    "h1:pPItIWii5oymR+geZB219ROSPuSODPLTlM4S/u8xLvM=",
+    "h1:u67GWw8GwD9NDlDzp9Y5VRnSQGcCrE8rSpkGPaBpDl0=",
+    "h1:uUUa9dY0XQOycI8pxg16PFFtL0WCTi9uEJz8trTQ7pU=",
+    "h1:y3rV8KF2q6GEMANNlf5EkKJurlfbKlIKpjGcdxoy7pQ=",
+    "zh:0c904ce31a4c6c4a5b3bf7ff1560e77c0cc7e2450c8553ded8e8c90398e1418b",
+    "zh:36183d310c36373fe4cb936b83c595c6fd3b0a94bc7827f28e5789ccbf59752e",
+    "zh:556a568a6f0235e8f41647de9e4d3a1e7b1d6502df8b19b54ec441f1c653ea10",
+    "zh:633ebbd5b0245e75e500ef9be4d9e62288f97e8da3baaa51323892a786d90285",
+    "zh:6acfe60cf52a65ba8f044f748548d2119e7f4fd7f8ebcb14698960d87c68f529",
     "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f",
-    "zh:93a9bc1139f5c02a44fdbf51fb2ce0891e2a42033b66febb928ccf72e870408f",
-    "zh:977f75cdf365686aa16ae02dcc0fc1769bae6f86be6e165393756c940bfb4af0",
-    "zh:9afcda2660b3dc6ee6329acea532a719225bd1f6cf46f695feb2d77160847c1b",
-    "zh:9e3da67b1b05b03d1f0c18b8677edf3797815b5dd49629f10eb2f457dccbed30",
-    "zh:b8d7da230f5266367c1b6b1cf31aa39087e231a87d55b71bb9d5c854ca1fcfe6",
-    "zh:cc96e7cd7350456b7a11a53d1c76c73a542de8359f9750f637ff865e8e77be91",
-    "zh:da1f58d067def243047bb7178cb197e2b9c3a791a9eb380ad92b73290615ae29",
-    "zh:ed5f3e1f59a338bcdce0a2537a8a2f299cfe18c168626799b2a9c97af3d8d3cb",
-    "zh:f16cc31f73a58a26ffe2d93223eddb7c340623a4e2ef38c6091766fd611e3e11",
+    "zh:904acc31ebb9d6ef68c792074b30532ee61bf515f19e0a3c75b46f126cca1f13",
+    "zh:a1d0a81246afc8750286d3f6fe7a8fbe6460dd2662407b28dbfbabb612e5fa9d",
+    "zh:a41a36fe253fc365fe2b7ffc749624688b2693b4634862fda161179ab100029f",
+    "zh:a7ef269e77ffa8715c8945a2c14322c7ff159ea44c15f62505f3cbb2cae3b32d",
+    "zh:b01aa3bed30610633b762df64332b26f8844a68c3960cebcb30f04918efc67fe",
+    "zh:b069cc2cd18cae10757df3ae030508eac8d55de7e49eda7a5e3e11f2f7fe6455",
+    "zh:b2d2c6313729ebb7465dceece374049e2d08bda34473901be9ff46a8836d42b2",
+    "zh:db0e114edaf4bc2f3d4769958807c83022bfbc619a00bdf4c4bd17faa4ab2d8b",
+    "zh:ecc0aa8b9044f664fd2aaf8fa992d976578f78478980555b4b8f6148e8d1a5fe",
   ]
 }

deployment/modules/cloudflare/docs-release/config.tf

@@ -5,7 +5,7 @@ terraform {
   required_providers {
     cloudflare = {
       source = "cloudflare/cloudflare"
-      version = "4.52.8"
+      version = "4.52.7"
     }
   }
 }

deployment/modules/cloudflare/docs/.terraform.lock.hcl

@@ -2,35 +2,37 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.opentofu.org/cloudflare/cloudflare" {
-  version     = "4.52.8"
-  constraints = "4.52.8"
+  version     = "4.52.7"
+  constraints = "4.52.7"
   hashes = [
-    "h1:2uxVaMaGPDJljXqYzuD6xtyfOKdNudtGIgawRTkFJIs=",
-    "h1:34HL1GDpqYdn2iEC+85pCi+NddZf30qH3fJ8y3P6CAM=",
-    "h1:4Z+uD+YY/7HrqdypM7DyUK+RtWepoLBc9fqtRQYZx4I=",
-    "h1:8Ss6wlJL2BHvkIZU1iaHvyUntqNhPFZ0fl6mjsxhctc=",
-    "h1:AYeWWMTWaNg01N3hivxr/6YlG41j1RietMnft9vLjUI=",
-    "h1:BGRNOzo8NUgbx5RwpWkWmr38f/s3txb7mzQhqfM5blI=",
-    "h1:EEXRMdC8bPlpLuOU8u+dE8mFJe3BpquFdH6vXcKseY4=",
-    "h1:ENp29e6O6OnaHJlbtmRlyjlAmm3Wt4mGctWUpBY3d0g=",
-    "h1:IAtBAbGVe1npj/n1NvCIZkSYGl7qaPYT+FnVdZ2CZ00=",
-    "h1:QRGGKngrxLORr4CImKXLDDJL5s67zUNBDAgk6FIIFNk=",
-    "h1:bNql6cC+MfDbaJK3q7a8C1m3A21o7e5mrjBIGtk0RdI=",
-    "h1:gmNv+PEOkYDdu+c15bfpcoAE3EI7pgmov9RMf3GZLsI=",
-    "h1:yieZ7NWRYQcLYHUevzDDrrmDkoQICM+3ZeX4i/mw9ME=",
-    "zh:08b305329a680a9213b2d8e642fbce7e4d97a524b1d2cef59e190ba9d678c477",
-    "zh:47975bd711ee18a46e589822171fa87474a552b332bfc8dea8fd1a64504eed8d",
-    "zh:5640d0d226bbafff3395542456c29feb942ca9c55ac01b4245a34c0590a33363",
-    "zh:5b0ad839fafba938c60a95d6b4a865843643591e97573ed2b9c4af3754064f74",
+    "h1:+O72J3QYiZtYmYYZM/Eh0f4NNfl1BvjX1eju43qTQsQ=",
+    "h1:0oqjYIPXcXh7XiDiKI085cHDYQQ5mh8kDl9dmBtvtog=",
+    "h1:4b4ESb87MGv5bnadgYe7sK5rEkKMZhbkQcwPubQTsR4=",
+    "h1:6mTr3eA1Ddb348lLmJuyvn98z4KF+ejqaUEJ76D1rzQ=",
+    "h1:9/3YH+9k9HqsvFtbmBf7SO2+xqZeZrXNKzLkjNuhUEA=",
+    "h1:Jcq4tBWgyH4/2JsojNBSRaN0mcItVMchO+lynonrlqc=",
+    "h1:Y4Vv/2RdP0Q+uxqhOxzOdKxuuEMjXPDcU0vPc5bCQzI=",
+    "h1:a0gW8FBKsbP9Fi0HEDoy49WIbEWVHk9+BR4/iwuBdDQ=",
+    "h1:gElv6iqJtg8OKN77gbw+MjrkrQmJHPkkMEi1J+0xkpU=",
+    "h1:oslXUugD/NQ+duJgT4BhKQyfGbuFOANknMvR73fiOeM=",
+    "h1:pPItIWii5oymR+geZB219ROSPuSODPLTlM4S/u8xLvM=",
+    "h1:u67GWw8GwD9NDlDzp9Y5VRnSQGcCrE8rSpkGPaBpDl0=",
+    "h1:uUUa9dY0XQOycI8pxg16PFFtL0WCTi9uEJz8trTQ7pU=",
+    "h1:y3rV8KF2q6GEMANNlf5EkKJurlfbKlIKpjGcdxoy7pQ=",
+    "zh:0c904ce31a4c6c4a5b3bf7ff1560e77c0cc7e2450c8553ded8e8c90398e1418b",
+    "zh:36183d310c36373fe4cb936b83c595c6fd3b0a94bc7827f28e5789ccbf59752e",
+    "zh:556a568a6f0235e8f41647de9e4d3a1e7b1d6502df8b19b54ec441f1c653ea10",
+    "zh:633ebbd5b0245e75e500ef9be4d9e62288f97e8da3baaa51323892a786d90285",
+    "zh:6acfe60cf52a65ba8f044f748548d2119e7f4fd7f8ebcb14698960d87c68f529",
     "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f",
-    "zh:93a9bc1139f5c02a44fdbf51fb2ce0891e2a42033b66febb928ccf72e870408f",
-    "zh:977f75cdf365686aa16ae02dcc0fc1769bae6f86be6e165393756c940bfb4af0",
-    "zh:9afcda2660b3dc6ee6329acea532a719225bd1f6cf46f695feb2d77160847c1b",
-    "zh:9e3da67b1b05b03d1f0c18b8677edf3797815b5dd49629f10eb2f457dccbed30",
-    "zh:b8d7da230f5266367c1b6b1cf31aa39087e231a87d55b71bb9d5c854ca1fcfe6",
-    "zh:cc96e7cd7350456b7a11a53d1c76c73a542de8359f9750f637ff865e8e77be91",
-    "zh:da1f58d067def243047bb7178cb197e2b9c3a791a9eb380ad92b73290615ae29",
-    "zh:ed5f3e1f59a338bcdce0a2537a8a2f299cfe18c168626799b2a9c97af3d8d3cb",
-    "zh:f16cc31f73a58a26ffe2d93223eddb7c340623a4e2ef38c6091766fd611e3e11",
+    "zh:904acc31ebb9d6ef68c792074b30532ee61bf515f19e0a3c75b46f126cca1f13",
+    "zh:a1d0a81246afc8750286d3f6fe7a8fbe6460dd2662407b28dbfbabb612e5fa9d",
+    "zh:a41a36fe253fc365fe2b7ffc749624688b2693b4634862fda161179ab100029f",
+    "zh:a7ef269e77ffa8715c8945a2c14322c7ff159ea44c15f62505f3cbb2cae3b32d",
+    "zh:b01aa3bed30610633b762df64332b26f8844a68c3960cebcb30f04918efc67fe",
+    "zh:b069cc2cd18cae10757df3ae030508eac8d55de7e49eda7a5e3e11f2f7fe6455",
+    "zh:b2d2c6313729ebb7465dceece374049e2d08bda34473901be9ff46a8836d42b2",
+    "zh:db0e114edaf4bc2f3d4769958807c83022bfbc619a00bdf4c4bd17faa4ab2d8b",
+    "zh:ecc0aa8b9044f664fd2aaf8fa992d976578f78478980555b4b8f6148e8d1a5fe",
   ]
 }

deployment/modules/cloudflare/docs/config.tf

@@ -5,7 +5,7 @@ terraform {
   required_providers {
     cloudflare = {
       source = "cloudflare/cloudflare"
-      version = "4.52.8"
+      version = "4.52.7"
     }
   }
 }

docker/docker-compose.prod.yml

@@ -97,7 +97,7 @@ services:
     command: ['./run.sh', '-disable-reporting']
     ports:
       - 3000:3000
-    image: grafana/grafana:12.4.5-ubuntu@sha256:00396460e499415c828b7c298f19287c8a0f95e72412ee37ac11723655c2d6b9
+    image: grafana/grafana:12.4.4-ubuntu@sha256:df2e7ef5f32f771794cf76bad5f2bceac227036460a2cc269a9045e5662abc58
     volumes:
       - grafana-data:/var/lib/grafana
 

docs/docs/FAQ.mdx

@@ -409,7 +409,7 @@ To decrease Redis logs, you can add the following line to the `redis:` section o
 
 You can change the user in the container by setting the `user` argument in `docker-compose.yml` for each service.
 
-[Example docker-compose.rootless.yml file](https://github.com/immich-app/immich/blob/main/docker/docker-compose.rootless.yml)
+[Example docker-compose.yml file](https://github.com/immich-app/immich/blob/main/docker/docker-compose.rootless.yml)
 
 You may need to add mount points or docker volumes for the following internal container paths:
 

docs/docs/administration/server-commands.md

@@ -35,7 +35,6 @@ Found Admin:
 - Email=admin@example.com
 - Name=Immich Admin
 ? Please choose a new password (optional) immich-is-cool
-? Invalidate existing sessions? Yes
 The admin password has been updated.
 ```
 

e2e/src/specs/server/cli/upload.e2e-spec.ts

@@ -650,7 +650,7 @@ describe(`immich upload`, () => {
       ]);
 
       expect(stdout).toBe('');
-      expect(stderr).toEqual(`error: option '-n, --dry-run' cannot be used with option '--skip-hash'`);
+      expect(stderr).toEqual(`error: option '-n, --dry-run' cannot be used with option '-h, --skip-hash'`);
       expect(exitCode).not.toBe(0);
 
       const assets = await getAssetStatistics({}, { headers: asKeyAuth(key) });

e2e/src/specs/server/immich-admin/immich-admin.e2e-spec.ts

@@ -65,10 +65,6 @@ describe(`immich-admin`, () => {
       child.stdout.on('data', (chunk) => {
         data += chunk;
         if (data.includes('Please choose a new password (optional)')) {
-          child.stdin.write('\n');
-        }
-
-        if (data.includes('Invalidate existing sessions?')) {
           child.stdin.end('\n');
         }
       });

mise.lock

@@ -94,23 +94,6 @@ url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets
 version = "7.1.3-6"
 backend = "github:jellyfin/jellyfin-ffmpeg"
 
-[tools."github:jellyfin/jellyfin-ffmpeg".options]
-asset_pattern = "jellyfin-ffmpeg_*_portable_linuxarm64-gpl.tar.xz"
-
-[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.linux-arm64"]
-checksum = "sha256:bea03c670e8cc5bfe9edc0c5d624d4735421610cef5e808db93e7d8596952886"
-url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_linuxarm64-gpl.tar.xz"
-url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409048876"
-
-[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.linux-arm64-musl"]
-checksum = "sha256:bea03c670e8cc5bfe9edc0c5d624d4735421610cef5e808db93e7d8596952886"
-url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_linuxarm64-gpl.tar.xz"
-url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409048876"
-
-[[tools."github:jellyfin/jellyfin-ffmpeg"]]
-version = "7.1.3-6"
-backend = "github:jellyfin/jellyfin-ffmpeg"
-
 [tools."github:jellyfin/jellyfin-ffmpeg".options]
 asset_pattern = "jellyfin-ffmpeg_*_portable_linux64-gpl.tar.xz"
 
@@ -129,12 +112,17 @@ version = "7.1.3-6"
 backend = "github:jellyfin/jellyfin-ffmpeg"
 
 [tools."github:jellyfin/jellyfin-ffmpeg".options]
-asset_pattern = "jellyfin-ffmpeg_*_portable_mac64-gpl.tar.xz"
+asset_pattern = "jellyfin-ffmpeg_*_portable_linuxarm64-gpl.tar.xz"
 
-[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.macos-x64"]
-checksum = "sha256:066ede9774aaae97a18098aaeea8b7e0d286653eb8618f640476e99c59a536c2"
-url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_mac64-gpl.tar.xz"
-url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/408995889"
+[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.linux-arm64"]
+checksum = "sha256:bea03c670e8cc5bfe9edc0c5d624d4735421610cef5e808db93e7d8596952886"
+url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_linuxarm64-gpl.tar.xz"
+url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409048876"
+
+[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.linux-arm64-musl"]
+checksum = "sha256:bea03c670e8cc5bfe9edc0c5d624d4735421610cef5e808db93e7d8596952886"
+url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_linuxarm64-gpl.tar.xz"
+url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409048876"
 
 [[tools."github:jellyfin/jellyfin-ffmpeg"]]
 version = "7.1.3-6"
@@ -145,6 +133,18 @@ checksum = "sha256:7b7168149689610296f3a187c717056ce0786cc125a31caf28056737e9ba1
 url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_win64-clang-gpl.zip"
 url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409036094"
 
+[[tools."github:jellyfin/jellyfin-ffmpeg"]]
+version = "7.1.3-6"
+backend = "github:jellyfin/jellyfin-ffmpeg"
+
+[tools."github:jellyfin/jellyfin-ffmpeg".options]
+asset_pattern = "jellyfin-ffmpeg_*_portable_mac64-gpl.tar.xz"
+
+[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.macos-x64"]
+checksum = "sha256:066ede9774aaae97a18098aaeea8b7e0d286653eb8618f640476e99c59a536c2"
+url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_mac64-gpl.tar.xz"
+url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/408995889"
+
 [[tools."github:webassembly/binaryen"]]
 version = "version_124"
 backend = "github:webassembly/binaryen"
@@ -248,43 +248,43 @@ version = "7.5.0"
 backend = "npm:oazapfts"
 
 [[tools.opentofu]]
-version = "1.12.4"
+version = "1.11.6"
 backend = "aqua:opentofu/opentofu"
 
 [tools.opentofu."platforms.linux-arm64"]
-checksum = "sha256:dc7bfcd93ce9795a86c58fbf71efd013c39dcd1febb13c9cd3555c43b9c2403a"
-url = "https://github.com/opentofu/opentofu/releases/download/v1.12.4/tofu_1.12.4_linux_arm64.tar.gz"
-url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/475646678"
+checksum = "sha256:d4f2ab15776925864b049bb329d69682851de6f5204f256e9fa86d07a0308850"
+url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_linux_arm64.tar.gz"
+url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/391536382"
 
 [tools.opentofu."platforms.linux-arm64-musl"]
-checksum = "sha256:dc7bfcd93ce9795a86c58fbf71efd013c39dcd1febb13c9cd3555c43b9c2403a"
-url = "https://github.com/opentofu/opentofu/releases/download/v1.12.4/tofu_1.12.4_linux_arm64.tar.gz"
-url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/475646678"
+checksum = "sha256:d4f2ab15776925864b049bb329d69682851de6f5204f256e9fa86d07a0308850"
+url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_linux_arm64.tar.gz"
+url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/391536382"
 
 [tools.opentofu."platforms.linux-x64"]
-checksum = "sha256:81836d0f12b4fe9013b85586349f993def9429b6383bb77cdd6c2f3a9d9aac24"
-url = "https://github.com/opentofu/opentofu/releases/download/v1.12.4/tofu_1.12.4_linux_amd64.tar.gz"
-url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/475646677"
+checksum = "sha256:02800fafa2753a9f50c38483e2fdf5bc353fd62895eb9e25eec9a5145df3a69e"
+url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_linux_amd64.tar.gz"
+url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/391536401"
 
 [tools.opentofu."platforms.linux-x64-musl"]
-checksum = "sha256:81836d0f12b4fe9013b85586349f993def9429b6383bb77cdd6c2f3a9d9aac24"
-url = "https://github.com/opentofu/opentofu/releases/download/v1.12.4/tofu_1.12.4_linux_amd64.tar.gz"
-url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/475646677"
+checksum = "sha256:02800fafa2753a9f50c38483e2fdf5bc353fd62895eb9e25eec9a5145df3a69e"
+url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_linux_amd64.tar.gz"
+url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/391536401"
 
 [tools.opentofu."platforms.macos-arm64"]
-checksum = "sha256:7c06e4390d9ccd467773e37ff1c3d833c7ca0c24742cd9e9ad47284bea472247"
-url = "https://github.com/opentofu/opentofu/releases/download/v1.12.4/tofu_1.12.4_darwin_arm64.tar.gz"
-url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/475646544"
+checksum = "sha256:62d7fa8539e13b444827aa0a3b90c5972da5c47e8f8882d9dcf2e430e78840c1"
+url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_darwin_arm64.tar.gz"
+url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/391536399"
 
 [tools.opentofu."platforms.macos-x64"]
-checksum = "sha256:ead1d2ce643addb4ffeb93240b9377ae1c2fd793a6bd22d65922ac37adfdf546"
-url = "https://github.com/opentofu/opentofu/releases/download/v1.12.4/tofu_1.12.4_darwin_amd64.tar.gz"
-url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/475646688"
+checksum = "sha256:1408cdef1c380f914565e6b4bb70794c6b163f195fcb233357f3d6c5745906b6"
+url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_darwin_amd64.tar.gz"
+url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/391536384"
 
 [tools.opentofu."platforms.windows-x64"]
-checksum = "sha256:a4d86a07755c8d151f20f945e6cfb5b40deeed942af36a9bd385c5c2e965d5dd"
-url = "https://github.com/opentofu/opentofu/releases/download/v1.12.4/tofu_1.12.4_windows_amd64.tar.gz"
-url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/475646543"
+checksum = "sha256:27323f70c875b8251bfd7e61a4cffc3ebff4e56ed1e611b955016f0c7077367e"
+url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_windows_amd64.tar.gz"
+url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/391536406"
 
 [[tools.pnpm]]
 version = "11.13.1"
@@ -327,40 +327,40 @@ url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/478563981"
 provenance = "github-attestations"
 
 [[tools.terragrunt]]
-version = "1.1.1"
+version = "1.0.3"
 backend = "aqua:gruntwork-io/terragrunt"
 
 [tools.terragrunt."platforms.linux-arm64"]
-checksum = "sha256:a374a7993ff3d99665a7e014007d3647ec7f0465c9d55c85e9f94c932e73cea2"
-url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.1.1/terragrunt_linux_arm64.tar.gz"
-url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/476786148"
+checksum = "sha256:e5b60ab05b5214db694e6bc215d8124fb626e277cdb56b86f6147ae110d510fe"
+url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.0.3/terragrunt_linux_arm64.tar.gz"
+url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/406654253"
 
 [tools.terragrunt."platforms.linux-arm64-musl"]
-checksum = "sha256:a374a7993ff3d99665a7e014007d3647ec7f0465c9d55c85e9f94c932e73cea2"
-url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.1.1/terragrunt_linux_arm64.tar.gz"
-url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/476786148"
+checksum = "sha256:e5b60ab05b5214db694e6bc215d8124fb626e277cdb56b86f6147ae110d510fe"
+url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.0.3/terragrunt_linux_arm64.tar.gz"
+url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/406654253"
 
 [tools.terragrunt."platforms.linux-x64"]
-checksum = "sha256:ce90077ac31ef17a2ba10d11d45f36c6501997a8f4f79d703bb7daba37032f53"
-url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.1.1/terragrunt_linux_amd64.tar.gz"
-url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/476785968"
+checksum = "sha256:6d48049baf82e0bf9c804368dc85cbfeadc10955e33777e9e8de3e020b94b073"
+url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.0.3/terragrunt_linux_amd64.tar.gz"
+url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/406654196"
 
 [tools.terragrunt."platforms.linux-x64-musl"]
-checksum = "sha256:ce90077ac31ef17a2ba10d11d45f36c6501997a8f4f79d703bb7daba37032f53"
-url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.1.1/terragrunt_linux_amd64.tar.gz"
-url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/476785968"
+checksum = "sha256:6d48049baf82e0bf9c804368dc85cbfeadc10955e33777e9e8de3e020b94b073"
+url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.0.3/terragrunt_linux_amd64.tar.gz"
+url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/406654196"
 
 [tools.terragrunt."platforms.macos-arm64"]
-checksum = "sha256:9ec8f678b9ae6c81d5d9d77b94cbf6349ce639d5938694b4adc9dea73e416794"
-url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.1.1/terragrunt_darwin_arm64.tar.gz"
-url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/476785628"
+checksum = "sha256:aacb5be2ca5475300cbce246dfbd8a45eb47510fbaa70fab8561c49ef5db03aa"
+url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.0.3/terragrunt_darwin_arm64.tar.gz"
+url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/406654084"
 
 [tools.terragrunt."platforms.macos-x64"]
-checksum = "sha256:73e768a69fa44a60f9d9174f54aaf179327e08706f633c9c79d5f5c9622c91c2"
-url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.1.1/terragrunt_darwin_amd64.tar.gz"
-url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/476785520"
+checksum = "sha256:3133c2251e191aede8e3dd2a5b3aee2e91c5f08f88f117aee40eed9a24c8ef6b"
+url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.0.3/terragrunt_darwin_amd64.tar.gz"
+url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/406653970"
 
 [tools.terragrunt."platforms.windows-x64"]
-checksum = "sha256:dd50a324691e072a3ac879e9ec43d6310e2936c929fda658eb2811fefcc75115"
-url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.1.1/terragrunt_windows_amd64.exe.tar.gz"
-url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/476786421"
+checksum = "sha256:183b2745b4e04980a6bfa4450ff81956a12596ca22d70f7aaa793980f5b036db"
+url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.0.3/terragrunt_windows_amd64.exe.tar.gz"
+url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/406654412"

mise.toml

@@ -1,4 +1,4 @@
-monorepo_root = true
+experimental_monorepo_root = true
 
 [monorepo]
 config_roots = [
@@ -17,8 +17,8 @@ config_roots = [
 [tools]
 node = "24.15.0"
 pnpm = "11.13.1"
-terragrunt = "1.1.1"
-opentofu = "1.12.4"
+terragrunt = "1.0.3"
+opentofu = "1.11.6"
 "npm:oazapfts" = "7.5.0"
 "github:extism/cli" = "1.6.3"
 "github:webassembly/binaryen" = "version_124"
@@ -35,6 +35,7 @@ macos-x64 = { asset_pattern = "jellyfin-ffmpeg_*_portable_mac64-gpl.tar.xz" }
 macos-arm64 = { asset_pattern = "jellyfin-ffmpeg_*_portable_macarm64-gpl.tar.xz" }
 
 [settings]
+experimental = true
 pin = true
 lockfile = true
 

mobile/ios/WidgetExtension/ImmichAPI.swift

@@ -203,10 +203,7 @@ class ImmichAPI {
 
   func fetchMemory(for date: Date) async throws -> [MemoryResult] {
     // get URL
-    let localDay = date.formatted(
-      Date.ISO8601FormatStyle(timeZone: .current).year().month().day().dateSeparator(.dash)
-    )
-    let memoryParams = [URLQueryItem(name: "for", value: localDay)]
+    let memoryParams = [URLQueryItem(name: "for", value: date.ISO8601Format())]
     guard
       let searchURL = buildRequestURL(
         serverConfig: serverConfig,

mobile/lib/constants/enums.dart

@@ -9,6 +9,8 @@ enum SortOrder {
 
 enum TextSearchType { context, filename, description, ocr }
 
+enum AssetVisibilityEnum { timeline, hidden, archive, locked }
+
 enum ActionSource { timeline, viewer }
 
 enum ShareAssetType { original, preview }

mobile/lib/constants/locales.dart

@@ -6,7 +6,6 @@ const Map<String, Locale> locales = {
   // Additional locales
   'Arabic (ar)': Locale('ar'),
   'Basque (eu)': Locale('eu'),
-  'Belarusian (be)': Locale('be'),
   'Bosnian (bl)': Locale('bn'),
   'Brazilian Portuguese (pt_BR)': Locale('pt', 'BR'),
   'Bulgarian (bg)': Locale('bg'),

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

@@ -24,12 +24,6 @@ class ViewerReloadAssetEvent extends Event {
   const ViewerReloadAssetEvent();
 }
 
-class ViewerStackAssetDeletedEvent extends Event {
-  final int stackIndex;
-
-  const ViewerStackAssetDeletedEvent({required this.stackIndex});
-}
-
 // Multi-Select Events
 class MultiSelectToggleEvent extends Event {
   final bool isEnabled;

mobile/lib/domain/models/settings_key.dart

@@ -1,16 +1,17 @@
+import 'dart:convert';
+
 import 'package:flutter/material.dart';
 import 'package:immich_mobile/constants/colors.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
-import 'package:immich_mobile/domain/models/value_codec.dart';
 import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
 import 'package:immich_mobile/utils/semver.dart';
 
 enum SettingsKey<T> {
   // Theme
-  themePrimaryColor<ImmichColorPreset>(codec: EnumCodec(ImmichColorPreset.values)),
-  themeMode<ThemeMode>(codec: EnumCodec(ThemeMode.values)),
+  themePrimaryColor<ImmichColorPreset>(codec: _EnumCodec(ImmichColorPreset.values)),
+  themeMode<ThemeMode>(codec: _EnumCodec(ThemeMode.values)),
   themeDynamic<bool>(),
   themeColorfulInterface<bool>(),
 
@@ -26,13 +27,13 @@ enum SettingsKey<T> {
 
   // Network
   networkAutoEndpointSwitching<bool>(),
-  networkExternalEndpointList<List<String>>(codec: ListCodec(PrimitiveCodec.string)),
-  networkCustomHeaders<Map<String, String>>(codec: MapCodec(PrimitiveCodec.string, PrimitiveCodec.string)),
   networkPreferredWifiName<String?>(),
   networkLocalEndpoint<String?>(),
+  networkExternalEndpointList<List<String>>(codec: _ListCodec(_PrimitiveCodec.string)),
+  networkCustomHeaders<Map<String, String>>(codec: _MapCodec(_PrimitiveCodec.string, _PrimitiveCodec.string)),
 
   // Album
-  albumSortMode<AlbumSortMode>(codec: EnumCodec(AlbumSortMode.values)),
+  albumSortMode<AlbumSortMode>(codec: _EnumCodec(AlbumSortMode.values)),
   albumIsReverse<bool>(),
   albumIsGrid<bool>(),
 
@@ -46,45 +47,195 @@ enum SettingsKey<T> {
 
   // Timeline
   timelineTilesPerRow<int>(),
-  timelineGroupAssetsBy<GroupAssetsBy>(codec: EnumCodec(GroupAssetsBy.values)),
+  timelineGroupAssetsBy<GroupAssetsBy>(codec: _EnumCodec(GroupAssetsBy.values)),
   timelineStorageIndicator<bool>(),
 
   // Log
-  logLevel<LogLevel>(codec: EnumCodec(LogLevel.values)),
+  logLevel<LogLevel>(codec: _EnumCodec(LogLevel.values)),
 
   // Map
   mapShowFavoriteOnly<bool>(),
   mapRelativeDate<int>(),
   mapIncludeArchived<bool>(),
-  mapThemeMode<ThemeMode>(codec: EnumCodec(ThemeMode.values)),
+  mapThemeMode<ThemeMode>(codec: _EnumCodec(ThemeMode.values)),
   mapWithPartners<bool>(),
 
   // Cleanup
   cleanupKeepFavorites<bool>(),
-  cleanupKeepMediaType<AssetKeepType>(codec: EnumCodec(AssetKeepType.values)),
-  cleanupKeepAlbumIds<List<String>>(codec: ListCodec(PrimitiveCodec.string)),
+  cleanupKeepMediaType<AssetKeepType>(codec: _EnumCodec(AssetKeepType.values)),
+  cleanupKeepAlbumIds<List<String>>(codec: _ListCodec(_PrimitiveCodec.string)),
   cleanupCutoffDaysAgo<int>(),
   cleanupDefaultsInitialized<bool>(),
 
   // Share
-  shareFileType<ShareAssetType>(codec: EnumCodec(ShareAssetType.values)),
+  shareFileType<ShareAssetType>(codec: _EnumCodec(ShareAssetType.values)),
 
   // Slideshow
   slideshowRepeat<bool>(),
   slideshowDuration<int>(),
-  slideshowLook<SlideshowLook>(codec: EnumCodec(SlideshowLook.values)),
-  slideshowDirection<SlideshowDirection>(codec: EnumCodec(SlideshowDirection.values)),
+  slideshowLook<SlideshowLook>(codec: _EnumCodec(SlideshowLook.values)),
+  slideshowDirection<SlideshowDirection>(codec: _EnumCodec(SlideshowDirection.values)),
 
   // Feature message
-  featureMessageSeenRelease<SemVer>(codec: SemVerCodec());
+  featureMessageSeenRelease<SemVer>(codec: _SemVerCodec());
 
-  final ValueCodec<T>? _codecOverride;
+  final _SettingsCodec<T>? _codecOverride;
 
-  const SettingsKey({ValueCodec<T>? codec}) : _codecOverride = codec;
+  const SettingsKey({_SettingsCodec<T>? codec}) : _codecOverride = codec;
 
-  ValueCodec<T> get _codec => _codecOverride ?? ValueCodec.forType(T);
+  _SettingsCodec<T> get _codec => _codecOverride ?? _SettingsCodec.forType(T);
 
   String encode(T value) => _codec.encode(value);
 
   T decode(String raw) => _codec.decode(raw);
 }
+
+sealed class _SettingsCodec<T> {
+  const _SettingsCodec();
+
+  String encode(T value);
+  T decode(String raw);
+
+  static final Map<Type, _SettingsCodec<Object>> _primitives = {
+    ..._register<int>(_PrimitiveCodec.integer),
+    ..._register<double>(_PrimitiveCodec.real),
+    ..._register<bool>(_PrimitiveCodec.boolean),
+    ..._register<String>(_PrimitiveCodec.string),
+    ..._register<DateTime>(const _DateTimeCodec()),
+  };
+
+  static Map<Type, _SettingsCodec<Object>> _register<T>(_SettingsCodec<Object> codec) => {
+    T: codec,
+    // Reifies the nullable type T so it can be used as a key in the _primitives map
+    _typeOf<T?>(): codec,
+  };
+
+  static Type _typeOf<T>() => T;
+
+  static _SettingsCodec<T> forType<T>(Type runtimeType) {
+    final codec = _primitives[runtimeType];
+    if (codec == null) {
+      throw StateError('No primitive codec for $runtimeType. Provide an explicit codec when defining the SettingsKey.');
+    }
+    return codec as _SettingsCodec<T>;
+  }
+}
+
+final class _EnumCodec<T extends Enum> extends _SettingsCodec<T> {
+  final List<T> values;
+
+  const _EnumCodec(this.values);
+
+  @override
+  String encode(T value) => value.name;
+
+  @override
+  T decode(String raw) => values.firstWhere((v) => v.name == raw);
+}
+
+final class _DateTimeCodec extends _SettingsCodec<DateTime> {
+  const _DateTimeCodec();
+
+  @override
+  String encode(DateTime value) => value.toIso8601String();
+
+  @override
+  DateTime decode(String raw) => DateTime.parse(raw);
+}
+
+final class _SemVerCodec extends _SettingsCodec<SemVer> {
+  const _SemVerCodec();
+
+  @override
+  String encode(SemVer value) => value.toString();
+
+  @override
+  SemVer decode(String raw) => SemVer.fromString(raw);
+}
+
+final class _MapCodec<K extends Object, V extends Object> extends _SettingsCodec<Map<K, V>> {
+  final _SettingsCodec<K> _keyCodec;
+  final _SettingsCodec<V> _valueCodec;
+
+  const _MapCodec(this._keyCodec, this._valueCodec);
+
+  @override
+  String encode(Map<K, V> value) {
+    final entries = <String, String>{};
+    value.forEach((k, v) => entries[_keyCodec.encode(k)] = _valueCodec.encode(v));
+    return jsonEncode(entries);
+  }
+
+  @override
+  Map<K, V> decode(String raw) {
+    try {
+      final decoded = jsonDecode(raw);
+      if (decoded is! Map) {
+        return {};
+      }
+      final result = <K, V>{};
+      for (final entry in decoded.entries) {
+        final rawKey = entry.key;
+        final rawValue = entry.value;
+        if (rawKey is! String || rawValue is! String) {
+          return {};
+        }
+        final k = _keyCodec.decode(rawKey);
+        final v = _valueCodec.decode(rawValue);
+        result[k] = v;
+      }
+      return result;
+    } on FormatException {
+      return {};
+    }
+  }
+}
+
+final class _ListCodec<T extends Object> extends _SettingsCodec<List<T>> {
+  final _SettingsCodec<T> _elementCodec;
+
+  const _ListCodec(this._elementCodec);
+
+  @override
+  String encode(List<T> value) => jsonEncode(value.map(_elementCodec.encode).toList());
+
+  @override
+  List<T> decode(String raw) {
+    try {
+      final decoded = jsonDecode(raw);
+      if (decoded is! List) {
+        return [];
+      }
+      final result = <T>[];
+      for (final item in decoded) {
+        if (item is! String) {
+          return [];
+        }
+        final element = _elementCodec.decode(item);
+        result.add(element);
+      }
+      return result;
+    } on FormatException {
+      return [];
+    }
+  }
+}
+
+final class _PrimitiveCodec<T extends Object> extends _SettingsCodec<T> {
+  final T Function(String) _parse;
+
+  const _PrimitiveCodec._(this._parse);
+
+  @override
+  String encode(T value) => value.toString();
+
+  @override
+  T decode(String raw) => _parse(raw);
+
+  static const integer = _PrimitiveCodec<int>._(int.parse);
+  static const real = _PrimitiveCodec<double>._(double.parse);
+  static const boolean = _PrimitiveCodec<bool>._(bool.parse);
+  static const string = _PrimitiveCodec<String>._(_identity);
+
+  static String _identity(String s) => s;
+}

mobile/lib/domain/models/value_codec.dart

@@ -1,153 +0,0 @@
-import 'dart:convert';
-
-import 'package:immich_mobile/utils/semver.dart';
-
-sealed class ValueCodec<T> {
-  const ValueCodec();
-
-  String encode(T value);
-  T decode(String raw);
-
-  static final Map<Type, ValueCodec<Object>> _primitives = {
-    ..._register<int>(PrimitiveCodec.integer),
-    ..._register<double>(PrimitiveCodec.real),
-    ..._register<bool>(PrimitiveCodec.boolean),
-    ..._register<String>(PrimitiveCodec.string),
-    ..._register<DateTime>(const DateTimeCodec()),
-  };
-
-  static Map<Type, ValueCodec<Object>> _register<T>(ValueCodec<Object> codec) => {
-    T: codec,
-    // Reifies the nullable type T so it can be used as a key in the _primitives map
-    _typeOf<T?>(): codec,
-  };
-
-  static Type _typeOf<T>() => T;
-
-  static ValueCodec<T> forType<T>(Type runtimeType) {
-    final codec = _primitives[runtimeType];
-    if (codec == null) {
-      throw StateError('No primitive codec for $runtimeType. Provide an explicit codec when defining the key.');
-    }
-    return codec as ValueCodec<T>;
-  }
-}
-
-final class EnumCodec<T extends Enum> extends ValueCodec<T> {
-  final List<T> values;
-
-  const EnumCodec(this.values);
-
-  @override
-  String encode(T value) => value.name;
-
-  @override
-  T decode(String raw) => values.firstWhere((v) => v.name == raw);
-}
-
-final class DateTimeCodec extends ValueCodec<DateTime> {
-  const DateTimeCodec();
-
-  @override
-  String encode(DateTime value) => value.toIso8601String();
-
-  @override
-  DateTime decode(String raw) => DateTime.parse(raw);
-}
-
-final class SemVerCodec extends ValueCodec<SemVer> {
-  const SemVerCodec();
-
-  @override
-  String encode(SemVer value) => value.toString();
-
-  @override
-  SemVer decode(String raw) => SemVer.fromString(raw);
-}
-
-final class MapCodec<K extends Object, V extends Object> extends ValueCodec<Map<K, V>> {
-  final ValueCodec<K> _keyCodec;
-  final ValueCodec<V> _valueCodec;
-
-  const MapCodec(this._keyCodec, this._valueCodec);
-
-  @override
-  String encode(Map<K, V> value) {
-    final entries = <String, String>{};
-    value.forEach((k, v) => entries[_keyCodec.encode(k)] = _valueCodec.encode(v));
-    return jsonEncode(entries);
-  }
-
-  @override
-  Map<K, V> decode(String raw) {
-    try {
-      final decoded = jsonDecode(raw);
-      if (decoded is! Map) {
-        return {};
-      }
-      final result = <K, V>{};
-      for (final entry in decoded.entries) {
-        final rawKey = entry.key;
-        final rawValue = entry.value;
-        if (rawKey is! String || rawValue is! String) {
-          continue;
-        }
-        final k = _keyCodec.decode(rawKey);
-        final v = _valueCodec.decode(rawValue);
-        result[k] = v;
-      }
-      return result;
-    } on FormatException {
-      return {};
-    }
-  }
-}
-
-final class ListCodec<T extends Object> extends ValueCodec<List<T>> {
-  final ValueCodec<T> _elementCodec;
-
-  const ListCodec(this._elementCodec);
-
-  @override
-  String encode(List<T> value) => jsonEncode(value.map(_elementCodec.encode).toList());
-
-  @override
-  List<T> decode(String raw) {
-    try {
-      final decoded = jsonDecode(raw);
-      if (decoded is! List) {
-        return [];
-      }
-      final result = <T>[];
-      for (final item in decoded) {
-        if (item is! String) {
-          return [];
-        }
-        final element = _elementCodec.decode(item);
-        result.add(element);
-      }
-      return result;
-    } on FormatException {
-      return [];
-    }
-  }
-}
-
-final class PrimitiveCodec<T extends Object> extends ValueCodec<T> {
-  final T Function(String) _parse;
-
-  const PrimitiveCodec._(this._parse);
-
-  @override
-  String encode(T value) => value.toString();
-
-  @override
-  T decode(String raw) => _parse(raw);
-
-  static const integer = PrimitiveCodec<int>._(int.parse);
-  static const real = PrimitiveCodec<double>._(double.parse);
-  static const boolean = PrimitiveCodec<bool>._(bool.parse);
-  static const string = PrimitiveCodec<String>._(_identity);
-
-  static String _identity(String s) => s;
-}

mobile/lib/infrastructure/repositories/cached_key_value_repository.dart

@@ -1,41 +0,0 @@
-import 'package:collection/collection.dart';
-import 'package:drift/drift.dart';
-// ignore: depend_on_referenced_packages
-import 'package:meta/meta.dart';
-
-abstract class CachedKeyValueRepository<K extends Enum, S> {
-  CachedKeyValueRepository(this._snapshot);
-
-  S _snapshot;
-  S get snapshot => _snapshot;
-  @protected
-  set snapshot(S value) => _snapshot = value;
-
-  List<K> get keys;
-
-  Object decodeValue(K key, String raw);
-
-  S buildSnapshot(Map<K, Object?> overrides);
-
-  Selectable<({String key, String? value})> selectable();
-
-  Future<void> refresh() async => _snapshot = _build(await selectable().get());
-
-  Stream<S> watchSnapshot() => selectable().watch().map((rows) => _snapshot = _build(rows));
-
-  S _build(List<({String key, String? value})> rows) => buildSnapshot(
-    rows.fold({}, (overrides, row) {
-      final key = keys.firstWhereOrNull((key) => key.name == row.key);
-      if (key == null) {
-        return overrides;
-      }
-
-      Object? decodedValue;
-      if (row.value != null) {
-        decodedValue = decodeValue(key, row.value!);
-      }
-
-      return {...overrides, key: decodedValue};
-    }),
-  );
-}

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

@@ -120,7 +120,7 @@ class Drift extends $Drift {
   }
 
   @override
-  int get schemaVersion => 32;
+  int get schemaVersion => 31;
 
   @override
   MigrationStrategy get migration => MigrationStrategy(
@@ -318,26 +318,6 @@ class Drift extends $Drift {
               from30To31: (m, v31) async {
                 await m.createIndex(v31.idxRemoteAssetUploaded);
               },
-              from31To32: (m, v32) async {
-                const minDateTime = '0001-01-01T00:00:00.000Z';
-                const maxDateTime = '9999-12-31T00:00:00.000Z';
-                const timestampColumns = {
-                  'local_asset_entity': ['created_at', 'updated_at'],
-                  'local_album_entity': ['updated_at'],
-                  'trashed_local_asset_entity': ['created_at', 'updated_at'],
-                };
-
-                for (final entry in timestampColumns.entries) {
-                  final table = entry.key;
-                  for (final column in entry.value) {
-                    await customStatement("UPDATE $table SET $column = '$maxDateTime' WHERE $column LIKE '+%'");
-                    await customStatement("UPDATE $table SET $column = '$minDateTime' WHERE $column LIKE '-%'");
-                  }
-                }
-                await customStatement(
-                  "UPDATE local_asset_entity SET adjustment_time = NULL WHERE adjustment_time LIKE '+%' OR adjustment_time LIKE '-%'",
-                );
-              },
             ),
           ),
         );

mobile/lib/infrastructure/repositories/db.repository.steps.dart

@@ -16506,591 +16506,6 @@ final class Schema31 extends i0.VersionedSchema {
   );
 }
 
-final class Schema32 extends i0.VersionedSchema {
-  Schema32({required super.database}) : super(version: 32);
-  @override
-  late final List<i1.DatabaseSchemaEntity> entities = [
-    userEntity,
-    remoteAssetEntity,
-    stackEntity,
-    localAssetEntity,
-    remoteAlbumEntity,
-    localAlbumEntity,
-    localAlbumAssetEntity,
-    idxLocalAlbumAssetAlbumAsset,
-    idxLocalAssetChecksum,
-    idxLocalAssetCloudId,
-    idxLocalAssetCreatedAt,
-    idxStackPrimaryAssetId,
-    uQRemoteAssetsOwnerChecksum,
-    uQRemoteAssetsOwnerLibraryChecksum,
-    idxRemoteAssetChecksum,
-    idxRemoteAssetStackId,
-    idxRemoteAssetOwnerVisibilityDeletedCreated,
-    idxRemoteAssetUploaded,
-    authUserEntity,
-    userMetadataEntity,
-    partnerEntity,
-    remoteExifEntity,
-    remoteAlbumAssetEntity,
-    remoteAlbumUserEntity,
-    remoteAssetCloudIdEntity,
-    memoryEntity,
-    memoryAssetEntity,
-    personEntity,
-    assetFaceEntity,
-    storeEntity,
-    trashedLocalAssetEntity,
-    assetEditEntity,
-    settings,
-    assetOcrEntity,
-    idxPartnerSharedWithId,
-    idxLatLng,
-    idxRemoteExifCity,
-    idxRemoteAlbumAssetAlbumAsset,
-    idxRemoteAssetCloudId,
-    idxPersonOwnerId,
-    idxAssetFacePersonId,
-    idxAssetFaceAssetId,
-    idxAssetFaceVisiblePerson,
-    idxTrashedLocalAssetChecksum,
-    idxTrashedLocalAssetAlbum,
-    idxAssetEditAssetId,
-    idxAssetOcrAssetId,
-  ];
-  late final Shape33 userEntity = Shape33(
-    source: i0.VersionedTable(
-      entityName: 'user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_108,
-        _column_109,
-        _column_110,
-        _column_111,
-        _column_112,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape50 remoteAssetEntity = Shape50(
-    source: i0.VersionedTable(
-      entityName: 'remote_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_108,
-        _column_113,
-        _column_114,
-        _column_115,
-        _column_116,
-        _column_117,
-        _column_118,
-        _column_107,
-        _column_119,
-        _column_120,
-        _column_121,
-        _column_122,
-        _column_123,
-        _column_124,
-        _column_212,
-        _column_125,
-        _column_126,
-        _column_127,
-        _column_128,
-        _column_129,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape35 stackEntity = Shape35(
-    source: i0.VersionedTable(
-      entityName: 'stack_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_114,
-        _column_115,
-        _column_121,
-        _column_130,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape36 localAssetEntity = Shape36(
-    source: i0.VersionedTable(
-      entityName: 'local_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_108,
-        _column_113,
-        _column_114,
-        _column_115,
-        _column_116,
-        _column_117,
-        _column_118,
-        _column_107,
-        _column_131,
-        _column_120,
-        _column_132,
-        _column_133,
-        _column_134,
-        _column_135,
-        _column_136,
-        _column_137,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape48 remoteAlbumEntity = Shape48(
-    source: i0.VersionedTable(
-      entityName: 'remote_album_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_108,
-        _column_138,
-        _column_114,
-        _column_115,
-        _column_139,
-        _column_140,
-        _column_141,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape38 localAlbumEntity = Shape38(
-    source: i0.VersionedTable(
-      entityName: 'local_album_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_108,
-        _column_115,
-        _column_142,
-        _column_143,
-        _column_144,
-        _column_145,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape39 localAlbumAssetEntity = Shape39(
-    source: i0.VersionedTable(
-      entityName: 'local_album_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
-      columns: [_column_146, _column_147, _column_145],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  final i1.Index idxLocalAlbumAssetAlbumAsset = i1.Index(
-    'idx_local_album_asset_album_asset',
-    'CREATE INDEX IF NOT EXISTS idx_local_album_asset_album_asset ON local_album_asset_entity (album_id, asset_id)',
-  );
-  final i1.Index idxLocalAssetChecksum = i1.Index(
-    'idx_local_asset_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_local_asset_checksum ON local_asset_entity (checksum)',
-  );
-  final i1.Index idxLocalAssetCloudId = i1.Index(
-    'idx_local_asset_cloud_id',
-    'CREATE INDEX IF NOT EXISTS idx_local_asset_cloud_id ON local_asset_entity (i_cloud_id)',
-  );
-  final i1.Index idxLocalAssetCreatedAt = i1.Index(
-    'idx_local_asset_created_at',
-    'CREATE INDEX IF NOT EXISTS idx_local_asset_created_at ON local_asset_entity (created_at)',
-  );
-  final i1.Index idxStackPrimaryAssetId = i1.Index(
-    'idx_stack_primary_asset_id',
-    'CREATE INDEX IF NOT EXISTS idx_stack_primary_asset_id ON stack_entity (primary_asset_id)',
-  );
-  final i1.Index uQRemoteAssetsOwnerChecksum = i1.Index(
-    'UQ_remote_assets_owner_checksum',
-    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_checksum ON remote_asset_entity (owner_id, checksum) WHERE(library_id IS NULL)',
-  );
-  final i1.Index uQRemoteAssetsOwnerLibraryChecksum = i1.Index(
-    'UQ_remote_assets_owner_library_checksum',
-    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_library_checksum ON remote_asset_entity (owner_id, library_id, checksum) WHERE(library_id IS NOT NULL)',
-  );
-  final i1.Index idxRemoteAssetChecksum = i1.Index(
-    'idx_remote_asset_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_checksum ON remote_asset_entity (checksum)',
-  );
-  final i1.Index idxRemoteAssetStackId = i1.Index(
-    'idx_remote_asset_stack_id',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_stack_id ON remote_asset_entity (stack_id)',
-  );
-  final i1.Index idxRemoteAssetOwnerVisibilityDeletedCreated = i1.Index(
-    'idx_remote_asset_owner_visibility_deleted_created',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_visibility_deleted_created ON remote_asset_entity (owner_id, visibility, deleted_at, created_at DESC)',
-  );
-  final i1.Index idxRemoteAssetUploaded = i1.Index(
-    'idx_remote_asset_uploaded',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_uploaded ON remote_asset_entity (uploaded_at)',
-  );
-  late final Shape40 authUserEntity = Shape40(
-    source: i0.VersionedTable(
-      entityName: 'auth_user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_108,
-        _column_109,
-        _column_148,
-        _column_110,
-        _column_111,
-        _column_149,
-        _column_150,
-        _column_151,
-        _column_152,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape4 userMetadataEntity = Shape4(
-    source: i0.VersionedTable(
-      entityName: 'user_metadata_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(user_id, "key")'],
-      columns: [_column_153, _column_154, _column_155],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape41 partnerEntity = Shape41(
-    source: i0.VersionedTable(
-      entityName: 'partner_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(shared_by_id, shared_with_id)'],
-      columns: [_column_156, _column_157, _column_158],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape42 remoteExifEntity = Shape42(
-    source: i0.VersionedTable(
-      entityName: 'remote_exif_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id)'],
-      columns: [
-        _column_159,
-        _column_160,
-        _column_161,
-        _column_162,
-        _column_163,
-        _column_164,
-        _column_117,
-        _column_116,
-        _column_165,
-        _column_166,
-        _column_167,
-        _column_168,
-        _column_135,
-        _column_136,
-        _column_169,
-        _column_170,
-        _column_171,
-        _column_172,
-        _column_173,
-        _column_174,
-        _column_175,
-        _column_176,
-      ],
-      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_159, _column_177],
-      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_177, _column_153, _column_178],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape43 remoteAssetCloudIdEntity = Shape43(
-    source: i0.VersionedTable(
-      entityName: 'remote_asset_cloud_id_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id)'],
-      columns: [
-        _column_159,
-        _column_179,
-        _column_180,
-        _column_134,
-        _column_135,
-        _column_136,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape44 memoryEntity = Shape44(
-    source: i0.VersionedTable(
-      entityName: 'memory_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_114,
-        _column_115,
-        _column_124,
-        _column_121,
-        _column_113,
-        _column_181,
-        _column_182,
-        _column_183,
-        _column_184,
-        _column_185,
-        _column_186,
-      ],
-      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_159, _column_187],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape45 personEntity = Shape45(
-    source: i0.VersionedTable(
-      entityName: 'person_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_114,
-        _column_115,
-        _column_121,
-        _column_108,
-        _column_188,
-        _column_189,
-        _column_190,
-        _column_191,
-        _column_192,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape46 assetFaceEntity = Shape46(
-    source: i0.VersionedTable(
-      entityName: 'asset_face_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_159,
-        _column_193,
-        _column_194,
-        _column_195,
-        _column_196,
-        _column_197,
-        _column_198,
-        _column_199,
-        _column_200,
-        _column_201,
-        _column_124,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape18 storeEntity = Shape18(
-    source: i0.VersionedTable(
-      entityName: 'store_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [_column_202, _column_203, _column_204],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape47 trashedLocalAssetEntity = Shape47(
-    source: i0.VersionedTable(
-      entityName: 'trashed_local_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id, album_id)'],
-      columns: [
-        _column_108,
-        _column_113,
-        _column_114,
-        _column_115,
-        _column_116,
-        _column_117,
-        _column_118,
-        _column_107,
-        _column_205,
-        _column_131,
-        _column_120,
-        _column_132,
-        _column_206,
-        _column_137,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape32 assetEditEntity = Shape32(
-    source: i0.VersionedTable(
-      entityName: 'asset_edit_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_159,
-        _column_207,
-        _column_208,
-        _column_209,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape49 settings = Shape49(
-    source: i0.VersionedTable(
-      entityName: 'settings',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY("key")'],
-      columns: [_column_210, _column_224, _column_115],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape51 assetOcrEntity = Shape51(
-    source: i0.VersionedTable(
-      entityName: 'asset_ocr_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_159,
-        _column_213,
-        _column_214,
-        _column_215,
-        _column_216,
-        _column_217,
-        _column_218,
-        _column_219,
-        _column_220,
-        _column_221,
-        _column_222,
-        _column_223,
-        _column_201,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  final i1.Index idxPartnerSharedWithId = i1.Index(
-    'idx_partner_shared_with_id',
-    'CREATE INDEX IF NOT EXISTS idx_partner_shared_with_id ON partner_entity (shared_with_id)',
-  );
-  final i1.Index idxLatLng = i1.Index(
-    'idx_lat_lng',
-    'CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)',
-  );
-  final i1.Index idxRemoteExifCity = i1.Index(
-    'idx_remote_exif_city',
-    'CREATE INDEX IF NOT EXISTS idx_remote_exif_city ON remote_exif_entity (city) WHERE city IS NOT NULL',
-  );
-  final i1.Index idxRemoteAlbumAssetAlbumAsset = i1.Index(
-    'idx_remote_album_asset_album_asset',
-    'CREATE INDEX IF NOT EXISTS idx_remote_album_asset_album_asset ON remote_album_asset_entity (album_id, asset_id)',
-  );
-  final i1.Index idxRemoteAssetCloudId = i1.Index(
-    'idx_remote_asset_cloud_id',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_cloud_id ON remote_asset_cloud_id_entity (cloud_id)',
-  );
-  final i1.Index idxPersonOwnerId = i1.Index(
-    'idx_person_owner_id',
-    'CREATE INDEX IF NOT EXISTS idx_person_owner_id ON person_entity (owner_id)',
-  );
-  final i1.Index idxAssetFacePersonId = i1.Index(
-    'idx_asset_face_person_id',
-    'CREATE INDEX IF NOT EXISTS idx_asset_face_person_id ON asset_face_entity (person_id)',
-  );
-  final i1.Index idxAssetFaceAssetId = i1.Index(
-    'idx_asset_face_asset_id',
-    'CREATE INDEX IF NOT EXISTS idx_asset_face_asset_id ON asset_face_entity (asset_id)',
-  );
-  final i1.Index idxAssetFaceVisiblePerson = i1.Index(
-    'idx_asset_face_visible_person',
-    'CREATE INDEX IF NOT EXISTS idx_asset_face_visible_person ON asset_face_entity (person_id, asset_id) WHERE is_visible = 1 AND deleted_at IS NULL',
-  );
-  final i1.Index idxTrashedLocalAssetChecksum = i1.Index(
-    'idx_trashed_local_asset_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_checksum ON trashed_local_asset_entity (checksum)',
-  );
-  final i1.Index idxTrashedLocalAssetAlbum = i1.Index(
-    'idx_trashed_local_asset_album',
-    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_album ON trashed_local_asset_entity (album_id)',
-  );
-  final i1.Index idxAssetEditAssetId = i1.Index(
-    'idx_asset_edit_asset_id',
-    'CREATE INDEX IF NOT EXISTS idx_asset_edit_asset_id ON asset_edit_entity (asset_id)',
-  );
-  final i1.Index idxAssetOcrAssetId = i1.Index(
-    'idx_asset_ocr_asset_id',
-    'CREATE INDEX IF NOT EXISTS idx_asset_ocr_asset_id ON asset_ocr_entity (asset_id)',
-  );
-}
-
 i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
   required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3,
@@ -17122,7 +16537,6 @@ i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema29 schema) from28To29,
   required Future<void> Function(i1.Migrator m, Schema30 schema) from29To30,
   required Future<void> Function(i1.Migrator m, Schema31 schema) from30To31,
-  required Future<void> Function(i1.Migrator m, Schema32 schema) from31To32,
 }) {
   return (currentVersion, database) async {
     switch (currentVersion) {
@@ -17276,11 +16690,6 @@ i0.MigrationStepWithVersion migrationSteps({
         final migrator = i1.Migrator(database, schema);
         await from30To31(migrator, schema);
         return 31;
-      case 31:
-        final schema = Schema32(database: database);
-        final migrator = i1.Migrator(database, schema);
-        await from31To32(migrator, schema);
-        return 32;
       default:
         throw ArgumentError.value('Unknown migration from $currentVersion');
     }
@@ -17318,7 +16727,6 @@ i1.OnUpgrade stepByStep({
   required Future<void> Function(i1.Migrator m, Schema29 schema) from28To29,
   required Future<void> Function(i1.Migrator m, Schema30 schema) from29To30,
   required Future<void> Function(i1.Migrator m, Schema31 schema) from30To31,
-  required Future<void> Function(i1.Migrator m, Schema32 schema) from31To32,
 }) => i0.VersionedSchema.stepByStepHelper(
   step: migrationSteps(
     from1To2: from1To2,
@@ -17351,6 +16759,5 @@ i1.OnUpgrade stepByStep({
     from28To29: from28To29,
     from29To30: from29To30,
     from30To31: from30To31,
-    from31To32: from31To32,
   ),
 );

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

@@ -10,7 +10,6 @@ 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:immich_mobile/utils/option.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
 
 class RemoteAssetRepository extends DriftDatabaseRepository {
@@ -72,13 +71,7 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
     }
 
     final query = _db.remoteAssetEntity.select()
-      ..where(
-        (row) =>
-            row.stackId.equals(stackId) &
-            row.id.equals(asset.id).not() &
-            row.deletedAt.isNull() &
-            row.visibility.equalsValue(AssetVisibility.timeline),
-      )
+      ..where((row) => row.stackId.equals(stackId) & row.id.equals(asset.id).not())
       ..orderBy([(row) => OrderingTerm.desc(row.createdAt)]);
 
     return query.map((row) => row.toDto()).get();
@@ -293,20 +286,4 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
       ..orderBy([(row) => OrderingTerm.asc(row.sequence)]);
     return query.map((row) => row.toDto()!).get();
   }
-
-  Future<void> update(
-    List<String> remoteIds, {
-    Option<bool> isFavorite = const .none(),
-    Option<AssetVisibility> visibility = const .none(),
-  }) {
-    final companion = RemoteAssetEntityCompanion(
-      visibility: visibility.toDriftValue(),
-      isFavorite: isFavorite.toDriftValue(),
-    );
-    return _db.batch((batch) {
-      for (final remoteId in remoteIds) {
-        batch.update(_db.remoteAssetEntity, companion, where: (e) => e.id.equals(remoteId));
-      }
-    });
-  }
 }

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

@@ -1,14 +1,13 @@
-import 'package:drift/drift.dart';
+import 'package:collection/collection.dart';
 import 'package:immich_mobile/domain/models/config/app_config.dart';
 import 'package:immich_mobile/domain/models/settings_key.dart';
 import 'package:immich_mobile/infrastructure/entities/settings.entity.drift.dart';
-import 'package:immich_mobile/infrastructure/repositories/cached_key_value_repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 
-class SettingsRepository extends CachedKeyValueRepository<SettingsKey, AppConfig> {
+class SettingsRepository extends DriftDatabaseRepository {
   final Drift _db;
 
-  SettingsRepository._(this._db) : super(const .new());
+  SettingsRepository._(this._db) : super(_db);
 
   static SettingsRepository? _instance;
 
@@ -20,6 +19,9 @@ class SettingsRepository extends CachedKeyValueRepository<SettingsKey, AppConfig
     return instance;
   }
 
+  AppConfig _appConfig = const .new();
+  AppConfig get appConfig => _appConfig;
+
   static Future<SettingsRepository> ensureInitialized(Drift db) async {
     if (_instance == null) {
       final instance = SettingsRepository._(db);
@@ -29,20 +31,7 @@ class SettingsRepository extends CachedKeyValueRepository<SettingsKey, AppConfig
     return _instance!;
   }
 
-  @override
-  List<SettingsKey> get keys => SettingsKey.values;
-
-  @override
-  Object decodeValue(SettingsKey key, String raw) => key.decode(raw);
-
-  @override
-  AppConfig buildSnapshot(Map<SettingsKey, Object?> overrides) => AppConfig.fromEntries(overrides);
-
-  @override
-  Selectable<({String key, String? value})> selectable() =>
-      _db.select(_db.settingsEntity).map((row) => (key: row.key, value: row.value));
-
-  AppConfig get appConfig => snapshot;
+  Future<void> refresh() async => _applyOverrides(await _db.select(_db.settingsEntity).get());
 
   Future<void> clear(Iterable<SettingsKey> keys) async {
     if (keys.isEmpty) {
@@ -52,15 +41,13 @@ class SettingsRepository extends CachedKeyValueRepository<SettingsKey, AppConfig
     final names = keys.map((key) => key.name).toList();
     await (_db.delete(_db.settingsEntity)..where((row) => row.key.isIn(names))).go();
 
-    var config = snapshot;
     for (final key in keys) {
-      config = config.write(key, defaultConfig.read(key));
+      _appConfig = _appConfig.write(key, defaultConfig.read(key));
     }
-    snapshot = config;
   }
 
   Future<void> write<T, U extends T>(SettingsKey<T> key, U value) async {
-    if (value == snapshot.read(key)) {
+    if (value == _appConfig.read(key)) {
       return;
     }
 
@@ -78,8 +65,29 @@ class SettingsRepository extends CachedKeyValueRepository<SettingsKey, AppConfig
         .insertOnConflictUpdate(
           SettingsEntityCompanion.insert(key: key.name, value: .new(resolvedValue), updatedAt: .new(DateTime.now())),
         );
-    snapshot = snapshot.write(key, value);
+    _appConfig = _appConfig.write(key, value);
   }
 
-  Stream<AppConfig> watchConfig() => watchSnapshot();
+  Stream<AppConfig> watchConfig() => _db.select(_db.settingsEntity).watch().map((rows) {
+    _applyOverrides(rows);
+    return _appConfig;
+  });
+
+  void _applyOverrides(List<SettingsEntityData> rows) {
+    _appConfig = AppConfig.fromEntries(
+      rows.fold({}, (overrides, row) {
+        final metadataKey = SettingsKey.values.firstWhereOrNull((key) => key.name == row.key);
+        if (metadataKey == null) {
+          return overrides;
+        }
+
+        Object? decodedValue;
+        if (row.value != null) {
+          decodedValue = metadataKey.decode(row.value!);
+        }
+
+        return {...overrides, metadataKey: decodedValue};
+      }),
+    );
+  }
 }

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

@@ -51,7 +51,6 @@ class _DriftSlideshowPageState extends ConsumerState<DriftSlideshowPage> with Si
   int? _crossfadeFromIndex;
   int? _crossfadeToIndex;
   int _zoomCycle = 0;
-  bool _disableAnimations = false;
 
   @override
   initState() {
@@ -71,12 +70,6 @@ class _DriftSlideshowPageState extends ConsumerState<DriftSlideshowPage> with Si
     unawaited(WakelockPlus.enable());
   }
 
-  @override
-  void didChangeDependencies() {
-    super.didChangeDependencies();
-    _disableAnimations = MediaQuery.disableAnimationsOf(context);
-  }
-
   @override
   dispose() {
     _timer.cancel();
@@ -173,11 +166,6 @@ class _DriftSlideshowPageState extends ConsumerState<DriftSlideshowPage> with Si
   }
 
   void _crossFadeToPage(int page) {
-    if (_disableAnimations) {
-      _pageController.jumpToPage(page);
-      return;
-    }
-
     final previousIndex = _index;
     _pageController.jumpToPage(page);
     setState(() {
@@ -285,12 +273,19 @@ class _DriftSlideshowPageState extends ConsumerState<DriftSlideshowPage> with Si
     }
 
     if (asset.isImage) {
-      return _SlideshowProgressBar(
+      final elapsed = _stopwatch.elapsedMilliseconds;
+      final duration = _config.duration * 1000;
+
+      return TweenAnimationBuilder(
         key: Key(_index.toString()),
-        durationMs: _config.duration * 1000,
-        elapsedMs: _stopwatch.elapsedMilliseconds,
-        paused: _paused,
-        color: context.colorScheme.primary,
+        tween: Tween<double>(begin: elapsed / duration.toDouble(), end: _paused ? elapsed / duration.toDouble() : 1.0),
+        duration: Duration(milliseconds: _paused ? 1 : max(duration - elapsed, 1)),
+        builder: (context, value, _) => LinearProgressIndicator(
+          color: context.colorScheme.primary,
+          borderRadius: const BorderRadius.all(Radius.zero),
+          minHeight: 5,
+          value: value,
+        ),
       );
     } else {
       return LinearProgressIndicator(
@@ -339,21 +334,6 @@ class _DriftSlideshowPageState extends ConsumerState<DriftSlideshowPage> with Si
     final imageProvider = getFullImageProvider(asset, size: context.sizeData);
 
     if (asset.isImage) {
-      PhotoView buildPhotoView(PhotoViewComputedScale initialScale) => PhotoView(
-        imageProvider: imageProvider,
-        index: index,
-        disableScaleGestures: true,
-        gaplessPlayback: true,
-        filterQuality: FilterQuality.high,
-        initialScale: initialScale,
-        controller: PhotoViewController(),
-        onTapUp: (_, _, _) => _onTapUp(),
-      );
-
-      if (_disableAnimations) {
-        return buildPhotoView(scale);
-      }
-
       final zoomOut = _zoomCycle.isOdd;
       final elapsed = _stopwatch.elapsedMilliseconds;
       final duration = _config.duration * 1000;
@@ -369,7 +349,16 @@ class _DriftSlideshowPageState extends ConsumerState<DriftSlideshowPage> with Si
               : 1.0,
         ),
         duration: Duration(milliseconds: _paused ? 1 : max(duration - elapsed, 1)),
-        builder: (context, value, _) => buildPhotoView(scale * (1.0 + value * _kenBurnsZoom)),
+        builder: (context, value, _) => PhotoView(
+          imageProvider: imageProvider,
+          index: index,
+          disableScaleGestures: true,
+          gaplessPlayback: true,
+          filterQuality: FilterQuality.high,
+          initialScale: scale * (1.0 + value * _kenBurnsZoom),
+          controller: PhotoViewController(),
+          onTapUp: (_, _, _) => _onTapUp(),
+        ),
       );
     } else {
       final status = ref.watch(videoPlayerProvider(asset.heroTag).select((s) => s.status));
@@ -474,75 +463,3 @@ class _DriftSlideshowPageState extends ConsumerState<DriftSlideshowPage> with Si
     );
   }
 }
-
-/// Progress bar for image slides, driven by an explicit [AnimationController].
-///
-/// [TweenAnimationBuilder] creates its controller internally with the default
-/// [AnimationBehavior.normal], which makes it run ~20x too fast while the system
-/// "reduce motion" setting is on (flutter/flutter#164287). This owns its
-/// controller so it can use [AnimationBehavior.preserve] and animate at the real
-/// slide duration regardless of that setting.
-class _SlideshowProgressBar extends StatefulWidget {
-  final int durationMs;
-  final int elapsedMs;
-  final bool paused;
-  final Color color;
-
-  const _SlideshowProgressBar({
-    super.key,
-    required this.durationMs,
-    required this.elapsedMs,
-    required this.paused,
-    required this.color,
-  });
-
-  @override
-  State<_SlideshowProgressBar> createState() => _SlideshowProgressBarState();
-}
-
-class _SlideshowProgressBarState extends State<_SlideshowProgressBar> with SingleTickerProviderStateMixin {
-  late final AnimationController _controller;
-
-  @override
-  void initState() {
-    super.initState();
-    _controller = AnimationController(
-      vsync: this,
-      duration: Duration(milliseconds: widget.durationMs),
-      animationBehavior: AnimationBehavior.preserve,
-    )..value = (widget.elapsedMs / widget.durationMs).clamp(0.0, 1.0);
-    if (!widget.paused) {
-      _controller.forward();
-    }
-  }
-
-  @override
-  void didUpdateWidget(_SlideshowProgressBar oldWidget) {
-    super.didUpdateWidget(oldWidget);
-    if (widget.durationMs != oldWidget.durationMs) {
-      _controller.duration = Duration(milliseconds: widget.durationMs);
-    }
-    if (widget.paused != oldWidget.paused) {
-      widget.paused ? _controller.stop() : _controller.forward();
-    }
-  }
-
-  @override
-  void dispose() {
-    _controller.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return AnimatedBuilder(
-      animation: _controller,
-      builder: (context, _) => LinearProgressIndicator(
-        color: widget.color,
-        borderRadius: const BorderRadius.all(Radius.zero),
-        minHeight: 5,
-        value: _controller.value,
-      ),
-    );
-  }
-}

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

@@ -886,6 +886,7 @@ class _QuickLinkList extends StatelessWidget {
           _QuickLink(
             title: context.t.recently_added,
             icon: Icons.upload_outlined,
+            isTop: true,
             onTap: () => context.pushRoute(const DriftRecentlyAddedRoute()),
           ),
           _QuickLink(

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

@@ -2,13 +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/domain/models/events.model.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/providers/asset_viewer/asset_viewer.provider.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';
@@ -61,19 +59,13 @@ class DeleteActionButton extends ConsumerWidget {
       }
     }
 
-    final currentAsset = ref.read(assetViewerProvider).currentAsset;
-    final stackIndex = ref.read(assetViewerProvider).stackIndex;
+    if (source == ActionSource.viewer) {
+      EventStream.shared.emit(const ViewerReloadAssetEvent());
+    }
 
     final result = await ref.read(actionProvider.notifier).trashRemoteAndDeleteLocal(source);
     ref.read(multiSelectProvider.notifier).reset();
 
-    if (source == ActionSource.viewer && result.success) {
-      final shouldRefreshStack = currentAsset is RemoteAsset && currentAsset.stackId != null;
-      EventStream.shared.emit(
-        shouldRefreshStack ? ViewerStackAssetDeletedEvent(stackIndex: stackIndex) : const ViewerReloadAssetEvent(),
-      );
-    }
-
     final successMessage = 'delete_action_prompt'.t(context: context, args: {'count': result.count.toString()});
 
     if (context.mounted) {

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

@@ -413,8 +413,7 @@ class _AssetPageState extends ConsumerState<AssetPage> {
     final showAssetStack = ref.watch(timelineServiceProvider.select((s) => s.origin != TimelineOrigin.trash));
     final stackChildren = showAssetStack ? ref.watch(stackChildrenNotifier(asset)).valueOrNull : null;
     if (stackChildren != null && stackChildren.isNotEmpty) {
-      final safeStackIndex = stackIndex.clamp(0, stackChildren.length - 1);
-      displayAsset = stackChildren.elementAt(safeStackIndex);
+      displayAsset = stackChildren.elementAt(stackIndex);
     }
 
     final isCurrent = currentAsset != null && currentAsset.refersToSameAsset(displayAsset);

mobile/lib/presentation/widgets/asset_viewer/asset_stack.provider.dart

@@ -11,10 +11,6 @@ class StackChildrenNotifier extends AutoDisposeFamilyAsyncNotifier<List<RemoteAs
 
     return ref.watch(assetServiceProvider).getStack(asset);
   }
-
-  void setStack(List<RemoteAsset> stack) {
-    state = AsyncData(stack);
-  }
 }
 
 final stackChildrenNotifier = AsyncNotifierProvider.autoDispose

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

@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:math' as math;
 
 import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
@@ -222,8 +221,6 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
         _onTimelineReloadEvent();
       case ViewerReloadAssetEvent():
         _onViewerReloadEvent();
-      case ViewerStackAssetDeletedEvent event:
-        _onViewerStackAssetDeletedEvent(event);
       default:
     }
   }
@@ -239,33 +236,6 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     _onAssetChanged(target);
   }
 
-  Future<void> _onViewerStackAssetDeletedEvent(ViewerStackAssetDeletedEvent event) async {
-    final timelineAsset = ref.read(timelineServiceProvider).getAssetSafe(_currentPage);
-    if (timelineAsset == null) {
-      _onViewerReloadEvent();
-      return;
-    }
-
-    final stackProvider = stackChildrenNotifier(timelineAsset);
-
-    ref.invalidate(stackProvider);
-    final stack = await ref.read(stackProvider.future);
-
-    if (!mounted) {
-      return;
-    }
-
-    if (stack.isEmpty) {
-      _onViewerReloadEvent();
-      return;
-    }
-
-    final targetIndex = math.min(event.stackIndex, stack.length - 1);
-    ref.read(assetViewerProvider.notifier)
-      ..setAsset(stack[targetIndex])
-      ..setStackIndex(targetIndex);
-  }
-
   void _onTimelineReloadEvent() {
     final timelineService = ref.read(timelineServiceProvider);
     final totalAssets = timelineService.totalAssets;
@@ -282,11 +252,6 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     if (index != _currentPage) {
       _pageController.jumpToPage(index);
       _onAssetChanged(index);
-    } else if (currentAsset is RemoteAsset && currentAsset.stackId != null && assetIndex == null) {
-      final timelineAsset = timelineService.getAssetSafe(index);
-      if (timelineAsset is! RemoteAsset || currentAsset.stackId != timelineAsset.stackId) {
-        _onAssetChanged(index);
-      }
     } else if (currentAsset != null && assetIndex == null) {
       _onAssetChanged(index);
     }

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

@@ -101,7 +101,7 @@ class ViewerBottomBar extends ConsumerWidget {
                       child: Column(
                         mainAxisSize: MainAxisSize.min,
                         children: [
-                          if (asset.isImage) OcrToggleButton(asset: asset),
+                          OcrToggleButton(asset: asset),
                           if (asset.isVideo) VideoControls(videoPlayerName: asset.heroTag),
                           if (!isReadonlyModeEnabled)
                             Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: actions),

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

@@ -16,6 +16,7 @@ import 'package:immich_mobile/presentation/widgets/bottom_sheet/map_bottom_sheet
 import 'package:immich_mobile/presentation/widgets/map/map.state.dart';
 import 'package:immich_mobile/presentation/widgets/map/map_utils.dart';
 import 'package:immich_mobile/providers/routes.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/utils/async_mutex.dart';
 import 'package:immich_mobile/utils/debounce.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
@@ -132,7 +133,8 @@ class _DriftMapState extends ConsumerState<DriftMap> {
     // When the AssetViewer is open, the DriftMap route stays alive in the background.
     // If we continue to update bounds, the map-scoped timeline service gets recreated and the previous one disposed,
     // which can invalidate the TimelineService instance that was passed into AssetViewerRoute (causing "loading forever").
-    if (ref.read(isAssetViewerOpenProvider)) {
+    final currentRoute = ref.read(currentRouteNameProvider);
+    if (currentRoute == AssetViewerRoute.name) {
       return;
     }
 
@@ -181,11 +183,6 @@ class _DriftMapState extends ConsumerState<DriftMap> {
 
   @override
   Widget build(BuildContext context) {
-    ref.listen<bool>(isAssetViewerOpenProvider, (previous, current) {
-      if (previous == true && !current) {
-        _debouncer.run(() => setBounds(forceReload: true));
-      }
-    });
     return Stack(
       children: [
         _Map(initialLocation: widget.initialLocation, onMapCreated: onMapCreated, onMapReady: onMapReady),

mobile/lib/presentation/widgets/people/person_edit_birthday_modal.widget.dart

@@ -65,7 +65,6 @@ class _DriftPersonNameEditFormState extends ConsumerState<DriftPersonBirthdayEdi
         child: ClipRRect(
           borderRadius: const BorderRadius.all(Radius.circular(16.0)),
           child: ScrollDatePicker(
-            viewType: datePickerColumnOrder(DateFormat.yMd(context.locale.toLanguageTag()).pattern),
             options: DatePickerOptions(
               backgroundColor: context.colorScheme.surfaceContainerHigh,
               itemExtent: 50,
@@ -119,18 +118,3 @@ class _DriftPersonNameEditFormState extends ConsumerState<DriftPersonBirthdayEdi
     );
   }
 }
-
-List<DatePickerViewType>? datePickerColumnOrder(String? pattern) {
-  if (pattern == null) {
-    return null;
-  }
-  final positions = {
-    DatePickerViewType.year: pattern.indexOf('y'),
-    DatePickerViewType.month: pattern.indexOf('M'),
-    DatePickerViewType.day: pattern.indexOf('d'),
-  };
-  if (positions.values.any((position) => position < 0)) {
-    return null;
-  }
-  return positions.keys.toList()..sort((a, b) => positions[a]!.compareTo(positions[b]!));
-}

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

@@ -1,4 +0,0 @@
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/repositories/toast.repository.dart';
-
-final toastRepositoryProvider = Provider<ToastRepository>((ref) => const .new());

mobile/lib/providers/routes.provider.dart

@@ -1,19 +1,7 @@
 import 'package:flutter/widgets.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/routing/router.dart';
-
-@visibleForTesting
-bool isRouteInStack(Ref ref, String routeName) {
-  final router = ref.watch(appRouterProvider);
-  void onChange() => ref.invalidateSelf();
-  router.addListener(onChange);
-  ref.onDispose(() => router.removeListener(onChange));
-  return router.stackData.any((route) => route.name == routeName);
-}
-
-final inLockedViewProvider = Provider<bool>((ref) => isRouteInStack(ref, DriftLockedFolderRoute.name));
-final isAssetViewerOpenProvider = Provider<bool>((ref) => isRouteInStack(ref, AssetViewerRoute.name));
 
+final inLockedViewProvider = StateProvider<bool>((ref) => false);
 final currentRouteNameProvider = StateProvider<String?>((ref) => null);
 final previousRouteNameProvider = StateProvider<String?>((ref) => null);
 final previousRouteDataProvider = StateProvider<RouteSettings?>((ref) => null);

mobile/lib/repositories/asset_api.repository.dart

@@ -1,14 +1,12 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:http/http.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset_edit.model.dart' hide AssetEditAction;
 import 'package:immich_mobile/domain/models/stack.model.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
 import 'package:immich_mobile/repositories/api.repository.dart';
-import 'package:immich_mobile/utils/option.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
-import 'package:openapi/api.dart' as api show AssetVisibility;
-import 'package:openapi/api.dart' hide AssetVisibility;
+import 'package:openapi/api.dart';
 
 final assetApiRepositoryProvider = Provider(
   (ref) => AssetApiRepository(
@@ -43,7 +41,7 @@ class AssetApiRepository extends ApiRepository {
     return response?.count ?? 0;
   }
 
-  Future<void> updateVisibility(List<String> ids, AssetVisibility visibility) async {
+  Future<void> updateVisibility(List<String> ids, AssetVisibilityEnum visibility) async {
     return _api.updateAssets(AssetBulkUpdateDto(ids: ids, visibility: Optional.present(_mapVisibility(visibility))));
   }
 
@@ -79,11 +77,11 @@ class AssetApiRepository extends ApiRepository {
     return _api.downloadAssetWithHttpInfo(id, edited: edited);
   }
 
-  api.AssetVisibility _mapVisibility(AssetVisibility visibility) => switch (visibility) {
-    AssetVisibility.timeline => api.AssetVisibility.timeline,
-    AssetVisibility.hidden => api.AssetVisibility.hidden,
-    AssetVisibility.locked => api.AssetVisibility.locked,
-    AssetVisibility.archive => api.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 {
@@ -108,20 +106,6 @@ class AssetApiRepository extends ApiRepository {
   Future<void> removeEdits(String assetId) async {
     return _api.removeAssetEdits(assetId);
   }
-
-  Future<void> update(
-    List<String> remoteIds, {
-    Option<bool> isFavorite = const .none(),
-    Option<AssetVisibility> visibility = const .none(),
-  }) {
-    return _api.updateAssets(
-      AssetBulkUpdateDto(
-        ids: remoteIds,
-        isFavorite: isFavorite.toOptional(),
-        visibility: visibility.map(_mapVisibility).toOptional(),
-      ),
-    );
-  }
 }
 
 extension on StackResponseDto {

mobile/lib/repositories/toast.repository.dart

@@ -1,26 +0,0 @@
-import 'dart:async';
-
-import 'package:immich_ui/immich_ui.dart';
-
-class ToastOption {
-  final Duration? timeout;
-  final FutureOr<void> Function()? onUndo;
-
-  const ToastOption({this.timeout, this.onUndo});
-}
-
-class ToastRepository {
-  const ToastRepository();
-
-  FutureOr<void> success(String message, {ToastOption? toast}) {
-    snackbar.success(message, duration: toast?.timeout);
-  }
-
-  FutureOr<void> info(String message, {ToastOption? toast}) {
-    snackbar.info(message, duration: toast?.timeout);
-  }
-
-  FutureOr<void> error(String message, {ToastOption? toast}) {
-    snackbar.error(message, duration: toast?.timeout);
-  }
-}

mobile/lib/routing/app_navigation_observer.dart

@@ -4,6 +4,7 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/providers/routes.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
 
 class AppNavigationObserver extends AutoRouterObserver {
   /// Riverpod Instance
@@ -11,12 +12,35 @@ class AppNavigationObserver extends AutoRouterObserver {
 
   AppNavigationObserver({required this.ref});
 
+  @override
+  Future<void> didChangeTabRoute(TabPageRoute route, TabPageRoute previousRoute) async {
+    unawaited(Future(() => ref.read(inLockedViewProvider.notifier).state = false));
+  }
+
   @override
   void didPush(Route route, Route? previousRoute) {
+    _handleDriftLockedFolderState(route, previousRoute);
     Future(() {
       ref.read(currentRouteNameProvider.notifier).state = route.settings.name;
       ref.read(previousRouteNameProvider.notifier).state = previousRoute?.settings.name;
       ref.read(previousRouteDataProvider.notifier).state = previousRoute?.settings;
     });
   }
+
+  _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);
+    }
+  }
 }

mobile/lib/services/action.service.dart

@@ -79,17 +79,17 @@ class ActionService {
   }
 
   Future<void> archive(List<String> remoteIds) async {
-    await _assetApiRepository.updateVisibility(remoteIds, .archive);
+    await _assetApiRepository.updateVisibility(remoteIds, AssetVisibilityEnum.archive);
     await _remoteAssetRepository.updateVisibility(remoteIds, AssetVisibility.archive);
   }
 
   Future<void> unArchive(List<String> remoteIds) async {
-    await _assetApiRepository.updateVisibility(remoteIds, .timeline);
+    await _assetApiRepository.updateVisibility(remoteIds, AssetVisibilityEnum.timeline);
     await _remoteAssetRepository.updateVisibility(remoteIds, AssetVisibility.timeline);
   }
 
   Future<void> moveToLockFolder(List<String> remoteIds, List<String> localIds) async {
-    await _assetApiRepository.updateVisibility(remoteIds, .locked);
+    await _assetApiRepository.updateVisibility(remoteIds, AssetVisibilityEnum.locked);
     await _remoteAssetRepository.updateVisibility(remoteIds, AssetVisibility.locked);
 
     // Ask user if they want to delete local copies
@@ -99,7 +99,7 @@ class ActionService {
   }
 
   Future<void> removeFromLockFolder(List<String> remoteIds) async {
-    await _assetApiRepository.updateVisibility(remoteIds, .timeline);
+    await _assetApiRepository.updateVisibility(remoteIds, AssetVisibilityEnum.timeline);
     await _remoteAssetRepository.updateVisibility(remoteIds, AssetVisibility.timeline);
   }
 

mobile/lib/services/api.service.dart

@@ -96,12 +96,12 @@ class ApiService {
   ///  port   - optional (default: based on schema)
   ///  path   - optional
   Future<String> resolveEndpoint(String serverUrl) async {
-    String url = normalizeServerUrl(serverUrl);
+    String url = sanitizeUrl(serverUrl);
 
     // Check for /.well-known/immich
     final wellKnownEndpoint = await _getWellKnownEndpoint(url);
     if (wellKnownEndpoint.isNotEmpty) {
-      url = normalizeServerUrl(wellKnownEndpoint);
+      url = sanitizeUrl(wellKnownEndpoint);
     }
 
     if (!await _isEndpointAvailable(url)) {

mobile/lib/services/background_upload.service.dart

@@ -290,10 +290,13 @@ class BackgroundUploadService {
       return null;
     }
 
-    final fileName = await _assetMediaRepository.getOriginalFilename(asset.id) ?? asset.name;
-    // Some apps (e.g. DJI/Fusion) return names without an extension; fall back to the asset name for those.
-    final extension = p.extension(file.path).isNotEmpty ? p.extension(file.path) : p.extension(asset.name);
-    final originalFileName = p.setExtension(fileName, extension);
+    String fileName = await _assetMediaRepository.getOriginalFilename(asset.id) ?? asset.name;
+    final hasExtension = p.extension(fileName).isNotEmpty;
+    if (!hasExtension) {
+      fileName = p.setExtension(fileName, p.extension(asset.name));
+    }
+
+    final originalFileName = entity.isLivePhoto ? p.setExtension(fileName, p.extension(file.path)) : fileName;
 
     String metadata = UploadTaskMetadata(
       localAssetId: asset.id,

mobile/lib/services/foreground_upload.service.dart

@@ -309,10 +309,17 @@ class ForegroundUploadService {
         return;
       }
 
-      final fileName = await _assetMediaRepository.getOriginalFilename(asset.id) ?? asset.name;
-      // Some apps (e.g. DJI/Fusion) return names without an extension; fall back to the asset name for those.
-      final extension = p.extension(file.path).isNotEmpty ? p.extension(file.path) : p.extension(asset.name);
-      final originalFileName = p.setExtension(fileName, extension);
+      String fileName = await _assetMediaRepository.getOriginalFilename(asset.id) ?? asset.name;
+
+      /// Handle special file name from DJI or Fusion app
+      /// If the file name has no extension, likely due to special renaming template by specific apps
+      /// we append the original extension from the asset name
+      final hasExtension = p.extension(fileName).isNotEmpty;
+      if (!hasExtension) {
+        fileName = p.setExtension(fileName, p.extension(asset.name));
+      }
+
+      final originalFileName = entity.isLivePhoto ? p.setExtension(fileName, p.extension(file.path)) : fileName;
       final deviceId = Store.get(StoreKey.deviceId);
 
       final fields = {

mobile/lib/utils/datetime_helpers.dart

@@ -1,4 +1,4 @@
-const int _maxMillisecondsSinceEpoch = 253402214400000; // 9999-12-31
+const int _maxMillisecondsSinceEpoch = 8640000000000000; // 275760-09-13
 const int _minMillisecondsSinceEpoch = -62135596800000; // 0001-01-01
 
 DateTime? tryFromSecondsSinceEpoch(int? secondsSinceEpoch, {bool isUtc = false}) {

mobile/lib/utils/option.dart

@@ -1,4 +1,3 @@
-import 'package:drift/drift.dart';
 import 'package:openapi/api.dart' show Optional;
 
 sealed class Option<T> {
@@ -22,11 +21,6 @@ sealed class Option<T> {
     None() => null,
   };
 
-  Option<U> map<U>(U Function(T value) f) => switch (this) {
-    Some(:final value) => Some(f(value)),
-    None() => None<U>(),
-  };
-
   U fold<U>(U Function(T value) onSome, U Function() onNone) => switch (this) {
     Some(:final value) => onSome(value),
     None() => onNone(),
@@ -71,10 +65,3 @@ extension OptionToOptional<T> on Option<T> {
     Some(:final value) => Optional.present(value),
   };
 }
-
-extension OptionToDriftValue<T> on Option<T> {
-  Value<T> toDriftValue() => switch (this) {
-    Some(:final value) => Value(value),
-    None() => const Value.absent(),
-  };
-}

mobile/lib/utils/url_helper.dart

@@ -2,31 +2,12 @@ import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:punycode/punycode.dart';
 
-/// Normalizes a server URL, guaranteeing that it has a schema and no trailing slashes
-String normalizeServerUrl(String url) {
-  final trimmedUrl = url.trim();
-
+String sanitizeUrl(String url) {
   // Add schema if none is set
-  final urlWithSchema = trimmedUrl.contains('://') ? trimmedUrl : "https://$trimmedUrl";
+  final urlWithSchema = url.trimLeft().startsWith(RegExp(r"https?://")) ? url : "https://$url";
 
   // Remove trailing slash(es)
-  return urlWithSchema.replaceFirst(RegExp(r"/+$"), "");
-}
-
-/// Validates a user-entered server URL
-bool _validateServerUrl(String url) {
-  final parsedUrl = Uri.tryParse(url);
-  return parsedUrl != null && parsedUrl.scheme.startsWith(RegExp(r'^https?$')) && parsedUrl.host.isNotEmpty;
-}
-
-/// Normalizes and validates that a server URL is supported
-bool normalizeAndValidateServerUrl(String? url) {
-  if (url == null || url.isEmpty) {
-    return true;
-  }
-
-  final normalizedUrl = normalizeServerUrl(url);
-  return _validateServerUrl(normalizedUrl);
+  return urlWithSchema.trimRight().replaceFirst(RegExp(r"/+$"), "");
 }
 
 String? getServerUrl() {

mobile/lib/widgets/forms/login/login_form.dart

@@ -43,7 +43,18 @@ class LoginForm extends HookConsumerWidget {
 
   final log = Logger('LoginForm');
 
-  String? _validateUrl(String? url) => normalizeAndValidateServerUrl(url) ? null : 'login_form_err_invalid_url'.tr();
+  String? _validateUrl(String? url) {
+    if (url == null || url.isEmpty) {
+      return null;
+    }
+
+    final parsedUrl = Uri.tryParse(url);
+    if (parsedUrl == null || !parsedUrl.isAbsolute || !parsedUrl.scheme.startsWith("http") || parsedUrl.host.isEmpty) {
+      return 'login_form_err_invalid_url'.tr();
+    }
+
+    return null;
+  }
 
   String? _validateEmail(String? email) {
     if (email == null || email == '') {
@@ -90,7 +101,7 @@ class LoginForm extends HookConsumerWidget {
     /// Fetch the server login credential and enables oAuth login if necessary
     /// Returns true if successful, false otherwise
     Future<void> getServerAuthSettings() async {
-      final sanitizeServerUrl = normalizeServerUrl(serverEndpointController.text);
+      final sanitizeServerUrl = sanitizeUrl(serverEndpointController.text);
       final serverUrl = punycodeEncodeUrl(sanitizeServerUrl);
 
       // Guard empty URL
@@ -293,7 +304,7 @@ class LoginForm extends HookConsumerWidget {
 
       try {
         oAuthServerUrl = await oAuthService.getOAuthServerUrl(
-          normalizeServerUrl(serverEndpointController.text),
+          sanitizeUrl(serverEndpointController.text),
           state,
           codeChallenge,
         );
@@ -425,7 +436,7 @@ class LoginForm extends HookConsumerWidget {
                 Padding(
                   padding: const EdgeInsets.only(bottom: ImmichSpacing.md),
                   child: Text(
-                    normalizeServerUrl(serverEndpointController.text),
+                    sanitizeUrl(serverEndpointController.text),
                     style: context.textTheme.displaySmall,
                     textAlign: TextAlign.center,
                   ),

mobile/lib/widgets/settings/backup_settings/drift_backup_settings.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 
+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/local_album.model.dart';
@@ -9,7 +10,6 @@ import 'package:immich_mobile/domain/services/sync_linked_album.service.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/generated/translations.g.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/backup_album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
@@ -255,11 +255,11 @@ class _BackupDelaySlider extends ConsumerWidget {
     _ => 600,
   };
 
-  static String formatBackupDelaySliderValue(BuildContext context, int v) => switch (v) {
-    0 => context.t.setting_notifications_notify_seconds(count: 5),
-    1 => context.t.setting_notifications_notify_seconds(count: 30),
-    2 => context.t.setting_notifications_notify_minutes(count: 2),
-    _ => context.t.setting_notifications_notify_minutes(count: 10),
+  static 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'}),
   };
 
   @override
@@ -272,8 +272,8 @@ class _BackupDelaySlider extends ConsumerWidget {
         Padding(
           padding: const EdgeInsets.only(left: 24.0, top: 8.0),
           child: Text(
-            context.t.backup_controller_page_background_delay(
-              duration: formatBackupDelaySliderValue(context, currentValue),
+            'backup_controller_page_background_delay'.tr(
+              namedArgs: {'duration': formatBackupDelaySliderValue(currentValue)},
             ),
             style: context.textTheme.bodyLarge?.copyWith(fontWeight: FontWeight.w500),
           ),
@@ -291,7 +291,7 @@ class _BackupDelaySlider extends ConsumerWidget {
           max: 3.0,
           min: 0.0,
           divisions: 3,
-          label: formatBackupDelaySliderValue(context, currentValue),
+          label: formatBackupDelaySliderValue(currentValue),
         ),
       ],
     );

mobile/packages/ui/lib/src/snackbar.dart

@@ -6,23 +6,18 @@ final scaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
 class SnackbarManager {
   const SnackbarManager();
 
-  ScaffoldFeatureController<SnackBar, SnackBarClosedReason>? show(
-    String message,
-    SnackbarType type, {
-    Duration? duration,
-  }) {
+  ScaffoldFeatureController<SnackBar, SnackBarClosedReason>? show(String message, SnackbarType type) {
     final messenger = scaffoldMessengerKey.currentState;
     final context = scaffoldMessengerKey.currentContext;
     if (messenger == null || context == null) {
       return null;
     }
 
-    duration ??= const .new(seconds: 4);
     messenger.hideCurrentSnackBar();
-    return messenger.showSnackBar(_build(context, message, type, duration));
+    return messenger.showSnackBar(_build(context, message, type));
   }
 
-  SnackBar _build(BuildContext context, String message, SnackbarType type, Duration duration) {
+  SnackBar _build(BuildContext context, String message, SnackbarType type) {
     final theme = Theme.of(context);
     final colors = theme.extension<ImmichColors>() ?? ImmichColors.harmonized(theme.colorScheme);
     final (IconData icon, Color background, Color foreground) = switch (type) {
@@ -34,7 +29,7 @@ class SnackbarManager {
     return SnackBar(
       behavior: .floating,
       backgroundColor: background,
-      duration: duration,
+      duration: const .new(seconds: 4),
       shape: const RoundedRectangleBorder(borderRadius: .all(.circular(ImmichRadius.sm))),
       content: Row(
         children: [
@@ -53,14 +48,11 @@ class SnackbarManager {
     );
   }
 
-  ScaffoldFeatureController<SnackBar, SnackBarClosedReason>? info(String message, {Duration? duration}) =>
-      show(message, .info, duration: duration);
+  ScaffoldFeatureController<SnackBar, SnackBarClosedReason>? info(String message) => show(message, .info);
 
-  ScaffoldFeatureController<SnackBar, SnackBarClosedReason>? success(String message, {Duration? duration}) =>
-      show(message, .success, duration: duration);
+  ScaffoldFeatureController<SnackBar, SnackBarClosedReason>? success(String message) => show(message, .success);
 
-  ScaffoldFeatureController<SnackBar, SnackBarClosedReason>? error(String message, {Duration? duration}) =>
-      show(message, .error, duration: duration);
+  ScaffoldFeatureController<SnackBar, SnackBarClosedReason>? error(String message) => show(message, .error);
 }
 
 const snackbar = SnackbarManager();

mobile/test/drift/main/generated/schema.dart

@@ -35,7 +35,6 @@ import 'schema_v28.dart' as v28;
 import 'schema_v29.dart' as v29;
 import 'schema_v30.dart' as v30;
 import 'schema_v31.dart' as v31;
-import 'schema_v32.dart' as v32;
 
 class GeneratedHelper implements SchemaInstantiationHelper {
   @override
@@ -103,8 +102,6 @@ class GeneratedHelper implements SchemaInstantiationHelper {
         return v30.DatabaseAtV30(db);
       case 31:
         return v31.DatabaseAtV31(db);
-      case 32:
-        return v32.DatabaseAtV32(db);
       default:
         throw MissingSchemaException(version, versions);
     }
@@ -142,6 +139,5 @@ class GeneratedHelper implements SchemaInstantiationHelper {
     29,
     30,
     31,
-    32,
   ];
 }

mobile/test/drift/main/migration_test.dart

@@ -8,7 +8,6 @@ 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;
-import 'generated/schema_v31.dart' as v31;
 
 void main() {
   driftRuntimeOptions.dontWarnAboutMultipleDatabases = true;
@@ -36,55 +35,4 @@ void main() {
       });
     }
   });
-
-  group('migration from v31 to v32', () {
-    test('clamps timestamps outside the SQLite-supported range', () async {
-      final schema = await verifier.schemaAt(31);
-
-      final oldDb = v31.DatabaseAtV31(schema.newConnection());
-      await oldDb.customStatement(
-        "INSERT INTO local_asset_entity (id, name, type, created_at, updated_at, adjustment_time) "
-        "VALUES ('asset-1', 'a.jpg', 0, '+275760-09-13T00:00:00.000Z', '-000001-01-01T00:00:00.000Z', '+275760-09-13T00:00:00.000Z'), "
-        "('asset-2', 'b.jpg', 0, '2025-01-01T00:00:00.000Z', '2025-01-01T00:00:00.000Z', '2025-01-01T00:00:00.000Z')",
-      );
-      await oldDb.customStatement(
-        "INSERT INTO local_album_entity (id, name, updated_at, backup_selection) "
-        "VALUES ('album-1', 'album', '+275760-09-13T00:00:00.000Z', 0)",
-      );
-      await oldDb.close();
-
-      final db = Drift(schema.newConnection());
-      await verifier.migrateAndValidate(db, 32);
-
-      final clamped = await db
-          .customSelect(
-            "SELECT created_at, updated_at, adjustment_time FROM local_asset_entity WHERE id = 'asset-1'",
-          )
-          .getSingle();
-      expect(clamped.read<String>('created_at'), '9999-12-31T00:00:00.000Z');
-      expect(clamped.read<String>('updated_at'), '0001-01-01T00:00:00.000Z');
-      expect(clamped.readNullable<String>('adjustment_time'), null);
-
-      final untouched = await db
-          .customSelect(
-            "SELECT created_at, updated_at, adjustment_time FROM local_asset_entity WHERE id = 'asset-2'",
-          )
-          .getSingle();
-      expect(untouched.read<String>('created_at'), '2025-01-01T00:00:00.000Z');
-      expect(untouched.read<String>('updated_at'), '2025-01-01T00:00:00.000Z');
-      expect(
-        untouched.readNullable<String>('adjustment_time'),
-        '2025-01-01T00:00:00.000Z',
-      );
-
-      final album = await db
-          .customSelect(
-            "SELECT updated_at FROM local_album_entity WHERE id = 'album-1'",
-          )
-          .getSingle();
-      expect(album.read<String>('updated_at'), '9999-12-31T00:00:00.000Z');
-
-      await db.close();
-    });
-  });
 }

mobile/test/modules/utils/datetime_helpers_test.dart

@@ -16,8 +16,8 @@ void main() {
     });
 
     test('returns null for value above maximum allowed range', () {
-      // _maxMillisecondsSinceEpoch = 253402214400000
-      final seconds = 253402214400000 ~/ 1000 + 1; // One second after max allowed
+      // _maxMillisecondsSinceEpoch = 8640000000000000
+      final seconds = 8640000000000000 ~/ 1000 + 1; // One second after max allowed
       final result = tryFromSecondsSinceEpoch(seconds);
       expect(result, isNull);
     });
@@ -29,15 +29,9 @@ void main() {
     });
 
     test('returns correct DateTime for maximum allowed value', () {
-      final seconds = 253402214400000 ~/ 1000; // Maximum allowed timestamp
+      final seconds = 8640000000000000 ~/ 1000; // Maximum allowed timestamp
       final result = tryFromSecondsSinceEpoch(seconds);
-      expect(result, DateTime.fromMillisecondsSinceEpoch(253402214400000));
-    });
-
-    test('returns null for value within Dart range but beyond SQLite range', () {
-      final seconds = 8640000000000; // Dart's maximum DateTime (year 275760)
-      final result = tryFromSecondsSinceEpoch(seconds);
-      expect(result, isNull);
+      expect(result, DateTime.fromMillisecondsSinceEpoch(8640000000000000));
     });
 
     test('returns correct DateTime for negative timestamp', () {

mobile/test/modules/utils/url_helper_test.dart

@@ -77,40 +77,6 @@ void main() {
     });
   });
 
-  group('normalizeAndValidateServerUrl', () {
-    test('should treat null as valid', () {
-      expect(normalizeAndValidateServerUrl(null), isTrue);
-    });
-
-    test('should treat empty string as valid', () {
-      expect(normalizeAndValidateServerUrl(''), isTrue);
-    });
-
-    test('should accept a bare host', () {
-      expect(normalizeAndValidateServerUrl('demo.immich.app'), isTrue);
-    });
-
-    test('should accept a bare host with a port', () {
-      expect(normalizeAndValidateServerUrl('192.168.1.1:2283'), isTrue);
-    });
-
-    test('should accept an http URL', () {
-      expect(normalizeAndValidateServerUrl('http://demo.immich.app'), isTrue);
-    });
-
-    test('should accept an https URL', () {
-      expect(normalizeAndValidateServerUrl('https://demo.immich.app:2283/api'), isTrue);
-    });
-
-    test('should reject a non-http scheme', () {
-      expect(normalizeAndValidateServerUrl('ftp://demo.immich.app'), isFalse);
-    });
-
-    test('should reject scheme only input', () {
-      expect(normalizeAndValidateServerUrl('https://'), isFalse);
-    });
-  });
-
   group('punycodeDecodeUrl', () {
     test('should return null for null input', () {
       expect(punycodeDecodeUrl(null), isNull);

mobile/test/presentation/widgets/people/person_edit_birthday_modal_test.dart

@@ -1,69 +0,0 @@
-import 'package:flutter_test/flutter_test.dart';
-import 'package:immich_mobile/presentation/widgets/people/person_edit_birthday_modal.widget.dart';
-import 'package:intl/date_symbol_data_local.dart';
-import 'package:intl/intl.dart';
-import 'package:scroll_date_picker/scroll_date_picker.dart';
-
-void main() {
-  group('datePickerColumnOrder', () {
-    test('month first (en_US)', () {
-      expect(
-        datePickerColumnOrder('M/d/y'),
-        orderedEquals([DatePickerViewType.month, DatePickerViewType.day, DatePickerViewType.year]),
-      );
-    });
-
-    test('day first (pl)', () {
-      expect(
-        datePickerColumnOrder('dd.MM.y'),
-        orderedEquals([DatePickerViewType.day, DatePickerViewType.month, DatePickerViewType.year]),
-      );
-    });
-
-    test('year first (ko)', () {
-      expect(
-        datePickerColumnOrder('y. M. d.'),
-        orderedEquals([DatePickerViewType.year, DatePickerViewType.month, DatePickerViewType.day]),
-      );
-    });
-
-    test('null pattern falls back to package default', () {
-      expect(datePickerColumnOrder(null), isNull);
-    });
-
-    test('missing field falls back to package default', () {
-      expect(datePickerColumnOrder('M/y'), isNull);
-    });
-  });
-
-  group('datePickerColumnOrder with real locale patterns', () {
-    setUpAll(() async {
-      await initializeDateFormatting();
-    });
-
-    for (final (locales, order, name) in const [
-      (
-        ['en', 'en-US', 'en-PH'],
-        [DatePickerViewType.month, DatePickerViewType.day, DatePickerViewType.year],
-        'month/day/year',
-      ),
-      (
-        ['en-GB', 'fr', 'fr-FR', 'de', 'de-DE', 'pl'],
-        [DatePickerViewType.day, DatePickerViewType.month, DatePickerViewType.year],
-        'day/month/year',
-      ),
-      (
-        ['ja', 'ja-JP', 'zh', 'zh-CN', 'ko', 'ko-KR'],
-        [DatePickerViewType.year, DatePickerViewType.month, DatePickerViewType.day],
-        'year/month/day',
-      ),
-      (['ky'], [DatePickerViewType.year, DatePickerViewType.day, DatePickerViewType.month], 'year/day/month'),
-    ]) {
-      for (final locale in locales) {
-        test('$locale uses $name', () {
-          expect(datePickerColumnOrder(DateFormat.yMd(locale).pattern), orderedEquals(order));
-        });
-      }
-    }
-  });
-}

mobile/test/services/background_upload.service_test.dart

@@ -136,51 +136,6 @@ void main() {
       expect(task, isNotNull);
       expect(task!.fields.containsKey('visibility'), isFalse);
     });
-
-    test('corrects the extension when iOS returns a rendered file for a .dng asset', () async {
-      final asset = LocalAssetStub.image1;
-      final mockEntity = MockAssetEntity();
-      final mockFile = File('/path/to/IMG_6499.jpg');
-
-      when(() => mockEntity.isLivePhoto).thenReturn(false);
-      when(() => mockStorageRepository.getAssetEntityForAsset(asset)).thenAnswer((_) async => mockEntity);
-      when(() => mockStorageRepository.getFileForAsset(asset.id)).thenAnswer((_) async => mockFile);
-      when(() => mockAssetMediaRepository.getOriginalFilename(asset.id)).thenAnswer((_) async => 'IMG_6499.dng');
-
-      final task = await sut.getUploadTask(asset);
-      expect(task, isNotNull);
-      expect(task!.fields['filename'], equals('IMG_6499.jpg'));
-    });
-
-    test('keeps the .dng extension for a genuine RAW original', () async {
-      final asset = LocalAssetStub.image1;
-      final mockEntity = MockAssetEntity();
-      final mockFile = File('/path/to/IMG_5210.dng');
-
-      when(() => mockEntity.isLivePhoto).thenReturn(false);
-      when(() => mockStorageRepository.getAssetEntityForAsset(asset)).thenAnswer((_) async => mockEntity);
-      when(() => mockStorageRepository.getFileForAsset(asset.id)).thenAnswer((_) async => mockFile);
-      when(() => mockAssetMediaRepository.getOriginalFilename(asset.id)).thenAnswer((_) async => 'IMG_5210.dng');
-
-      final task = await sut.getUploadTask(asset);
-      expect(task, isNotNull);
-      expect(task!.fields['filename'], equals('IMG_5210.dng'));
-    });
-
-    test('borrows the extension from the asset name for an extensionless name (DJI/Fusion)', () async {
-      final asset = LocalAssetStub.image1;
-      final mockEntity = MockAssetEntity();
-      final mockFile = File('/path/to/DJI_0001');
-
-      when(() => mockEntity.isLivePhoto).thenReturn(false);
-      when(() => mockStorageRepository.getAssetEntityForAsset(asset)).thenAnswer((_) async => mockEntity);
-      when(() => mockStorageRepository.getFileForAsset(asset.id)).thenAnswer((_) async => mockFile);
-      when(() => mockAssetMediaRepository.getOriginalFilename(asset.id)).thenAnswer((_) async => 'DJI_0001');
-
-      final task = await sut.getUploadTask(asset);
-      expect(task, isNotNull);
-      expect(task!.fields['filename'], equals('DJI_0001.jpg'));
-    });
   });
 
   group('getLivePhotoUploadTask', () {

mobile/test/services/foreground_upload.service_test.dart

@@ -81,24 +81,6 @@ void main() {
     return captured;
   }
 
-  List<String> captureOriginalFileNames() {
-    final captured = <String>[];
-    when(
-      () => mockUploadRepository.uploadFile(
-        file: any(named: 'file'),
-        originalFileName: any(named: 'originalFileName'),
-        fields: any(named: 'fields'),
-        cancelToken: any(named: 'cancelToken'),
-        onProgress: any(named: 'onProgress'),
-        logContext: any(named: 'logContext'),
-      ),
-    ).thenAnswer((invocation) async {
-      captured.add(invocation.namedArguments[#originalFileName] as String);
-      return UploadResult.success(remoteAssetId: 'remote-${captured.length}');
-    });
-    return captured;
-  }
-
   group('uploadSingleAsset', () {
     test('should upload the motion part hidden and keep the still image visible', () async {
       final asset = LocalAssetStub.image1;
@@ -142,59 +124,5 @@ void main() {
       expect(captured, hasLength(1));
       expect(captured[0].containsKey('visibility'), isFalse);
     });
-
-    test('corrects the extension when iOS returns a rendered file for a .dng asset', () async {
-      final asset = LocalAssetStub.image1;
-      final mockEntity = MockAssetEntity();
-      final stillFile = File('/path/to/IMG_6499.jpg');
-
-      when(() => mockEntity.isLivePhoto).thenReturn(false);
-      when(() => mockStorageRepository.getAssetEntityForAsset(asset)).thenAnswer((_) async => mockEntity);
-      when(() => mockStorageRepository.isAssetAvailableLocally(asset.id)).thenAnswer((_) async => true);
-      when(() => mockStorageRepository.getFileForAsset(asset.id)).thenAnswer((_) async => stillFile);
-      when(() => mockAssetMediaRepository.getOriginalFilename(asset.id)).thenAnswer((_) async => 'IMG_6499.dng');
-
-      final names = captureOriginalFileNames();
-
-      await sut.uploadSingleAsset(asset, null, callbacks: const UploadCallbacks());
-
-      expect(names, equals(['IMG_6499.jpg']));
-    });
-
-    test('keeps the .dng extension for a genuine RAW original', () async {
-      final asset = LocalAssetStub.image1;
-      final mockEntity = MockAssetEntity();
-      final stillFile = File('/path/to/IMG_5210.dng');
-
-      when(() => mockEntity.isLivePhoto).thenReturn(false);
-      when(() => mockStorageRepository.getAssetEntityForAsset(asset)).thenAnswer((_) async => mockEntity);
-      when(() => mockStorageRepository.isAssetAvailableLocally(asset.id)).thenAnswer((_) async => true);
-      when(() => mockStorageRepository.getFileForAsset(asset.id)).thenAnswer((_) async => stillFile);
-      when(() => mockAssetMediaRepository.getOriginalFilename(asset.id)).thenAnswer((_) async => 'IMG_5210.dng');
-
-      final names = captureOriginalFileNames();
-
-      await sut.uploadSingleAsset(asset, null, callbacks: const UploadCallbacks());
-
-      expect(names, equals(['IMG_5210.dng']));
-    });
-
-    test('borrows the extension from the asset name for an extensionless name (DJI/Fusion)', () async {
-      final asset = LocalAssetStub.image1;
-      final mockEntity = MockAssetEntity();
-      final stillFile = File('/path/to/DJI_0001');
-
-      when(() => mockEntity.isLivePhoto).thenReturn(false);
-      when(() => mockStorageRepository.getAssetEntityForAsset(asset)).thenAnswer((_) async => mockEntity);
-      when(() => mockStorageRepository.isAssetAvailableLocally(asset.id)).thenAnswer((_) async => true);
-      when(() => mockStorageRepository.getFileForAsset(asset.id)).thenAnswer((_) async => stillFile);
-      when(() => mockAssetMediaRepository.getOriginalFilename(asset.id)).thenAnswer((_) async => 'DJI_0001');
-
-      final names = captureOriginalFileNames();
-
-      await sut.uploadSingleAsset(asset, null, callbacks: const UploadCallbacks());
-
-      expect(names, equals(['DJI_0001.jpg']));
-    });
   });
 }

packages/cli/src/index.ts

@@ -47,7 +47,7 @@ program
   .usage('[paths...] [options]')
   .addOption(new Option('-r, --recursive', 'Recursive').env('IMMICH_RECURSIVE').default(false))
   .addOption(new Option('-i, --ignore <pattern>', 'Pattern to ignore').env('IMMICH_IGNORE_PATHS'))
-  .addOption(new Option('--skip-hash', "Don't hash files before upload").env('IMMICH_SKIP_HASH').default(false))
+  .addOption(new Option('-h, --skip-hash', "Don't hash files before upload").env('IMMICH_SKIP_HASH').default(false))
   .addOption(new Option('-H, --include-hidden', 'Include hidden folders').env('IMMICH_INCLUDE_HIDDEN').default(false))
   .addOption(
     new Option('-a, --album', 'Automatically create albums based on folder name')

packages/plugin-core/manifest.json

@@ -308,76 +308,6 @@
       },
       "uiHints": ["Filter"]
     },
-    {
-      "name": "assetExifFilter",
-      "title": "Filter by EXIF metadata",
-      "description": "Filter assets by their EXIF properties",
-      "types": ["AssetV1"],
-      "schema": {
-        "type": "object",
-        "properties": {
-          "property": {
-            "title": "Property",
-            "description": "EXIF property to match",
-            "type": "string",
-            "enum": [
-              "make",
-              "model",
-              "exifImageWidth",
-              "exifImageHeight",
-              "fileSizeInByte",
-              "orientation",
-              "lensModel",
-              "fNumber",
-              "focalLength",
-              "iso",
-              "description",
-              "fps",
-              "exposureTime",
-              "livePhotoCID",
-              "timeZone",
-              "projectionType",
-              "profileDescription",
-              "colorspace",
-              "bitsPerSample",
-              "rating"
-            ],
-            "uiHint": {
-              "order": 1
-            }
-          },
-          "pattern": {
-            "type": "string",
-            "title": "Pattern",
-            "description": "Text or regex pattern to match against property value",
-            "uiHint": {
-              "order": 2
-            }
-          },
-          "matchType": {
-            "type": "string",
-            "title": "Match type",
-            "enum": ["contains", "startsWith", "exact", "regex"],
-            "default": "contains",
-            "description": "Type of pattern matching to perform",
-            "uiHint": {
-              "order": 3
-            }
-          },
-          "caseSensitive": {
-            "type": "boolean",
-            "default": false,
-            "title": "Case sensitive",
-            "description": "Whether matching should be case-sensitive",
-            "uiHint": {
-              "order": 4
-            }
-          }
-        },
-        "required": ["property", "pattern"]
-      },
-      "uiHints": ["Filter"]
-    },
     {
       "name": "assetArchive",
       "title": "Archive asset",

packages/plugin-core/src/index.ts

@@ -2,42 +2,6 @@ import { wrapper } from '@immich/plugin-sdk';
 import { AssetVisibility } from '@immich/sdk';
 import type { Manifest } from '../dist/index.d.ts';
 
-type MatchValueConfig = {
-  pattern: string;
-  matchType?: 'contains' | 'exact' | 'regex' | 'startsWith';
-  caseSensitive?: boolean;
-};
-
-const matchValueResult = (value: string, config: MatchValueConfig) => {
-  const { pattern, matchType = 'contains', caseSensitive = false } = config;
-  const searchName = caseSensitive ? value : value.toLowerCase();
-  const searchPattern = caseSensitive ? pattern : pattern.toLowerCase();
-
-  switch (matchType) {
-    case 'contains': {
-      return { workflow: { continue: searchName.includes(searchPattern) } };
-    }
-
-    case 'exact': {
-      return { workflow: { continue: searchName === searchPattern } };
-    }
-
-    case 'startsWith': {
-      return { workflow: { continue: searchName.startsWith(searchPattern) } };
-    }
-
-    case 'regex': {
-      const flags = caseSensitive ? '' : 'i';
-      const regex = new RegExp(searchPattern, flags);
-      return { workflow: { continue: regex.test(value) } };
-    }
-
-    default: {
-      return {};
-    }
-  }
-};
-
 const methods = wrapper<Manifest>({
   assetAddToAlbums: ({ config, data, functions }) => {
     const assetId = data.asset.id;
@@ -89,7 +53,39 @@ const methods = wrapper<Manifest>({
     }
   },
 
-  assetFileFilter: ({ data, config }) => matchValueResult(data.asset.originalFileName || '', config),
+  assetFileFilter: ({ data, config }) => {
+    const { pattern, matchType = 'contains', caseSensitive = false, usePath = false } = config;
+
+    const { asset } = data;
+
+    const fileName = usePath ? asset.originalPath : asset.originalFileName;
+    const searchName = caseSensitive ? fileName : fileName.toLowerCase();
+    const searchPattern = caseSensitive ? pattern : pattern.toLowerCase();
+
+    switch (matchType) {
+      case 'contains': {
+        return { workflow: { continue: searchName.includes(searchPattern) } };
+      }
+
+      case 'exact': {
+        return { workflow: { continue: searchName === searchPattern } };
+      }
+
+      case 'startsWith': {
+        return { workflow: { continue: searchName.startsWith(searchPattern) } };
+      }
+
+      case 'regex': {
+        const flags = caseSensitive ? '' : 'i';
+        const regex = new RegExp(searchPattern, flags);
+        return { workflow: { continue: regex.test(fileName) } };
+      }
+
+      default: {
+        return {};
+      }
+    }
+  },
 
   assetLocationFilter: ({ config, data }) => {
     if (
@@ -128,14 +124,6 @@ const methods = wrapper<Manifest>({
     return { workflow: { continue: earthDiameter * delta <= (config.coordinate?.radius ?? 0) } };
   },
 
-  assetExifFilter: ({ config, data }) => {
-    if (!data.asset.exifInfo || data.asset.exifInfo[config.property] === null) {
-      return { workflow: { continue: false } };
-    }
-
-    return matchValueResult(String(data.asset.exifInfo[config.property]), config);
-  },
-
   assetDateFilter: ({ config, data }) => {
     const assetDate = new Date(data.asset.localDateTime);
     let startDate = new Date(config.startDate.year, config.startDate.month - 1, config.startDate.day);
@@ -212,7 +200,6 @@ const {
   assetFavorite,
   assetFileFilter,
   assetLocationFilter,
-  assetExifFilter,
   assetDateFilter,
   assetLock,
   assetMissingTimeZoneFilter,
@@ -230,7 +217,6 @@ export {
   assetFavorite,
   assetFileFilter,
   assetLocationFilter,
-  assetExifFilter,
   assetDateFilter,
   assetLock,
   assetMissingTimeZoneFilter,

server/src/commands/index.ts

@@ -8,13 +8,13 @@ import {
 } from 'src/commands/media-location.command';
 import { DisableOAuthLogin, EnableOAuthLogin } from 'src/commands/oauth-login';
 import { DisablePasswordLoginCommand, EnablePasswordLoginCommand } from 'src/commands/password-login';
-import { PromptPasswordResetQuestions, ResetAdminPasswordCommand } from 'src/commands/reset-admin-password.command';
+import { PromptPasswordQuestions, ResetAdminPasswordCommand } from 'src/commands/reset-admin-password.command';
 import { SchemaCheck } from 'src/commands/schema-check';
 import { VersionCommand } from 'src/commands/version.command';
 
 export const commandsAndQuestions = [
   ResetAdminPasswordCommand,
-  PromptPasswordResetQuestions,
+  PromptPasswordQuestions,
   PromptEmailQuestion,
   EnablePasswordLoginCommand,
   DisablePasswordLoginCommand,

server/src/commands/reset-admin-password.command.ts

@@ -3,7 +3,7 @@ import { UserAdminResponseDto } from 'src/dtos/user.dto';
 import { CliService } from 'src/services/cli.service';
 
 const prompt = (inquirer: InquirerService) => {
-  return (admin: UserAdminResponseDto) => {
+  return function ask(admin: UserAdminResponseDto) {
     const { id, oauthId, email, name } = admin;
     console.log(`Found Admin:
 - ID=${id}
@@ -11,7 +11,7 @@ const prompt = (inquirer: InquirerService) => {
 - Email=${email}
 - Name=${name}`);
 
-    return inquirer.ask<{ newPassword: string; invalidateSessions: boolean }>('prompt-password-reset', {});
+    return inquirer.ask<{ password: string }>('prompt-password', {}).then(({ password }) => password);
   };
 };
 
@@ -43,23 +43,13 @@ export class ResetAdminPasswordCommand extends CommandRunner {
   }
 }
 
-@QuestionSet({ name: 'prompt-password-reset' })
-export class PromptPasswordResetQuestions {
+@QuestionSet({ name: 'prompt-password' })
+export class PromptPasswordQuestions {
   @Question({
     message: 'Please choose a new password (optional)',
-    name: 'newPassword',
+    name: 'password',
   })
   parsePassword(value: string) {
     return value;
   }
-
-  @Question({
-    type: 'confirm',
-    message: 'Invalidate existing sessions?',
-    default: true,
-    name: 'invalidateSessions',
-  })
-  parseInvalidate(value: boolean): boolean {
-    return value;
-  }
 }

server/src/controllers/memory.controller.spec.ts

@@ -106,11 +106,7 @@ describe(MemoryController.name, () => {
     it('should require at least one field', async () => {
       const { status, body } = await request(ctx.getHttpServer()).put(`/memories/${factory.uuid()}`).send({});
       expect(status).toBe(400);
-      expect(body).toEqual(
-        errorDto.validationError([
-          { path: [], message: 'At least one of the following fields is required: isSaved, seenAt, memoryAt' },
-        ]),
-      );
+      expect(body).toEqual(errorDto.validationError([{ path: [], message: 'At least one field must be provided' }]));
     });
   });
 

server/src/database.ts

@@ -304,36 +304,6 @@ export const columns = {
     'asset.height',
     'asset.isEdited',
   ],
-  searchAsset: [
-    'asset.id',
-    'asset.updateId',
-    'asset.createdAt',
-    'asset.updatedAt',
-    'asset.deletedAt',
-    'asset.status',
-    'asset.checksum',
-    'asset.checksumAlgorithm',
-    'asset.duplicateId',
-    'asset.duration',
-    'asset.fileCreatedAt',
-    'asset.fileModifiedAt',
-    'asset.isExternal',
-    'asset.isFavorite',
-    'asset.isOffline',
-    'asset.isEdited',
-    'asset.visibility',
-    'asset.libraryId',
-    'asset.livePhotoVideoId',
-    'asset.localDateTime',
-    'asset.originalFileName',
-    'asset.originalPath',
-    'asset.ownerId',
-    'asset.stackId',
-    'asset.thumbhash',
-    'asset.type',
-    'asset.width',
-    'asset.height',
-  ],
   workflowAssetV1: [
     'asset.id',
     'asset.ownerId',

server/src/decorators.ts

@@ -108,11 +108,9 @@ export function ChunkedSet(options?: { paramIndex?: number; chunkSize?: number }
 }
 
 const UUID = '00000000-0000-4000-a000-000000000000';
-const UUID_1 = '00000000-0000-4000-a000-000000000001';
 
 export const DummyValue = {
   UUID,
-  UUID_1,
   UUID_SET: new Set([UUID]),
   PAGINATION: { take: 10, skip: 0 },
   EMAIL: 'user@immich.app',

server/src/dtos/search.dto.ts

@@ -3,15 +3,8 @@ import { Place } from 'src/database';
 import { HistoryBuilder } from 'src/decorators';
 import { AlbumResponseSchema } from 'src/dtos/album.dto';
 import { AssetResponseSchema } from 'src/dtos/asset-response.dto';
-import {
-  AssetOrder,
-  AssetOrderSchema,
-  AssetTypeSchema,
-  AssetVisibilitySchema,
-  SearchOrderField,
-  SearchOrderFieldSchema,
-} from 'src/enum';
-import { isoDatetimeToDate, nonEmptyPartial, stringToBool } from 'src/validation';
+import { AssetOrder, AssetOrderSchema, AssetTypeSchema, AssetVisibilitySchema } from 'src/enum';
+import { isoDatetimeToDate, stringToBool } from 'src/validation';
 import z from 'zod';
 
 const BaseSearchSchema = z.object({
@@ -149,176 +142,6 @@ const SearchSuggestionRequestSchema = z
   })
   .meta({ id: 'SearchSuggestionRequestDto' });
 
-const IdFilterSchema = nonEmptyPartial({
-  eq: z.uuidv4(),
-  ne: z.uuidv4(),
-}).meta({ id: 'IdFilter' });
-
-const IdFilterNullableSchema = nonEmptyPartial({
-  eq: z.uuidv4().nullable(),
-  ne: z.uuidv4().nullable(),
-}).meta({ id: 'IdFilterNullable' });
-
-const IdsFilterSchema = nonEmptyPartial({
-  any: z.array(z.uuidv4()).min(1),
-  all: z.array(z.uuidv4()).min(1),
-  none: z.array(z.uuidv4()).min(1),
-}).meta({ id: 'IdsFilter' });
-
-const stringListShape = {
-  in: z.array(z.string()).min(1),
-  notIn: z.array(z.string()).min(1),
-};
-
-const StringFilterSchema = nonEmptyPartial({
-  eq: z.string(),
-  ne: z.string(),
-  ...stringListShape,
-}).meta({ id: 'StringFilter' });
-
-const stringNullableShape = {
-  eq: z.string().nullable(),
-  ne: z.string().nullable(),
-  ...stringListShape,
-};
-
-const StringFilterNullableSchema = nonEmptyPartial(stringNullableShape).meta({ id: 'StringFilterNullable' });
-
-const StringPatternFilterSchema = nonEmptyPartial({
-  ...stringNullableShape,
-  like: z.string().min(1),
-  notLike: z.string().min(1),
-  startsWith: z.string().min(1),
-  endsWith: z.string().min(1),
-}).meta({ id: 'StringPatternFilter' });
-
-const numberRangeShape = {
-  lt: z.number(),
-  lte: z.number(),
-  gt: z.number(),
-  gte: z.number(),
-  in: z.array(z.number()).min(1),
-  notIn: z.array(z.number()).min(1),
-};
-
-const NumberFilterSchema = nonEmptyPartial({
-  eq: z.number(),
-  ne: z.number(),
-  ...numberRangeShape,
-}).meta({ id: 'NumberFilter' });
-
-const NumberFilterNullableSchema = nonEmptyPartial({
-  eq: z.number().nullable(),
-  ne: z.number().nullable(),
-  ...numberRangeShape,
-}).meta({ id: 'NumberFilterNullable' });
-
-const dateRangeShape = {
-  gt: isoDatetimeToDate,
-  gte: isoDatetimeToDate,
-  lt: isoDatetimeToDate,
-  lte: isoDatetimeToDate,
-};
-
-const DateFilterSchema = nonEmptyPartial({
-  eq: isoDatetimeToDate,
-  ne: isoDatetimeToDate,
-  ...dateRangeShape,
-}).meta({ id: 'DateFilter' });
-
-const DateFilterNullableSchema = nonEmptyPartial({
-  eq: isoDatetimeToDate.nullable(),
-  ne: isoDatetimeToDate.nullable(),
-  ...dateRangeShape,
-}).meta({ id: 'DateFilterNullable' });
-
-const BoolFilterSchema = z.object({ eq: z.boolean() }).meta({ id: 'BoolFilter' });
-
-const enumFilterSchema = <T extends z.core.util.EnumLike>(values: z.ZodEnum<T>, id: string) =>
-  nonEmptyPartial({
-    eq: values,
-    ne: values,
-    in: z.array(values).min(1),
-    notIn: z.array(values).min(1),
-  }).meta({ id });
-
-const EnumFilterAssetTypeSchema = enumFilterSchema(AssetTypeSchema, 'EnumFilterAssetType');
-const EnumFilterAssetVisibilitySchema = enumFilterSchema(AssetVisibilitySchema, 'EnumFilterAssetVisibility');
-
-const StringSimilarityFilterSchema = z
-  .object({
-    matches: z.string().min(1),
-  })
-  .meta({ id: 'StringSimilarityFilter' });
-
-export const DEFAULT_SEARCH_ORDER = {
-  field: SearchOrderField.FileCreatedAt,
-  direction: AssetOrder.Desc,
-};
-
-export const SearchOrderSchema = z
-  .object({
-    field: SearchOrderFieldSchema.default(DEFAULT_SEARCH_ORDER.field),
-    direction: AssetOrderSchema.default(DEFAULT_SEARCH_ORDER.direction),
-  })
-  .meta({ id: 'SearchOrder' });
-
-const SearchFilterBranchSchema = z
-  .object({
-    id: IdFilterSchema,
-    libraryId: IdFilterNullableSchema,
-    type: EnumFilterAssetTypeSchema,
-    visibility: EnumFilterAssetVisibilitySchema,
-    isFavorite: BoolFilterSchema,
-    isMotion: BoolFilterSchema,
-    isOffline: BoolFilterSchema,
-    isEncoded: BoolFilterSchema,
-    hasAlbums: BoolFilterSchema,
-    hasPeople: BoolFilterSchema,
-    hasTags: BoolFilterSchema,
-    city: StringFilterNullableSchema,
-    state: StringFilterNullableSchema,
-    country: StringFilterNullableSchema,
-    make: StringFilterNullableSchema,
-    model: StringFilterNullableSchema,
-    lensModel: StringFilterNullableSchema,
-    description: StringPatternFilterSchema,
-    originalFileName: StringPatternFilterSchema,
-    originalPath: StringPatternFilterSchema,
-    ocr: StringSimilarityFilterSchema,
-    rating: NumberFilterNullableSchema,
-    fileSizeInBytes: NumberFilterSchema,
-    takenAt: DateFilterSchema,
-    createdAt: DateFilterSchema,
-    updatedAt: DateFilterSchema,
-    trashedAt: DateFilterNullableSchema,
-    personIds: IdsFilterSchema,
-    tagIds: IdsFilterSchema,
-    albumIds: IdsFilterSchema,
-    checksum: StringFilterSchema,
-    encodedVideoPath: StringFilterSchema,
-  })
-  .partial()
-  .meta({ id: 'SearchFilterBranch' });
-
-export const SearchFilterSchema = SearchFilterBranchSchema.extend({
-  or: z.array(SearchFilterBranchSchema).min(1).optional(),
-}).meta({ id: 'SearchFilter' });
-
-export type IdFilter = z.infer<typeof IdFilterSchema>;
-export type IdFilterNullable = z.infer<typeof IdFilterNullableSchema>;
-export type IdsFilter = z.infer<typeof IdsFilterSchema>;
-export type StringFilter = z.infer<typeof StringFilterSchema>;
-export type StringFilterNullable = z.infer<typeof StringFilterNullableSchema>;
-export type StringPatternFilter = z.infer<typeof StringPatternFilterSchema>;
-export type NumberFilter = z.infer<typeof NumberFilterSchema>;
-export type NumberFilterNullable = z.infer<typeof NumberFilterNullableSchema>;
-export type DateFilter = z.infer<typeof DateFilterSchema>;
-export type DateFilterNullable = z.infer<typeof DateFilterNullableSchema>;
-export type SearchOrder = z.infer<typeof SearchOrderSchema>;
-export type SearchFilter = z.infer<typeof SearchFilterSchema>;
-export type SearchFilterBranch = z.infer<typeof SearchFilterBranchSchema>;
-
 export class RandomSearchDto extends createZodDto(RandomSearchSchema) {}
 export class LargeAssetSearchDto extends createZodDto(LargeAssetSearchSchema) {}
 export class MetadataSearchDto extends createZodDto(MetadataSearchSchema) {}

server/src/enum.ts

@@ -1234,12 +1234,3 @@ export enum CalendarHeatmapType {
   Upload = 'Upload',
   Taken = 'Taken',
 }
-
-export enum SearchOrderField {
-  FileCreatedAt = 'fileCreatedAt',
-  LocalDateTime = 'localDateTime',
-  FileSizeInBytes = 'fileSizeInBytes',
-  Rating = 'rating',
-}
-
-export const SearchOrderFieldSchema = z.enum(SearchOrderField).meta({ id: 'SearchOrderField' });

server/src/repositories/search.repository.ts

@@ -1,23 +1,12 @@
 import { Injectable } from '@nestjs/common';
 import { Kysely, OrderByDirection, Selectable, ShallowDehydrateObject, sql } from 'kysely';
 import { InjectKysely } from 'nestjs-kysely';
-import { columns } from 'src/database';
 import { DummyValue, GenerateSql } from 'src/decorators';
-import { MapAsset } from 'src/dtos/asset-response.dto';
-import { SearchFilter, SearchOrder } from 'src/dtos/search.dto';
 import { AssetStatus, AssetType, AssetVisibility, VectorIndex } from 'src/enum';
 import { probes } from 'src/repositories/database.repository';
 import { DB } from 'src/schema';
 import { AssetExifTable } from 'src/schema/tables/asset-exif.table';
-import {
-  anyUuid,
-  searchAssetBuilder,
-  searchAssetBuilderLegacy,
-  searchMetadataV3Examples,
-  searchStatisticsV3Examples,
-  withExifInner,
-  withSearchOrder,
-} from 'src/utils/database';
+import { anyUuid, searchAssetBuilder, withExifInner } from 'src/utils/database';
 import { paginationHelper } from 'src/utils/pagination';
 import z from 'zod';
 
@@ -133,21 +122,6 @@ export type AssetSearchOptions = Omit<BaseAssetSearchOptions, 'visibility'> &
 
 export type AssetSearchBuilderOptions = Omit<AssetSearchOptions, 'orderDirection'>;
 
-export interface AssetSearchBuilderV3Options {
-  filter?: SearchFilter;
-  /** Server-derived ownership scope. Never client-controlled. */
-  userIds?: string[];
-  withExif?: boolean;
-  withFaces?: boolean;
-  withPeople?: boolean;
-  withStacked?: boolean;
-  order?: SearchOrder;
-}
-
-export interface AssetSearchPaginationV3Options {
-  size: number;
-}
-
 export type SmartSearchOptions = SearchDateOptions &
   SearchEmbeddingOptions &
   SearchExifOptions &
@@ -222,10 +196,9 @@ export class SearchRepository {
   })
   async searchMetadata(pagination: SearchPaginationOptions, options: AssetSearchOptions) {
     const orderDirection = (options.orderDirection?.toLowerCase() || 'desc') as OrderByDirection;
-    const items = await searchAssetBuilderLegacy(this.db, options)
-      .select(columns.searchAsset)
+    const items = await searchAssetBuilder(this.db, options)
+      .selectAll('asset')
       .orderBy('asset.fileCreatedAt', orderDirection)
-      .orderBy('asset.id', orderDirection)
       .limit(pagination.size + 1)
       .offset((pagination.page - 1) * pagination.size)
       .execute();
@@ -244,7 +217,7 @@ export class SearchRepository {
     ],
   })
   searchStatistics(options: AssetSearchOptions) {
-    return searchAssetBuilderLegacy(this.db, options)
+    return searchAssetBuilder(this.db, options)
       .select((qb) => qb.fn.countAll<number>().as('total'))
       .executeTakeFirstOrThrow();
   }
@@ -262,8 +235,8 @@ export class SearchRepository {
     ],
   })
   async searchRandom(size: number, options: AssetSearchOptions) {
-    return searchAssetBuilderLegacy(this.db, options)
-      .select(columns.searchAsset)
+    return searchAssetBuilder(this.db, options)
+      .selectAll('asset')
       .orderBy(sql`random()`)
       .limit(size)
       .execute();
@@ -283,8 +256,8 @@ export class SearchRepository {
   })
   searchLargeAssets(size: number, options: LargeAssetSearchOptions) {
     const orderDirection = (options.orderDirection?.toLowerCase() || 'desc') as OrderByDirection;
-    return searchAssetBuilderLegacy(this.db, options)
-      .select(columns.searchAsset)
+    return searchAssetBuilder(this.db, options)
+      .selectAll('asset')
       .$call(withExifInner)
       .where('asset_exif.fileSizeInByte', '>', options.minFileSize || 0)
       .orderBy('asset_exif.fileSizeInByte', orderDirection)
@@ -312,11 +285,10 @@ 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 searchAssetBuilderLegacy(trx, options)
-        .select(columns.searchAsset)
+      const items = await searchAssetBuilder(trx, options)
+        .selectAll('asset')
         .innerJoin('smart_search', 'asset.id', 'smart_search.assetId')
         .orderBy(sql`smart_search.embedding <=> ${options.embedding}`)
-        .orderBy('asset.id', 'asc')
         .limit(pagination.size + 1)
         .offset((pagination.page - 1) * pagination.size)
         .execute();
@@ -445,7 +417,7 @@ export class SearchRepository {
       .selectFrom('asset')
       .innerJoin('asset_exif', 'asset.id', 'asset_exif.assetId')
       .innerJoin('cte', 'asset.id', 'cte.assetId')
-      .select(columns.searchAsset)
+      .selectAll('asset')
       .select((eb) =>
         eb
           .fn('to_jsonb', [eb.table('asset_exif')])
@@ -518,24 +490,6 @@ export class SearchRepository {
     return res.map((row) => row.lensModel!);
   }
 
-  @GenerateSql(...searchMetadataV3Examples)
-  searchMetadataV3(
-    pagination: AssetSearchPaginationV3Options,
-    options: AssetSearchBuilderV3Options,
-  ): Promise<MapAsset[]> {
-    return withSearchOrder(searchAssetBuilder(this.db, options), options.order)
-      .select(columns.searchAsset)
-      .limit(pagination.size)
-      .execute();
-  }
-
-  @GenerateSql(...searchStatisticsV3Examples)
-  searchStatisticsV3(options: AssetSearchBuilderV3Options) {
-    return searchAssetBuilder(this.db, options)
-      .select((qb) => qb.fn.countAll<number>().as('total'))
-      .executeTakeFirstOrThrow();
-  }
-
   private getExifField(field: 'city' | 'state' | 'country' | 'make' | 'model' | 'lensModel', userIds: string[]) {
     return this.db
       .selectFrom('asset_exif')

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

@@ -568,34 +568,6 @@ describe(AssetService.name, () => {
       expect(mocks.stack.delete).toHaveBeenCalledWith(asset.stackId);
     });
 
-    it('should delete the stack when a non-primary asset is deleted and only the primary would remain', async () => {
-      const asset = AssetFactory.from().build();
-      const deletionAsset = {
-        ...getForAssetDeletion(asset),
-        stack: { id: newUuid(), primaryAssetId: newUuid(), assets: [{ id: asset.id }] },
-      };
-      mocks.stack.delete.mockResolvedValue();
-      mocks.assetJob.getForAssetDeletion.mockResolvedValue(deletionAsset);
-
-      await sut.handleAssetDeletion({ id: asset.id, deleteOnDisk: true });
-
-      expect(mocks.stack.delete).toHaveBeenCalledWith(deletionAsset.stack.id);
-    });
-
-    it('should keep the stack when a non-primary asset is deleted and the primary plus another asset remain', async () => {
-      const asset = AssetFactory.from().build();
-      const deletionAsset = {
-        ...getForAssetDeletion(asset),
-        stack: { id: newUuid(), primaryAssetId: newUuid(), assets: [{ id: asset.id }, { id: newUuid() }] },
-      };
-      mocks.assetJob.getForAssetDeletion.mockResolvedValue(deletionAsset);
-
-      await sut.handleAssetDeletion({ id: asset.id, deleteOnDisk: true });
-
-      expect(mocks.stack.delete).not.toHaveBeenCalled();
-      expect(mocks.stack.update).not.toHaveBeenCalled();
-    });
-
     it('should delete a live photo', async () => {
       const motionAsset = AssetFactory.from({ type: AssetType.Video, visibility: AssetVisibility.Hidden }).build();
       const asset = AssetFactory.create({ livePhotoVideoId: motionAsset.id });

server/src/services/asset.service.ts

@@ -316,25 +316,18 @@ export class AssetService extends BaseService {
       return JobStatus.Failed;
     }
 
-    if (asset.stack) {
-      // asset.stack.assets only includes timeline visible assets and excludes the primary asset
-      const remainingStackAssetIds = asset.stack.assets.map((a) => a.id).filter((assetId) => assetId !== id);
-
-      // the primary survives unless it is the asset being deleted
-      let remainingCount = remainingStackAssetIds.length;
-      if (asset.stack.primaryAssetId !== id) {
-        remainingCount++;
-      }
-
-      if (remainingCount < 2) {
-        // 0 or 1 asset would remain: dissolve the stack so it does not linger as a single-asset stack
-        await this.stackRepository.delete(asset.stack.id);
-      } else if (asset.stack.primaryAssetId === id) {
-        // the primary is being deleted but others remain: promote a new primary
+    // replace the parent of the stack children with a new asset
+    if (asset.stack?.primaryAssetId === id) {
+      // this only includes timeline visible assets and excludes the primary asset
+      const stackAssetIds = asset.stack.assets.map((a) => a.id);
+      if (stackAssetIds.length >= 2) {
+        const newPrimaryAssetId = stackAssetIds.find((a) => a !== id)!;
         await this.stackRepository.update(asset.stack.id, {
           id: asset.stack.id,
-          primaryAssetId: remainingStackAssetIds[0],
+          primaryAssetId: newPrimaryAssetId,
         });
+      } else {
+        await this.stackRepository.delete(asset.stack.id);
       }
     }
 

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

@@ -1140,125 +1140,6 @@ describe(AuthService.name, () => {
 
       expect(mocks.user.create).toHaveBeenCalledWith(expect.objectContaining({ isAdmin: true }));
     });
-
-    it('should create an admin user if the role claim is an array containing admin', async () => {
-      mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.oauthWithAutoRegister);
-      mocks.oauth.getProfileAndOAuthSid.mockResolvedValue({
-        profile: OAuthProfileFactory.create({ immich_role: ['user', 'admin'] }),
-      });
-      mocks.user.getByEmail.mockResolvedValue(void 0);
-      mocks.user.getByOAuthId.mockResolvedValue(void 0);
-      mocks.user.create.mockResolvedValue(UserFactory.create({ oauthId: 'oauth-id' }));
-      mocks.session.create.mockResolvedValue(SessionFactory.create());
-
-      await sut.callback(
-        { url: 'http://immich/auth/login?code=abc123', state: 'xyz789', codeVerifier: 'foo' },
-        {},
-        loginDetails,
-      );
-
-      expect(mocks.user.create).toHaveBeenCalledWith(expect.objectContaining({ isAdmin: true }));
-    });
-
-    it('should create a standard user if the role claim is an array containing only user', async () => {
-      mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.oauthWithAutoRegister);
-      mocks.oauth.getProfileAndOAuthSid.mockResolvedValue({
-        profile: OAuthProfileFactory.create({ immich_role: ['user'] }),
-      });
-      mocks.user.getByEmail.mockResolvedValue(void 0);
-      mocks.user.getByOAuthId.mockResolvedValue(void 0);
-      mocks.user.getAdmin.mockResolvedValue(UserFactory.create({ isAdmin: true }));
-      mocks.user.create.mockResolvedValue(UserFactory.create({ oauthId: 'oauth-id' }));
-      mocks.session.create.mockResolvedValue(SessionFactory.create());
-
-      await sut.callback(
-        { url: 'http://immich/auth/login?code=abc123', state: 'xyz789', codeVerifier: 'foo' },
-        {},
-        loginDetails,
-      );
-
-      expect(mocks.user.create).toHaveBeenCalledWith(expect.objectContaining({ isAdmin: false }));
-    });
-
-    it('should promote an existing user to admin if the role claim contains admin on login', async () => {
-      const user = UserFactory.create({ isAdmin: false, oauthId: 'oauth-id' });
-
-      mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.oauthEnabled);
-      mocks.oauth.getProfileAndOAuthSid.mockResolvedValue({
-        profile: OAuthProfileFactory.create({ sub: user.oauthId, immich_role: 'admin' }),
-      });
-      mocks.user.getByOAuthId.mockResolvedValue(user);
-      mocks.user.update.mockResolvedValue({ ...user, isAdmin: true });
-      mocks.session.create.mockResolvedValue(SessionFactory.create());
-
-      await sut.callback(
-        { url: 'http://immich/auth/login?code=abc123', state: 'xyz789', codeVerifier: 'foo' },
-        {},
-        loginDetails,
-      );
-
-      expect(mocks.user.update).toHaveBeenCalledWith(user.id, { isAdmin: true });
-    });
-
-    it('should demote an existing admin if the role claim only contains user on login', async () => {
-      const user = UserFactory.create({ isAdmin: true, oauthId: 'oauth-id' });
-
-      mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.oauthEnabled);
-      mocks.oauth.getProfileAndOAuthSid.mockResolvedValue({
-        profile: OAuthProfileFactory.create({ sub: user.oauthId, immich_role: ['user'] }),
-      });
-      mocks.user.getByOAuthId.mockResolvedValue(user);
-      mocks.user.update.mockResolvedValue({ ...user, isAdmin: false });
-      mocks.session.create.mockResolvedValue(SessionFactory.create());
-
-      await sut.callback(
-        { url: 'http://immich/auth/login?code=abc123', state: 'xyz789', codeVerifier: 'foo' },
-        {},
-        loginDetails,
-      );
-
-      expect(mocks.user.update).toHaveBeenCalledWith(user.id, { isAdmin: false });
-    });
-
-    it('should not change isAdmin for an existing user if the role claim is blank', async () => {
-      const user = UserFactory.create({ isAdmin: true, oauthId: 'oauth-id' });
-
-      mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.oauthEnabled);
-      mocks.oauth.getProfileAndOAuthSid.mockResolvedValue({
-        profile: OAuthProfileFactory.create({ sub: user.oauthId }),
-      });
-      mocks.user.getByOAuthId.mockResolvedValue(user);
-      mocks.session.create.mockResolvedValue(SessionFactory.create());
-
-      await sut.callback(
-        { url: 'http://immich/auth/login?code=abc123', state: 'xyz789', codeVerifier: 'foo' },
-        {},
-        loginDetails,
-      );
-
-      expect(mocks.user.update).not.toHaveBeenCalled();
-    });
-
-    it('should re-evaluate the role claim for a user linked by email', async () => {
-      const user = UserFactory.create({ isAdmin: false });
-      const profile = OAuthProfileFactory.create({ immich_role: 'admin' });
-
-      mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.oauthEnabled);
-      mocks.oauth.getProfileAndOAuthSid.mockResolvedValue({ profile });
-      mocks.user.getByEmail.mockResolvedValue(user);
-      mocks.user.update.mockResolvedValueOnce({ ...user, oauthId: profile.sub });
-      mocks.user.update.mockResolvedValueOnce({ ...user, oauthId: profile.sub, isAdmin: true });
-      mocks.session.create.mockResolvedValue(SessionFactory.create());
-
-      await sut.callback(
-        { url: 'http://immich/auth/login?code=abc123', state: 'xyz789', codeVerifier: 'foobar' },
-        {},
-        loginDetails,
-      );
-
-      expect(mocks.user.update).toHaveBeenCalledWith(user.id, { oauthId: profile.sub });
-      expect(mocks.user.update).toHaveBeenCalledWith(user.id, { isAdmin: true });
-    });
   });
 
   describe('link', () => {

server/src/services/auth.service.ts

@@ -331,13 +331,6 @@ export class AuthService extends BaseService {
       }
     }
 
-    const role = this.getRoleClaim(profile, roleClaim);
-    const isAdmin = role === 'admin';
-
-    if (user && role && isAdmin !== user.isAdmin) {
-      user = await this.userRepository.update(user.id, { isAdmin });
-    }
-
     // register new user
     if (!user) {
       if (!autoRegister) {
@@ -363,6 +356,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) => typeof value === 'string' && ['admin', 'user'].includes(value),
+      });
 
       user = await this.createUser({
         name:
@@ -374,7 +372,7 @@ export class AuthService extends BaseService {
         oauthId: profile.sub,
         quotaSizeInBytes: storageQuota === null ? null : storageQuota * HumanReadableSize.GiB,
         storageLabel: storageLabel || null,
-        isAdmin,
+        isAdmin: role === 'admin',
       });
     }
 
@@ -643,19 +641,6 @@ export class AuthService extends BaseService {
     return options.isValid(value) ? (value as T) : options.default;
   }
 
-  private getRoleClaim(profile: OAuthProfile, roleClaim: string): 'admin' | 'user' | undefined {
-    const value = profile[roleClaim as keyof OAuthProfile];
-    const roles = Array.isArray(value) ? value : [value];
-    const isRole = (role: string) => roles.includes(role);
-
-    if (isRole('admin')) {
-      return 'admin';
-    }
-    if (isRole('user')) {
-      return 'user';
-    }
-  }
-
   private resolveRedirectUri(
     { mobileRedirectUri, mobileOverrideEnabled }: { mobileRedirectUri: string; mobileOverrideEnabled: boolean },
     url: string,

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

@@ -37,7 +37,7 @@ describe(CliService.name, () => {
       mocks.user.getAdmin.mockResolvedValue(admin);
       mocks.user.update.mockResolvedValue(UserFactory.create({ isAdmin: true }));
 
-      const ask = vitest.fn().mockResolvedValue({ newPassword: undefined, invalidateSessions: false });
+      const ask = vitest.fn().mockImplementation(() => {});
 
       const response = await sut.resetAdminPassword(ask);
 
@@ -47,7 +47,6 @@ describe(CliService.name, () => {
       expect(ask).toHaveBeenCalled();
       expect(id).toEqual(admin.id);
       expect(update.password).toBeDefined();
-      expect(mocks.session.invalidateAll).not.toHaveBeenCalled();
     });
 
     it('should use the supplied password', async () => {
@@ -56,7 +55,7 @@ describe(CliService.name, () => {
       mocks.user.getAdmin.mockResolvedValue(admin);
       mocks.user.update.mockResolvedValue(admin);
 
-      const ask = vitest.fn().mockResolvedValue({ newPassword: 'new-password', invalidateSessions: false });
+      const ask = vitest.fn().mockResolvedValue('new-password');
 
       const response = await sut.resetAdminPassword(ask);
 
@@ -67,20 +66,6 @@ describe(CliService.name, () => {
       expect(id).toEqual(admin.id);
       expect(update.password).toBeDefined();
     });
-
-    it('should invalidate existing sessions when requested', async () => {
-      const admin = UserFactory.create({ isAdmin: true });
-
-      mocks.user.getAdmin.mockResolvedValue(admin);
-      mocks.user.update.mockResolvedValue(admin);
-      mocks.session.invalidateAll.mockResolvedValue(void 0);
-
-      const ask = vitest.fn().mockResolvedValue({ newPassword: 'new-password', invalidateSessions: true });
-
-      await sut.resetAdminPassword(ask);
-
-      expect(mocks.session.invalidateAll).toHaveBeenCalledWith({ userId: admin.id });
-    });
   });
 
   describe('disablePasswordLogin', () => {

server/src/services/cli.service.ts

@@ -58,24 +58,18 @@ export class CliService extends BaseService {
     return users.map((user) => mapUserAdmin(user));
   }
 
-  async resetAdminPassword(
-    ask: (admin: UserAdminResponseDto) => Promise<{ newPassword: string | undefined; invalidateSessions: boolean }>,
-  ) {
+  async resetAdminPassword(ask: (admin: UserAdminResponseDto) => Promise<string | undefined>) {
     const admin = await this.userRepository.getAdmin();
     if (!admin) {
       throw new Error('Admin account does not exist');
     }
 
-    const { newPassword: providedPassword, invalidateSessions } = await ask(mapUserAdmin(admin));
+    const providedPassword = await ask(mapUserAdmin(admin));
     const password = providedPassword || this.cryptoRepository.randomBytesAsText(24);
     const hashedPassword = await this.cryptoRepository.hashBcrypt(password, SALT_ROUNDS);
 
     await this.userRepository.update(admin.id, { password: hashedPassword });
 
-    if (invalidateSessions) {
-      await this.sessionRepository.invalidateAll({ userId: admin.id });
-    }
-
     return { admin, password, provided: !!providedPassword };
   }
 

server/src/utils/database.ts

@@ -7,42 +7,21 @@ import {
   Kysely,
   KyselyConfig,
   NotNull,
-  OperandValueExpression,
-  ReferenceExpression,
   Selectable,
   SelectQueryBuilder,
   ShallowDehydrateObject,
   sql,
-  SqlBool,
 } from 'kysely';
 import { PostgresJSDialect } from 'kysely-postgres-js';
 import { jsonArrayFrom, jsonObjectFrom } from 'kysely/helpers/postgres';
 import { Notice, PostgresError } from 'postgres';
 import { columns, lockableProperties, LockableProperty, Person } from 'src/database';
-import { DummyValue, GenerateSqlQueries } from 'src/decorators';
 import { AssetEditActionItem } from 'src/dtos/editing.dto';
-import {
-  DEFAULT_SEARCH_ORDER,
-  IdsFilter,
-  SearchFilterBranch,
-  SearchOrder,
-  StringFilter,
-  StringPatternFilter,
-} from 'src/dtos/search.dto';
-import {
-  AssetFileType,
-  AssetOrder,
-  AssetOrderBy,
-  AssetVisibility,
-  DatabaseExtension,
-  ExifOrientation,
-  SearchOrderField,
-} from 'src/enum';
-import { AssetSearchBuilderOptions, AssetSearchBuilderV3Options } from 'src/repositories/search.repository';
+import { AssetFileType, AssetOrderBy, AssetVisibility, DatabaseExtension, ExifOrientation } from 'src/enum';
+import { AssetSearchBuilderOptions } from 'src/repositories/search.repository';
 import { DB } from 'src/schema';
 import { AssetExifTable } from 'src/schema/tables/asset-exif.table';
 import { AudioStreamInfo, VectorExtension, VideoFormat, VideoPacketInfo, VideoStreamInfo } from 'src/types';
-import { fromChecksum } from 'src/utils/request';
 
 export const getKyselyConfig = (connection: DatabaseConnectionParams): KyselyConfig => {
   return {
@@ -75,8 +54,6 @@ export const getKyselyConfig = (connection: DatabaseConnectionParams): KyselyCon
   };
 };
 
-const uniqueIds = (ids: string[]) => [...new Set(ids)];
-
 export const asUuid = (id: string | Expression<string>) => sql<string>`${id}::uuid`;
 
 export const anyUuid = (ids: string[]) => sql<string>`any(${`{${ids}}`}::uuid[])`;
@@ -108,15 +85,16 @@ export function withDefaultVisibility<O>(qb: SelectQueryBuilder<DB, 'asset', O>)
   return qb.where('asset.visibility', 'in', [sql.lit(AssetVisibility.Archive), sql.lit(AssetVisibility.Timeline)]);
 }
 
-const selectExifInfo = (eb: AssetExpressionBuilder) =>
-  eb.fn
-    .toJson(eb.table('asset_exif'))
-    .$castTo<ShallowDehydrateObject<Selectable<AssetExifTable>> | null>()
-    .as('exifInfo');
-
 // TODO come up with a better query that only selects the fields we need
 export function withExif<O>(qb: SelectQueryBuilder<DB, 'asset', O>) {
-  return qb.leftJoin('asset_exif', 'asset.id', 'asset_exif.assetId').select(selectExifInfo);
+  return qb
+    .leftJoin('asset_exif', 'asset.id', 'asset_exif.assetId')
+    .select((eb) =>
+      eb.fn
+        .toJson(eb.table('asset_exif'))
+        .$castTo<ShallowDehydrateObject<Selectable<AssetExifTable>> | null>()
+        .as('exifInfo'),
+    );
 }
 
 export function withExifInner<O>(qb: SelectQueryBuilder<DB, 'asset', O>) {
@@ -395,7 +373,7 @@ export function withEdits(eb: ExpressionBuilder<DB, 'asset'>): AliasedEditAction
 const joinDeduplicationPlugin = new DeduplicateJoinsPlugin();
 /** TODO: This should only be used for search-related queries, not as a general purpose query builder */
 
-export function searchAssetBuilderLegacy(kysely: Kysely<DB>, options: AssetSearchBuilderOptions) {
+export function searchAssetBuilder(kysely: Kysely<DB>, options: AssetSearchBuilderOptions) {
   options.withDeleted ||= !!(options.trashedAfter || options.trashedBefore || options.isOffline);
 
   return kysely
@@ -515,458 +493,6 @@ export function searchAssetBuilderLegacy(kysely: Kysely<DB>, options: AssetSearc
     .$if(!options.withDeleted, (qb) => qb.where('asset.deletedAt', 'is', null));
 }
 
-type AssetExpressionBuilder = ExpressionBuilder<DB, 'asset' | 'asset_exif'>;
-
-const albumAssets = (eb: AssetExpressionBuilder) =>
-  eb.selectFrom('album_asset').whereRef('album_asset.assetId', '=', 'asset.id');
-
-const visibleFaces = (eb: AssetExpressionBuilder) =>
-  eb
-    .selectFrom('asset_face')
-    .whereRef('asset_face.assetId', '=', 'asset.id')
-    .where('asset_face.deletedAt', 'is', null)
-    .where('asset_face.isVisible', '=', true);
-
-const tagAssets = (eb: AssetExpressionBuilder) =>
-  eb.selectFrom('tag_asset').whereRef('tag_asset.assetId', '=', 'asset.id');
-
-// shared any/all/none mechanics; `matchesAll` only receives deduplicated multi-id lists,
-// so its `count(distinct id) = ids.length` check stays satisfiable
-function idsPredicates(
-  eb: AssetExpressionBuilder,
-  { any, all, none }: IdsFilter = {},
-  ops: {
-    matchesAny: (ids: string[]) => Expression<SqlBool>;
-    matchesAll: (ids: string[]) => Expression<SqlBool>;
-  },
-) {
-  const predicates: Expression<SqlBool>[] = [];
-  if (any) {
-    predicates.push(ops.matchesAny(any));
-  }
-  if (all) {
-    const ids = uniqueIds(all);
-    predicates.push(ids.length === 1 ? ops.matchesAny(ids) : ops.matchesAll(ids));
-  }
-  if (none) {
-    predicates.push(eb.not(ops.matchesAny(none)));
-  }
-  return predicates;
-}
-
-function albumIdsPredicates(eb: AssetExpressionBuilder, filter?: IdsFilter) {
-  const matching = (ids: string[]) => albumAssets(eb).where('album_asset.albumId', '=', anyUuid(ids));
-  return idsPredicates(eb, filter, {
-    matchesAny: (ids) => eb.exists(matching(ids)),
-    matchesAll: (ids) =>
-      eb.exists(
-        matching(ids)
-          .select('album_asset.assetId')
-          .groupBy('album_asset.assetId')
-          .having((eb) => eb.fn.count('album_asset.albumId').distinct(), '=', ids.length),
-      ),
-  });
-}
-
-function personIdsPredicates(eb: AssetExpressionBuilder, filter?: IdsFilter) {
-  const matching = (ids: string[]) => visibleFaces(eb).where('asset_face.personId', '=', anyUuid(ids));
-  return idsPredicates(eb, filter, {
-    matchesAny: (ids) => eb.exists(matching(ids)),
-    matchesAll: (ids) =>
-      eb.exists(
-        matching(ids)
-          .select('asset_face.assetId')
-          .groupBy('asset_face.assetId')
-          .having((eb) => eb.fn.count('asset_face.personId').distinct(), '=', ids.length),
-      ),
-  });
-}
-
-function tagIdsPredicates(eb: AssetExpressionBuilder, filter?: IdsFilter) {
-  const matching = (ids: string[]) =>
-    tagAssets(eb)
-      .innerJoin('tag_closure', 'tag_asset.tagId', 'tag_closure.id_descendant')
-      .where('tag_closure.id_ancestor', '=', anyUuid(ids));
-  return idsPredicates(eb, filter, {
-    matchesAny: (ids) => eb.exists(matching(ids)),
-    matchesAll: (ids) =>
-      eb.exists(
-        matching(ids)
-          .select('tag_asset.assetId')
-          .groupBy('tag_asset.assetId')
-          .having((eb) => eb.fn.count('tag_closure.id_ancestor').distinct(), '=', ids.length),
-      ),
-  });
-}
-
-type ComparisonFilter<T> = {
-  eq?: T | null;
-  ne?: T | null;
-  lt?: T;
-  lte?: T;
-  gt?: T;
-  gte?: T;
-  in?: T[];
-  notIn?: T[];
-};
-
-// one operator dispatch for every filter shape; the DTO schemas constrain which
-// operators (and null literals) each filter can actually carry
-function comparisonPredicates<TB extends keyof DB, RE extends ReferenceExpression<DB, TB>>(
-  eb: ExpressionBuilder<DB, TB>,
-  column: RE,
-  filter: ComparisonFilter<OperandValueExpression<DB, TB, RE>> = {},
-) {
-  const predicates: Expression<SqlBool>[] = [];
-  if (filter.eq !== undefined) {
-    predicates.push(filter.eq === null ? eb(column, 'is', null) : eb(column, '=', filter.eq));
-  }
-  if (filter.ne !== undefined) {
-    predicates.push(filter.ne === null ? eb(column, 'is not', null) : eb(column, '!=', filter.ne));
-  }
-  if (filter.lt !== undefined) {
-    predicates.push(eb(column, '<', filter.lt));
-  }
-  if (filter.lte !== undefined) {
-    predicates.push(eb(column, '<=', filter.lte));
-  }
-  if (filter.gt !== undefined) {
-    predicates.push(eb(column, '>', filter.gt));
-  }
-  if (filter.gte !== undefined) {
-    predicates.push(eb(column, '>=', filter.gte));
-  }
-  if (filter.in !== undefined) {
-    predicates.push(eb(column, 'in', filter.in));
-  }
-  if (filter.notIn !== undefined) {
-    predicates.push(eb(column, 'not in', filter.notIn));
-  }
-  return predicates;
-}
-
-type StringColumn =
-  | 'asset_exif.city'
-  | 'asset_exif.state'
-  | 'asset_exif.country'
-  | 'asset_exif.make'
-  | 'asset_exif.model'
-  | 'asset_exif.lensModel'
-  | 'asset_exif.description'
-  | 'asset.originalFileName'
-  | 'asset.originalPath';
-
-function stringPatternPredicates(eb: AssetExpressionBuilder, column: StringColumn, filter: StringPatternFilter = {}) {
-  const ref = sql.ref(column);
-  const predicates = comparisonPredicates(eb, column, filter);
-  if (filter.like !== undefined) {
-    predicates.push(sql<SqlBool>`f_unaccent(${ref}) ilike ('%' || f_unaccent(${filter.like}) || '%')`);
-  }
-  if (filter.notLike !== undefined) {
-    predicates.push(sql<SqlBool>`f_unaccent(${ref}) not ilike ('%' || f_unaccent(${filter.notLike}) || '%')`);
-  }
-  if (filter.startsWith !== undefined) {
-    predicates.push(sql<SqlBool>`f_unaccent(${ref}) ilike (f_unaccent(${filter.startsWith}) || '%')`);
-  }
-  if (filter.endsWith !== undefined) {
-    predicates.push(sql<SqlBool>`f_unaccent(${ref}) ilike ('%' || f_unaccent(${filter.endsWith}))`);
-  }
-  return predicates;
-}
-
-function checksumPredicates(eb: AssetExpressionBuilder, filter: StringFilter = {}) {
-  return comparisonPredicates(eb, 'asset.checksum', {
-    eq: filter.eq === undefined ? undefined : fromChecksum(filter.eq),
-    ne: filter.ne === undefined ? undefined : fromChecksum(filter.ne),
-    in: filter.in?.map((checksum) => fromChecksum(checksum)),
-    notIn: filter.notIn?.map((checksum) => fromChecksum(checksum)),
-  });
-}
-
-const encodedVideoFiles = (eb: AssetExpressionBuilder) =>
-  eb
-    .selectFrom('asset_file')
-    .whereRef('asset_file.assetId', '=', 'asset.id')
-    .where('asset_file.type', '=', AssetFileType.EncodedVideo);
-
-function existsPredicates(
-  eb: AssetExpressionBuilder,
-  filter: { eq: boolean } | undefined,
-  subquery: () => Expression<unknown>,
-): Expression<SqlBool>[] {
-  if (!filter) {
-    return [];
-  }
-  const exists = eb.exists(subquery());
-  return [filter.eq ? exists : eb.not(exists)];
-}
-
-// predicates are collected as expressions rather than chained `where` calls so the same
-// helpers can build each `or` branch, which must compose into eb.and/eb.or
-function branchPredicates(eb: AssetExpressionBuilder, branch: SearchFilterBranch) {
-  const { encodedVideoPath } = branch;
-  return [
-    ...comparisonPredicates(eb, 'asset.id', branch.id),
-    ...comparisonPredicates(eb, 'asset.libraryId', branch.libraryId),
-    ...comparisonPredicates(eb, 'asset.type', branch.type),
-    ...comparisonPredicates(eb, 'asset.visibility', branch.visibility),
-    ...(branch.isFavorite ? [eb('asset.isFavorite', '=', branch.isFavorite.eq)] : []),
-    ...(branch.isOffline ? [eb('asset.isOffline', '=', branch.isOffline.eq)] : []),
-    ...(branch.isMotion ? [eb('asset.livePhotoVideoId', branch.isMotion.eq ? 'is not' : 'is', null)] : []),
-    ...existsPredicates(eb, branch.isEncoded, () => encodedVideoFiles(eb)),
-    ...existsPredicates(eb, branch.hasAlbums, () => albumAssets(eb)),
-    ...existsPredicates(eb, branch.hasPeople, () => visibleFaces(eb)),
-    ...existsPredicates(eb, branch.hasTags, () => tagAssets(eb)),
-    ...comparisonPredicates(eb, 'asset_exif.city', branch.city),
-    ...comparisonPredicates(eb, 'asset_exif.state', branch.state),
-    ...comparisonPredicates(eb, 'asset_exif.country', branch.country),
-    ...comparisonPredicates(eb, 'asset_exif.make', branch.make),
-    ...comparisonPredicates(eb, 'asset_exif.model', branch.model),
-    ...comparisonPredicates(eb, 'asset_exif.lensModel', branch.lensModel),
-    ...stringPatternPredicates(eb, 'asset_exif.description', branch.description),
-    ...stringPatternPredicates(eb, 'asset.originalFileName', branch.originalFileName),
-    ...stringPatternPredicates(eb, 'asset.originalPath', branch.originalPath),
-    ...(branch.ocr
-      ? [
-          eb.exists(
-            eb
-              .selectFrom('ocr_search')
-              .whereRef('ocr_search.assetId', '=', 'asset.id')
-              .where(
-                sql<SqlBool>`f_unaccent(ocr_search.text) %>> f_unaccent(${tokenizeForSearch(branch.ocr.matches).join(' ')})`,
-              ),
-          ),
-        ]
-      : []),
-    ...comparisonPredicates(eb, 'asset_exif.rating', branch.rating),
-    ...comparisonPredicates(eb, 'asset_exif.fileSizeInByte', branch.fileSizeInBytes),
-    ...comparisonPredicates(eb, 'asset.fileCreatedAt', branch.takenAt),
-    ...comparisonPredicates(eb, 'asset.createdAt', branch.createdAt),
-    ...comparisonPredicates(eb, 'asset.updatedAt', branch.updatedAt),
-    ...comparisonPredicates(eb, 'asset.deletedAt', branch.trashedAt),
-    ...albumIdsPredicates(eb, branch.albumIds),
-    ...personIdsPredicates(eb, branch.personIds),
-    ...tagIdsPredicates(eb, branch.tagIds),
-    ...checksumPredicates(eb, branch.checksum),
-    ...(encodedVideoPath
-      ? [
-          eb.exists(
-            encodedVideoFiles(eb)
-              .where('asset_file.isEdited', '=', false)
-              .where((eb) => eb.and(comparisonPredicates(eb, 'asset_file.path', encodedVideoPath))),
-          ),
-        ]
-      : []),
-  ];
-}
-
-// ordering is deliberately left to the caller so aggregate-only consumers (counts, stats)
-// can compose the same filters without stripping an order by
-export function searchAssetBuilder(kysely: Kysely<DB>, options: AssetSearchBuilderV3Options) {
-  const filter = options.filter ?? {};
-
-  return (
-    kysely
-      .withPlugin(joinDeduplicationPlugin)
-      .selectFrom('asset')
-      // postgres eliminates the left join when no exif column is referenced, so unused joins are free
-      .leftJoin('asset_exif', 'asset.id', 'asset_exif.assetId')
-      .$if(!!options.withExif, (qb) => qb.select(selectExifInfo))
-      .$if(!!options.userIds && options.userIds.length > 0, (qb) =>
-        qb.where('asset.ownerId', '=', anyUuid(options.userIds!)),
-      )
-      .$if(!!(options.withFaces || options.withPeople), (qb) => qb.select(withFacesAndPeople))
-      .$if(options.withStacked === false, (qb) => qb.where('asset.stackId', 'is', null))
-      .where((eb) => {
-        const predicates = branchPredicates(eb, filter);
-        if (filter.or && filter.or.length > 0) {
-          predicates.push(eb.or(filter.or.map((branch) => eb.and(branchPredicates(eb, branch)))));
-        }
-        return predicates.length > 0 ? eb.and(predicates) : eb.lit(true);
-      })
-  );
-}
-
-const searchOrderColumns = {
-  [SearchOrderField.FileCreatedAt]: { column: 'asset.fileCreatedAt', nullable: false },
-  [SearchOrderField.LocalDateTime]: { column: 'asset.localDateTime', nullable: false },
-  [SearchOrderField.FileSizeInBytes]: { column: 'asset_exif.fileSizeInByte', nullable: true },
-  [SearchOrderField.Rating]: { column: 'asset_exif.rating', nullable: true },
-} as const;
-
-export function withSearchOrder(qb: ReturnType<typeof searchAssetBuilder>, order?: SearchOrder) {
-  const { field, direction } = order ?? DEFAULT_SEARCH_ORDER;
-  const { column, nullable } = searchOrderColumns[field];
-  return (
-    qb
-      .orderBy(column, (ob) => {
-        const ordered = direction === AssetOrder.Asc ? ob.asc() : ob.desc();
-        // nulls last: assets without an asset_exif row would otherwise lead descending results
-        return nullable ? ordered.nullsLast() : ordered;
-      })
-      // id tie-break for deterministic pagination
-      .orderBy('asset.id', direction)
-  );
-}
-
-export const searchMetadataV3Examples: GenerateSqlQueries[] = [
-  { name: 'baseline', params: [{ size: 100 }, { userIds: [DummyValue.UUID] }] },
-  { name: 'empty', params: [{ size: 100 }, {}] },
-  {
-    name: 'or-exif-only',
-    params: [{ size: 100 }, { userIds: [DummyValue.UUID], filter: { or: [{ city: { eq: DummyValue.STRING } }] } }],
-  },
-  {
-    name: 'string-eq-null',
-    params: [{ size: 100 }, { userIds: [DummyValue.UUID], filter: { city: { eq: null } } }],
-  },
-  {
-    name: 'string-pattern-like',
-    params: [{ size: 100 }, { userIds: [DummyValue.UUID], filter: { description: { like: DummyValue.STRING } } }],
-  },
-  {
-    name: 'string-pattern-notLike',
-    params: [{ size: 100 }, { userIds: [DummyValue.UUID], filter: { description: { notLike: DummyValue.STRING } } }],
-  },
-  {
-    name: 'string-pattern-startsWith',
-    params: [
-      { size: 100 },
-      { userIds: [DummyValue.UUID], filter: { originalFileName: { startsWith: DummyValue.STRING } } },
-    ],
-  },
-  {
-    name: 'string-similarity-ocr',
-    params: [{ size: 100 }, { userIds: [DummyValue.UUID], filter: { ocr: { matches: DummyValue.STRING } } }],
-  },
-  {
-    name: 'ids-any',
-    params: [{ size: 100 }, { userIds: [DummyValue.UUID], filter: { albumIds: { any: [DummyValue.UUID] } } }],
-  },
-  {
-    name: 'ids-all',
-    params: [
-      { size: 100 },
-      { userIds: [DummyValue.UUID], filter: { personIds: { all: [DummyValue.UUID, DummyValue.UUID_1] } } },
-    ],
-  },
-  {
-    name: 'ids-all-single',
-    params: [{ size: 100 }, { userIds: [DummyValue.UUID], filter: { albumIds: { all: [DummyValue.UUID] } } }],
-  },
-  {
-    name: 'ids-none',
-    params: [{ size: 100 }, { userIds: [DummyValue.UUID], filter: { tagIds: { none: [DummyValue.UUID] } } }],
-  },
-  {
-    name: 'ids-tags-all',
-    params: [
-      { size: 100 },
-      { userIds: [DummyValue.UUID], filter: { tagIds: { all: [DummyValue.UUID, DummyValue.UUID_1] } } },
-    ],
-  },
-  {
-    name: 'has-albums-false',
-    params: [{ size: 100 }, { userIds: [DummyValue.UUID], filter: { hasAlbums: { eq: false } } }],
-  },
-  {
-    name: 'is-encoded',
-    params: [{ size: 100 }, { userIds: [DummyValue.UUID], filter: { isEncoded: { eq: true } } }],
-  },
-  {
-    name: 'number-range',
-    params: [{ size: 100 }, { userIds: [DummyValue.UUID], filter: { fileSizeInBytes: { gte: 100, lte: 1000 } } }],
-  },
-  {
-    name: 'date-eq',
-    params: [{ size: 100 }, { userIds: [DummyValue.UUID], filter: { takenAt: { eq: DummyValue.DATE } } }],
-  },
-  {
-    name: 'date-range',
-    params: [
-      { size: 100 },
-      {
-        userIds: [DummyValue.UUID],
-        filter: { takenAt: { gte: DummyValue.DATE, lt: DummyValue.DATE } },
-      },
-    ],
-  },
-  {
-    name: 'order-fileSize-noExif',
-    params: [
-      { size: 100 },
-      {
-        userIds: [DummyValue.UUID],
-        order: { field: SearchOrderField.FileSizeInBytes, direction: AssetOrder.Desc },
-        withExif: false,
-      },
-    ],
-  },
-  {
-    name: 'order-rating-withExif',
-    params: [
-      { size: 100 },
-      {
-        userIds: [DummyValue.UUID],
-        order: { field: SearchOrderField.Rating, direction: AssetOrder.Asc },
-        withExif: true,
-      },
-    ],
-  },
-  {
-    name: 'or-branches',
-    params: [
-      { size: 100 },
-      {
-        userIds: [DummyValue.UUID],
-        filter: {
-          or: [{ isFavorite: { eq: true } }, { personIds: { any: [DummyValue.UUID] } }],
-        },
-      },
-    ],
-  },
-  {
-    name: 'or-with-top-level',
-    params: [
-      { size: 100 },
-      {
-        userIds: [DummyValue.UUID],
-        filter: {
-          takenAt: { gte: DummyValue.DATE, lt: DummyValue.DATE },
-          or: [{ isFavorite: { eq: true } }, { albumIds: { any: [DummyValue.UUID] } }],
-        },
-      },
-    ],
-  },
-];
-
-export const searchStatisticsV3Examples: GenerateSqlQueries[] = [
-  { name: 'baseline', params: [{ userIds: [DummyValue.UUID] }] },
-  {
-    name: 'with-filter',
-    params: [
-      {
-        userIds: [DummyValue.UUID],
-        filter: {
-          takenAt: { gte: DummyValue.DATE, lt: DummyValue.DATE },
-          fileSizeInBytes: { gte: 100 },
-        },
-      },
-    ],
-  },
-  {
-    name: 'with-or',
-    params: [
-      {
-        userIds: [DummyValue.UUID],
-        filter: {
-          or: [{ isFavorite: { eq: true } }, { hasAlbums: { eq: false } }],
-        },
-      },
-    ],
-  },
-];
-
 export type ReindexVectorIndexOptions = { indexName: string; lists?: number };
 
 type VectorIndexQueryOptions = { table: string; vectorExtension: VectorExtension } & ReindexVectorIndexOptions;

server/src/validation.ts

@@ -42,7 +42,7 @@ export function nonEmptyPartial<T extends z.ZodRawShape>(shape: T) {
     .object(shape)
     .partial()
     .refine((data) => Object.values(data as Record<string, unknown>).some((value) => value !== undefined), {
-      message: `At least one of the following fields is required: ${Object.keys(shape).join(', ')}`,
+      message: 'At least one field must be provided',
     });
 }
 

server/test/medium/specs/workflow/workflow-core-plugin.spec.ts

@@ -433,10 +433,9 @@ describe('core plugin', () => {
   describe('assetDateFilter', () => {
     it('should favorite assets created during the first 7 days of a specific year and month', async () => {
       const { user } = await ctx.newUser();
-      const [{ asset: asset1 }, { asset: asset2 }, { asset: asset3 }] = await Promise.all([
+      const [{ asset: asset1 }, { asset: asset2 }] = await Promise.all([
         ctx.newAsset({ ownerId: user.id, localDateTime: new Date('2000-04-01') }),
         ctx.newAsset({ ownerId: user.id, localDateTime: new Date('2000-04-07T23:59:59Z') }),
-        ctx.newAsset({ ownerId: user.id, localDateTime: new Date('2000-04-08T00:00:00Z') }),
       ]);
 
       const workflow = await createWorkflow({
@@ -462,46 +461,6 @@ describe('core plugin', () => {
 
       await ctx.sut.handleAssetTrigger({ workflowId: workflow.id, assetId: asset2.id });
       await expect(ctx.get(AssetRepository).getById(asset2.id)).resolves.toMatchObject({ isFavorite: true });
-
-      await ctx.sut.handleAssetTrigger({ workflowId: workflow.id, assetId: asset3.id });
-      await expect(ctx.get(AssetRepository).getById(asset3.id)).resolves.toMatchObject({ isFavorite: false });
-    });
-
-    it('should match recurring dates regardless of the year', async () => {
-      const { user } = await ctx.newUser();
-      const [{ asset: asset1 }, { asset: asset2 }, { asset: asset3 }] = await Promise.all([
-        ctx.newAsset({ ownerId: user.id, localDateTime: new Date('2026-03-01') }),
-        ctx.newAsset({ ownerId: user.id, localDateTime: new Date('1998-12-21') }),
-        ctx.newAsset({ ownerId: user.id, localDateTime: new Date('2000-04-08T00:00:00Z') }),
-      ]);
-      await ctx.newAsset({ ownerId: user.id, localDateTime: new Date('2010-06-15') });
-
-      const workflow = await createWorkflow({
-        ownerId: user.id,
-        trigger: WorkflowTrigger.AssetCreate,
-        steps: [
-          {
-            method: 'immich-plugin-core#assetDateFilter',
-            config: {
-              startDate: { day: 12, month: 12, year: 2000 },
-              endDate: { day: 30, month: 3, year: 2001 },
-              recurring: true,
-            },
-          },
-          {
-            method: 'immich-plugin-core#assetFavorite',
-          },
-        ],
-      });
-
-      await ctx.sut.handleAssetTrigger({ workflowId: workflow.id, assetId: asset1.id });
-      await expect(ctx.get(AssetRepository).getById(asset1.id)).resolves.toMatchObject({ isFavorite: true });
-
-      await ctx.sut.handleAssetTrigger({ workflowId: workflow.id, assetId: asset2.id });
-      await expect(ctx.get(AssetRepository).getById(asset2.id)).resolves.toMatchObject({ isFavorite: true });
-
-      await ctx.sut.handleAssetTrigger({ workflowId: workflow.id, assetId: asset3.id });
-      await expect(ctx.get(AssetRepository).getById(asset3.id)).resolves.toMatchObject({ isFavorite: false });
     });
   });
 

web/src/lib/components/CalendarHeatmap.svelte

@@ -55,36 +55,34 @@
       {/each}
     </div> -->
 
-    <div class="overflow-x-auto pb-1">
-      <div class="grid grid-flow-col grid-rows-7 gap-0.5">
-        <div class="row-span-7 grid grid-rows-subgrid">
-          {#if Info.getStartOfWeek({ locale: $locale }) === 7}
-            <div></div>
-          {/if}
-          <div class="row-span-2 -mt-1"><Text size="tiny" class="mr-0.5 font-mono">{weekdays[0]}</Text></div>
-          <div class="row-span-2 -mt-1"><Text size="tiny" class="mr-0.5 font-mono">{weekdays[1]}</Text></div>
-          <div class="row-span-2 -mt-1"><Text size="tiny" class="mr-0.5 font-mono">{weekdays[2]}</Text></div>
-          {#if Info.getStartOfWeek({ locale: $locale }) === 1}
-            <div class="-my-1"><Text size="tiny" class="mr-0.5 font-mono">{weekdays[3]}</Text></div>
-          {/if}
-        </div>
-
-        {#each data.series as day, idx (day.date)}
-          {@const date = DateTime.fromISO(day.date, { zone: 'utc' }).toLocaleString(
-            { month: 'short', day: 'numeric' },
-            { locale: $locale },
-          )}
-          <div
-            class="aspect-square size-full rounded-sm {itemColors(day.count)} row-start-(--heatmap-row-start)"
-            style:--heatmap-row-start={idx === 0 ? padding + 1 : undefined}
-            title={itemLabel({ date, count: day.count })}
-            aria-label={itemLabel({ date, count: day.count })}
-          ></div>
-        {/each}
+    <div class="grid grid-flow-col grid-rows-7 gap-0.5">
+      <div class="row-span-7 grid grid-rows-subgrid">
+        {#if Info.getStartOfWeek({ locale: $locale }) === 7}
+          <div></div>
+        {/if}
+        <div class="row-span-2 -mt-1"><Text size="tiny" class="mr-0.5 font-mono">{weekdays[0]}</Text></div>
+        <div class="row-span-2 -mt-1"><Text size="tiny" class="mr-0.5 font-mono">{weekdays[1]}</Text></div>
+        <div class="row-span-2 -mt-1"><Text size="tiny" class="mr-0.5 font-mono">{weekdays[2]}</Text></div>
+        {#if Info.getStartOfWeek({ locale: $locale }) === 1}
+          <div class="-my-1"><Text size="tiny" class="mr-0.5 font-mono">{weekdays[3]}</Text></div>
+        {/if}
       </div>
+
+      {#each data.series as day, idx (day.date)}
+        {@const date = DateTime.fromISO(day.date, { zone: 'utc' }).toLocaleString(
+          { month: 'short', day: 'numeric' },
+          { locale: $locale },
+        )}
+        <div
+          class="aspect-square size-full rounded-sm {itemColors(day.count)} row-start-(--heatmap-row-start)"
+          style:--heatmap-row-start={idx === 0 ? padding + 1 : undefined}
+          title={itemLabel({ date, count: day.count })}
+          aria-label={itemLabel({ date, count: day.count })}
+        ></div>
+      {/each}
     </div>
 
-    <div class="mt-2 flex flex-wrap items-center gap-2 text-xs text-gray-500 dark:text-gray-400">
+    <div class="mt-2 flex items-center gap-2 text-xs text-gray-500 dark:text-gray-400">
       <span>{$t('less')}</span>
       <span class="size-3 rounded-sm bg-gray-200 dark:bg-gray-700"></span>
       <span class="size-3 rounded-sm bg-immich-primary/30"></span>

web/src/lib/components/asset-viewer/actions/NextAssetAction.svelte

@@ -1,10 +1,9 @@
 <script lang="ts">
   import { shortcuts } from '$lib/actions/shortcut';
   import { Icon } from '@immich/ui';
-  import { mdiChevronRight, mdiChevronLeft } from '@mdi/js';
+  import { mdiChevronRight } from '@mdi/js';
   import { t } from 'svelte-i18n';
   import NavigationArea from '../NavigationArea.svelte';
-  import { languageManager } from '$lib/managers/language-manager.svelte';
 
   interface Props {
     onNextAsset: () => void;
@@ -21,5 +20,5 @@
 />
 
 <NavigationArea onClick={onNextAsset} label={$t('view_next_asset')}>
-  <Icon icon={languageManager.rtl ? mdiChevronLeft : mdiChevronRight} size="36" aria-hidden />
+  <Icon icon={mdiChevronRight} size="36" aria-hidden />
 </NavigationArea>

web/src/lib/components/asset-viewer/actions/PreviousAssetAction.svelte

@@ -1,10 +1,9 @@
 <script lang="ts">
   import { shortcuts } from '$lib/actions/shortcut';
   import { Icon } from '@immich/ui';
-  import { mdiChevronLeft, mdiChevronRight } from '@mdi/js';
+  import { mdiChevronLeft } from '@mdi/js';
   import { t } from 'svelte-i18n';
   import NavigationArea from '../NavigationArea.svelte';
-  import { languageManager } from '$lib/managers/language-manager.svelte';
 
   interface Props {
     onPreviousAsset: () => void;
@@ -21,5 +20,5 @@
 />
 
 <NavigationArea onClick={onPreviousAsset} label={$t('view_previous_asset')}>
-  <Icon icon={languageManager.rtl ? mdiChevronRight : mdiChevronLeft} size="36" aria-hidden />
+  <Icon icon={mdiChevronLeft} size="36" aria-hidden />
 </NavigationArea>

web/src/lib/managers/timeline-manager/internal/search-support.svelte.ts

@@ -1,6 +1,6 @@
-import { AssetOrder, AssetOrderBy, type AssetResponseDto } from '@immich/sdk';
+import { AssetOrder, type AssetResponseDto } from '@immich/sdk';
 import { DateTime } from 'luxon';
-import { getOrderingDate, plainDateTimeCompare, type TimelineYearMonth } from '$lib/utils/timeline-util';
+import { plainDateTimeCompare, type TimelineYearMonth } from '$lib/utils/timeline-util';
 import { TimelineManager } from '../timeline-manager.svelte';
 import type { TimelineMonth } from '../timeline-month.svelte';
 import type { AssetDescriptor, Direction, TimelineAsset } from '../types';
@@ -125,14 +125,7 @@ export async function retrieveRange(timelineManager: TimelineManager, start: Ass
     return [];
   }
   const assetOrder: AssetOrder = timelineManager.getAssetOrder();
-  const orderBy: AssetOrderBy = timelineManager.getOrderBy();
-  if (
-    plainDateTimeCompare(
-      assetOrder === AssetOrder.Desc,
-      getOrderingDate(startAsset, orderBy),
-      getOrderingDate(endAsset, orderBy),
-    ) < 0
-  ) {
+  if (plainDateTimeCompare(assetOrder === AssetOrder.Desc, startAsset.localDateTime, endAsset.localDateTime) < 0) {
     [startAsset, endAsset] = [endAsset, startAsset];
     // eslint-disable-next-line no-useless-assignment
     [startTimelineMonth, endTimelineMonth] = [endTimelineMonth, startTimelineMonth];

web/src/lib/managers/timeline-manager/timeline-manager.svelte.spec.ts

@@ -1,4 +1,4 @@
-import { AssetOrderBy, AssetVisibility, type AssetResponseDto, type TimeBucketAssetResponseDto } from '@immich/sdk';
+import { AssetVisibility, type AssetResponseDto, type TimeBucketAssetResponseDto } from '@immich/sdk';
 import { tick } from 'svelte';
 import { sdkMock } from '$lib/__mocks__/sdk.mock';
 import { eventManager } from '$lib/managers/event-manager.svelte';
@@ -808,44 +808,4 @@ describe('TimelineManager', () => {
       expect(b.showAssetOwners).toBe(true);
     });
   });
-
-  describe('retrieveRange', () => {
-    it('uses createdAt ordering in the Recently Added view (orderBy=CreatedAt)', async () => {
-      // Simulate the "Recently Added" bug: two assets whose localDateTime order is
-      // the reverse of their createdAt (upload) order. Before the fix, retrieveRange
-      // compared localDateTime and selected the wrong range direction.
-      const timelineManager = new TimelineManager();
-      sdkMock.getTimeBuckets.mockResolvedValue([]);
-      await timelineManager.updateOptions({ orderBy: AssetOrderBy.CreatedAt });
-
-      // assetA was taken recently (2024) but uploaded first (2025-01)
-      const assetA = timelineAssetFactory.build({
-        localDateTime: fromISODateTimeUTCToObject('2024-06-01T00:00:00.000Z'),
-        createdAt: fromISODateTimeUTCToObject('2025-01-20T00:00:00.000Z'),
-        fileCreatedAt: fromISODateTimeUTCToObject('2025-01-20T00:00:00.000Z'),
-      });
-      // assetB was taken long ago (2018) but uploaded second (2025-02)
-      const assetB = timelineAssetFactory.build({
-        localDateTime: fromISODateTimeUTCToObject('2018-03-15T00:00:00.000Z'),
-        createdAt: fromISODateTimeUTCToObject('2025-02-10T00:00:00.000Z'),
-        fileCreatedAt: fromISODateTimeUTCToObject('2025-02-10T00:00:00.000Z'),
-      });
-      // assetC is an unrelated asset that should not appear in the selection
-      const assetC = timelineAssetFactory.build({
-        localDateTime: fromISODateTimeUTCToObject('2022-01-01T00:00:00.000Z'),
-        createdAt: fromISODateTimeUTCToObject('2025-03-01T00:00:00.000Z'),
-        fileCreatedAt: fromISODateTimeUTCToObject('2025-03-01T00:00:00.000Z'),
-      });
-
-      timelineManager.upsertAssets([assetA, assetB, assetC]);
-
-      // Shift-click from assetB (uploaded most recently) to assetA — the range
-      // between them in the "Recently Added" timeline should contain only those two.
-      const range = await timelineManager.retrieveRange({ id: assetB.id }, { id: assetA.id });
-      const ids = range.map((a) => a.id);
-      expect(ids).toContain(assetA.id);
-      expect(ids).toContain(assetB.id);
-      expect(ids).not.toContain(assetC.id);
-    });
-  });
 });

web/src/lib/managers/timeline-manager/timeline-manager.svelte.ts

@@ -625,10 +625,6 @@ export class TimelineManager extends VirtualScrollManager {
     return this.#options.order ?? AssetOrder.Desc;
   }
 
-  getOrderBy() {
-    return this.#options.orderBy ?? AssetOrderBy.TakenAt;
-  }
-
   protected postCreateSegments(): void {
     this.months.sort((a, b) => {
       return a.yearMonth.year === b.yearMonth.year

web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/+page.svelte

@@ -95,8 +95,6 @@
     const getPreviousRoute = $page.url.searchParams.get(QueryParameter.PREVIOUS_ROUTE);
     if (getPreviousRoute && !isExternalUrl(getPreviousRoute)) {
       previousRoute = getPreviousRoute;
-    } else if ($page.params.assetId) {
-      previousRoute = Route.viewPerson(data.person);
     }
     if (action == 'merge') {
       viewMode = PersonPageViewMode.MERGE_PEOPLE;

web/src/routes/admin/users/[id]/+layout.svelte

@@ -213,7 +213,7 @@
           </Stack>
         </AdminCard>
 
-        <div class="col-span-full px-4 py-2">
+        <div class="col-span-2 px-4 py-2">
           <div class="flex gap-2 text-primary">
             <Icon icon={mdiCloudUploadOutline} size="1.5rem" />
             <CardTitle>{$t('uploads')}</CardTitle>