wip

include deleted assets if searching for offline assets

.devcontainer/.gitignore

@@ -0,0 +1,2 @@
+.env
+library

.devcontainer/Dockerfile

@@ -1,2 +1,16 @@
 ARG BASEIMAGE=mcr.microsoft.com/devcontainers/typescript-node:22@sha256:9791f4aa527774bc370c6bd2f6705ce5a686f1e6f204badd8dfaacce28c631ae
 FROM ${BASEIMAGE}
+
+# Flutter SDK
+# https://flutter.dev/docs/development/tools/sdk/releases?tab=linux
+ENV FLUTTER_CHANNEL="stable"
+ENV FLUTTER_VERSION="3.24.5"
+ENV FLUTTER_HOME=/flutter
+ENV PATH=${PATH}:${FLUTTER_HOME}/bin
+
+# Flutter SDK
+RUN mkdir -p ${FLUTTER_HOME} \
+  && curl -C - --output flutter.tar.xz https://storage.googleapis.com/flutter_infra_release/releases/${FLUTTER_CHANNEL}/linux/flutter_linux_${FLUTTER_VERSION}-${FLUTTER_CHANNEL}.tar.xz \
+  && tar -xf flutter.tar.xz --strip-components=1 -C ${FLUTTER_HOME} \
+  && rm flutter.tar.xz \
+  && chown -R 1000:1000 ${FLUTTER_HOME}

.devcontainer/devcontainer.json

@@ -1,20 +1,26 @@
 {
-	"name": "Immich devcontainers",
-	"build": {
-		"dockerfile": "Dockerfile",
-		"args": {
-			"BASEIMAGE": "mcr.microsoft.com/devcontainers/typescript-node:22"
-		}
-	},
-	"customizations": {
-		"vscode": {
-			"extensions": [
-				"svelte.svelte-vscode"
-			]
-		}
-	},
-	"forwardPorts": [],
-	"postCreateCommand": "make install-all",
-	"remoteUser": "node"
+  "name": "Immich",
+  "service": "immich-devcontainer",
+  "dockerComposeFile": [
+    "docker-compose.yml",
+    "../docker/docker-compose.dev.yml"
+  ],
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "Dart-Code.dart-code",
+        "Dart-Code.flutter",
+        "dbaeumer.vscode-eslint",
+        "dcmdev.dcm-vscode-extension",
+        "esbenp.prettier-vscode",
+        "svelte.svelte-vscode"
+      ]
+    }
+  },
+  "forwardPorts": [],
+  "initializeCommand": "bash .devcontainer/scripts/initializeCommand.sh",
+  "onCreateCommand": "bash .devcontainer/scripts/onCreateCommand.sh",
+  "overrideCommand": true,
+  "workspaceFolder": "/immich",
+  "remoteUser": "node"
 }
-

.devcontainer/docker-compose.yml

@@ -0,0 +1,8 @@
+services:
+  immich-devcontainer:
+    build:
+      dockerfile: Dockerfile
+    extra_hosts:
+      - 'host.docker.internal:host-gateway'
+    volumes:
+      - ..:/immich:cached

.devcontainer/scripts/initializeCommand.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# If .env file does not exist, create it by copying example.env from the docker folder
+if [ ! -f ".devcontainer/.env" ]; then
+    cp docker/example.env .devcontainer/.env
+fi

.devcontainer/scripts/onCreateCommand.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# Enable multiarch for arm64 if necessary
+if [ "$(dpkg --print-architecture)" = "arm64" ]; then
+    sudo dpkg --add-architecture amd64 && \
+    sudo apt-get update && \
+    sudo apt-get install -y --no-install-recommends \
+        qemu-user-static \
+        libc6:amd64 \
+        libstdc++6:amd64 \
+        libgcc1:amd64
+fi
+
+# Install DCM
+wget -qO- https://dcm.dev/pgp-key.public | sudo gpg --dearmor -o /usr/share/keyrings/dcm.gpg
+sudo echo 'deb [signed-by=/usr/share/keyrings/dcm.gpg arch=amd64] https://dcm.dev/debian stable main' | sudo tee /etc/apt/sources.list.d/dart_stable.list
+
+sudo apt-get update
+sudo apt-get install dcm
+
+dart --disable-analytics
+
+# Install immich
+cd /immich || exit
+make install-all

.github/FUNDING.yml

@@ -1 +1 @@
-custom: ['https://buy.immich.app']
+custom: ['https://buy.immich.app', 'https://immich.store']

.github/PULL_REQUEST_TEMPLATE/config.yml

@@ -1,2 +1 @@
-blank_issues_enabled: false
 blank_pull_request_template_enabled: false

.github/PULL_REQUEST_TEMPLATE/pull_request_template.md

@@ -1,22 +0,0 @@
-## Description
-<!--- Describe your changes in detail -->
-<!--- Why is this change required? What problem does it solve? -->
-<!--- If it fixes an open issue, please link to the issue here. -->
-
-Fixes # (issue)
-
-
-## How Has This Been Tested?
-
-<!-- Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration -->
-
-- [ ] Test A
-- [ ] Test B
-
-## Screenshots (if appropriate):
-
-
-## Checklist:
-
-- [ ] I have performed a self-review of my own code
-- [ ] I have made corresponding changes to the documentation if applicable

.github/pull_request_template.md

@@ -0,0 +1,36 @@
+## Description
+
+<!--- Describe your changes in detail -->
+<!--- Why is this change required? What problem does it solve? -->
+<!--- If it fixes an open issue, please link to the issue here. -->
+
+Fixes # (issue)
+
+## How Has This Been Tested?
+
+<!-- Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration -->
+
+- [ ] Test A
+- [ ] Test B
+
+<details><summary><h2>Screenshots (if appropriate)</h2></summary>
+
+<!-- Images go below this line. -->
+
+</details>
+
+<!-- API endpoint changes (if relevant)
+## API Changes
+The `/api/something` endpoint is now `/api/something-else`
+-->
+
+## Checklist:
+
+- [ ] I have performed a self-review of my own code
+- [ ] I have made corresponding changes to the documentation if applicable
+- [ ] I have no unrelated changes in the PR.
+- [ ] I have confirmed that any new dependencies are strictly necessary.
+- [ ] I have written tests for new code (if applicable)
+- [ ] I have followed naming conventions/patterns in the surrounding code
+- [ ] All code in `src/services` uses repositories implementations for database calls, filesystem operations, etc.
+- [ ] All code in `src/repositories/` is pretty basic/simple and does not have any immich specific logic (that belongs in `src/services`)

.github/workflows/build-mobile.yml

@@ -29,9 +29,11 @@ jobs:
           filters: |
             mobile:
               - 'mobile/**'
+            workflow:
+              - '.github/workflows/build-mobile.yml'
       - name: Check if we should force jobs to run
         id: should_force
-        run: echo "should_force=${{ github.event_name == 'workflow_call' || github.event_name == 'workflow_dispatch' }}" >> "$GITHUB_OUTPUT"
+        run: echo "should_force=${{ steps.found_paths.outputs.workflow == 'true' || github.event_name == 'workflow_call' || github.event_name == 'workflow_dispatch' }}" >> "$GITHUB_OUTPUT"
 
   build-sign-android:
     name: Build and sign Android

.github/workflows/cli.yml

@@ -56,10 +56,10 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.2.0
+        uses: docker/setup-qemu-action@v3.4.0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.8.0
+        uses: docker/setup-buildx-action@v3.9.0
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
@@ -88,7 +88,7 @@ jobs:
             type=raw,value=latest,enable=${{ github.event_name == 'release' }}
 
       - name: Build and push image
-        uses: docker/build-push-action@v6.10.0
+        uses: docker/build-push-action@v6.13.0
         with:
           file: cli/Dockerfile
           platforms: linux/amd64,linux/arm64

.github/workflows/docker-cleanup.yml

@@ -1,73 +0,0 @@
-# This workflow runs on certain conditions to check for and potentially
-# delete container images from the GHCR which no longer have an associated
-# code branch.
-# Requires a PAT with the correct scope set in the secrets.
-#
-# This workflow will not trigger runs on forked repos.
-
-name: Docker Cleanup
-
-on:
-  pull_request:
-    types:
-      - "closed"
-  push:
-    paths:
-      - ".github/workflows/docker-cleanup.yml"
-
-concurrency:
-  group: registry-tags-cleanup
-  cancel-in-progress: false
-
-jobs:
-  cleanup-images:
-    name: Cleanup Stale Images Tags for ${{ matrix.primary-name }}
-    runs-on: ubuntu-24.04
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - primary-name: "immich-server"
-          - primary-name: "immich-machine-learning"
-    env:
-      # Requires a personal access token with the OAuth scope delete:packages
-      TOKEN: ${{ secrets.PACKAGE_DELETE_TOKEN }}
-    steps:
-      - name: Clean temporary images
-        if: "${{ env.TOKEN != '' }}"
-        uses: stumpylog/image-cleaner-action/ephemeral@v0.9.0
-        with:
-          token: "${{ env.TOKEN }}"
-          owner: "immich-app"
-          is_org: "true"
-          do_delete: "true"
-          package_name: "${{ matrix.primary-name }}"
-          scheme: "pull_request"
-          repo_name: "immich"
-          match_regex: '^pr-(\d+)$|^(\d+)$'
-
-  cleanup-untagged-images:
-    name: Cleanup Untagged Images Tags for ${{ matrix.primary-name }}
-    runs-on: ubuntu-24.04
-    needs:
-      - cleanup-images
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - primary-name: "immich-server"
-          - primary-name: "immich-machine-learning"
-          - primary-name: "immich-build-cache"
-    env:
-      # Requires a personal access token with the OAuth scope delete:packages
-      TOKEN: ${{ secrets.PACKAGE_DELETE_TOKEN }}
-    steps:
-      - name: Clean untagged images
-        if: "${{ env.TOKEN != '' }}"
-        uses: stumpylog/image-cleaner-action/untagged@v0.9.0
-        with:
-          token: "${{ env.TOKEN }}"
-          owner: "immich-app"
-          do_delete: "true"
-          is_org: "true"
-          package_name: "${{ matrix.primary-name }}"

.github/workflows/docker.yml

@@ -36,10 +36,12 @@ jobs:
               - 'i18n/**'
             machine-learning:
               - 'machine-learning/**'
+            workflow:
+              - '.github/workflows/docker.yml'
 
       - name: Check if we should force jobs to run
         id: should_force
-        run: echo "should_force=${{ github.event_name == 'workflow_dispatch' || github.event_name == 'release' }}" >> "$GITHUB_OUTPUT"
+        run: echo "should_force=${{ steps.found_paths.outputs.workflow == 'true' || github.event_name == 'workflow_dispatch' || github.event_name == 'release' }}" >> "$GITHUB_OUTPUT"
 
   retag_ml:
     name: Re-Tag ML
@@ -61,8 +63,10 @@ jobs:
               REGISTRY_NAME="ghcr.io"
               REPOSITORY=${{ github.repository_owner }}/immich-machine-learning
               TAG_OLD=main${{ matrix.suffix }}
-              TAG_NEW=${{ github.event.number == 0 && github.ref_name ||  format('pr-{0}', github.event.number)  }}${{ matrix.suffix }}
-              docker buildx imagetools create -t $REGISTRY_NAME/$REPOSITORY:$TAG_NEW $REGISTRY_NAME/$REPOSITORY:$TAG_OLD
+              TAG_PR=${{ github.event.number == 0 && github.ref_name ||  format('pr-{0}', github.event.number)  }}${{ matrix.suffix }}
+              TAG_COMMIT=commit-${{ github.event_name != 'pull_request' && github.sha || github.event.pull_request.head.sha }}${{ matrix.suffix }}
+              docker buildx imagetools create -t $REGISTRY_NAME/$REPOSITORY:$TAG_PR $REGISTRY_NAME/$REPOSITORY:$TAG_OLD
+              docker buildx imagetools create -t $REGISTRY_NAME/$REPOSITORY:$TAG_COMMIT $REGISTRY_NAME/$REPOSITORY:$TAG_OLD
 
   retag_server:
     name: Re-Tag Server
@@ -84,107 +88,100 @@ jobs:
           REGISTRY_NAME="ghcr.io"
           REPOSITORY=${{ github.repository_owner }}/immich-server
           TAG_OLD=main${{ matrix.suffix }}
-          TAG_NEW=${{ github.event.number == 0 && github.ref_name ||  format('pr-{0}', github.event.number)  }}${{ matrix.suffix }}
-          docker buildx imagetools create -t $REGISTRY_NAME/$REPOSITORY:$TAG_NEW $REGISTRY_NAME/$REPOSITORY:$TAG_OLD
-
+          TAG_PR=${{ github.event.number == 0 && github.ref_name ||  format('pr-{0}', github.event.number)  }}${{ matrix.suffix }}
+          TAG_COMMIT=commit-${{ github.event_name != 'pull_request' && github.sha || github.event.pull_request.head.sha }}${{ matrix.suffix }}
+          docker buildx imagetools create -t $REGISTRY_NAME/$REPOSITORY:$TAG_PR $REGISTRY_NAME/$REPOSITORY:$TAG_OLD
+          docker buildx imagetools create -t $REGISTRY_NAME/$REPOSITORY:$TAG_COMMIT $REGISTRY_NAME/$REPOSITORY:$TAG_OLD
 
   build_and_push_ml:
     name: Build and Push ML
     needs: pre-job
     if: ${{ needs.pre-job.outputs.should_run_ml == 'true' }}
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.runner }}
     env:
       image: immich-machine-learning
       context: machine-learning
       file: machine-learning/Dockerfile
+      GHCR_REPO: ghcr.io/${{ github.repository_owner }}/immich-machine-learning
     strategy:
       # Prevent a failure in one image from stopping the other builds
       fail-fast: false
       matrix:
         include:
-          - platforms: linux/amd64,linux/arm64
+          - platform: linux/amd64
+            runner: ubuntu-latest
             device: cpu
 
-          - platforms: linux/amd64
+          - platform: linux/arm64
+            runner: ubuntu-24.04-arm
+            device: cpu
+
+          - platform: linux/amd64
+            runner: ubuntu-latest
             device: cuda
             suffix: -cuda
 
-          - platforms: linux/amd64
+          - platform: linux/amd64
+            runner: ubuntu-latest
             device: openvino
             suffix: -openvino
 
-          - platforms: linux/arm64
+          - platform: linux/arm64
+            runner: ubuntu-24.04-arm
             device: armnn
             suffix: -armnn
 
     steps:
+      - name: Prepare
+        run: |
+          platform=${{ matrix.platform }}
+          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
+
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.2.0
-
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.8.0
-
-      - name: Login to Docker Hub
-        # Only push to Docker Hub when making a release
-        if: ${{ github.event_name == 'release' }}
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+        uses: docker/setup-buildx-action@v3.9.0
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
-        # Skip when PR from a fork
         if: ${{ !github.event.pull_request.head.repo.fork }}
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Generate docker image tags
-        id: metadata
-        uses: docker/metadata-action@v5
-        with:
-          flavor: |
-            # Disable latest tag
-            latest=false
-          images: |
-            name=ghcr.io/${{ github.repository_owner }}/${{env.image}}
-            name=altran1502/${{env.image}},enable=${{ github.event_name == 'release' }}
-          tags: |
-            # Tag with branch name
-            type=ref,event=branch,suffix=${{ matrix.suffix }}
-            # Tag with pr-number
-            type=ref,event=pr,suffix=${{ matrix.suffix }}
-            # Tag with git tag on release
-            type=ref,event=tag,suffix=${{ matrix.suffix }}
-            type=raw,value=release,enable=${{ github.event_name == 'release' }},suffix=${{ matrix.suffix }}
-
-      - name: Determine build cache output
-        id: cache-target
+      - name: Generate cache key suffix
         run: |
           if [[ "${{ github.event_name }}" == "pull_request" ]]; then
-            # Essentially just ignore the cache output (PR can't write to registry cache)
+            echo "CACHE_KEY_SUFFIX=pr-${{ github.event.number }}" >> $GITHUB_ENV
+          else
+            echo "CACHE_KEY_SUFFIX=$(echo ${{ github.ref_name }} | sed 's/[^a-zA-Z0-9]/-/g')" >> $GITHUB_ENV
+          fi
+
+      - name: Generate cache target
+        id: cache-target
+        run: |
+          if [[ "${{ github.event.pull_request.head.repo.fork }}" == "true" ]]; then
+            # Essentially just ignore the cache output (forks can't write to registry cache)
             echo "cache-to=type=local,dest=/tmp/discard,ignore-error=true" >> $GITHUB_OUTPUT
           else
-            echo "cache-to=type=registry,mode=max,ref=ghcr.io/${{ github.repository_owner }}/immich-build-cache:${{ env.image }}" >> $GITHUB_OUTPUT
+            echo "cache-to=type=registry,ref=${{ env.GHCR_REPO }}-build-cache:${{ env.PLATFORM_PAIR }}-${{ matrix.device }}-${{ env.CACHE_KEY_SUFFIX }},mode=max,compression=zstd" >> $GITHUB_OUTPUT
           fi
 
       - name: Build and push image
-        uses: docker/build-push-action@v6.10.0
+        id: build
+        uses: docker/build-push-action@v6.13.0
         with:
           context: ${{ env.context }}
           file: ${{ env.file }}
           platforms: ${{ matrix.platforms }}
-          # Skip pushing when PR from a fork
-          push: ${{ !github.event.pull_request.head.repo.fork }}
-          cache-from: type=registry,ref=ghcr.io/${{ github.repository_owner }}/immich-build-cache:${{env.image}}
-          cache-to: ${{ steps.cache-target.outputs.cache-to }}
-          tags: ${{ steps.metadata.outputs.tags }}
           labels: ${{ steps.metadata.outputs.labels }}
+          cache-to: ${{ steps.cache-target.outputs.cache-to }}
+          cache-from: |
+            type=registry,ref=${{ env.GHCR_REPO }}-build-cache:${{ env.PLATFORM_PAIR }}-${{ matrix.device }}-${{ env.CACHE_KEY_SUFFIX }}
+            type=registry,ref=${{ env.GHCR_REPO }}-build-cache:${{ env.PLATFORM_PAIR }}-${{ matrix.device }}-main
+          outputs: type=image,"name=${{ env.GHCR_REPO }}",push-by-digest=true,name-canonical=true,push=${{ !github.event.pull_request.head.repo.fork }}
           build-args: |
             DEVICE=${{ matrix.device }}
             BUILD_ID=${{ github.run_id }}
@@ -192,100 +189,249 @@ jobs:
             BUILD_SOURCE_REF=${{ github.ref_name }}
             BUILD_SOURCE_COMMIT=${{ github.sha }}
 
+      - name: Export digest
+        run: |
+          mkdir -p ${{ runner.temp }}/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "${{ runner.temp }}/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v4
+        with:
+          name: ml-digests-${{ matrix.device }}-${{ env.PLATFORM_PAIR }}
+          path: ${{ runner.temp }}/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge_ml:
+    name: Merge & Push ML
+    runs-on: ubuntu-latest
+    if: ${{ needs.pre-job.outputs.should_run_ml == 'true' && !github.event.pull_request.head.repo.fork }}
+    env:
+      GHCR_REPO: ghcr.io/${{ github.repository_owner }}/immich-machine-learning
+      DOCKER_REPO: altran1502/immich-machine-learning
+    strategy:
+      matrix:
+        include:
+          - device: cpu
+          - device: cuda
+            suffix: -cuda
+          - device: openvino
+            suffix: -openvino
+          - device: armnn
+            suffix: -armnn
+    needs:
+      - build_and_push_ml
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v4
+        with:
+          path: ${{ runner.temp }}/digests
+          pattern: ml-digests-${{ matrix.device }}-*
+          merge-multiple: true
+
+      - name: Login to Docker Hub
+        if: ${{ github.event_name == 'release' }}
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Generate docker image tags
+        id: meta
+        uses: docker/metadata-action@v5
+        env:
+          DOCKER_METADATA_PR_HEAD_SHA: "true"
+        with:
+          flavor: |
+            # Disable latest tag
+            latest=false
+          images: |
+            name=${{ env.GHCR_REPO }}
+            name=${{ env.DOCKER_REPO }},enable=${{ github.event_name == 'release' }}
+          tags: |
+            # Tag with branch name
+            type=ref,event=branch,suffix=${{ matrix.suffix }}
+            # Tag with pr-number
+            type=ref,event=pr,suffix=${{ matrix.suffix }}
+            # Tag with long commit sha hash
+            type=sha,format=long,prefix=commit-,suffix=${{ matrix.suffix }}
+            # Tag with git tag on release
+            type=ref,event=tag,suffix=${{ matrix.suffix }}
+            type=raw,value=release,enable=${{ github.event_name == 'release' }},suffix=${{ matrix.suffix }}
+
+      - name: Create manifest list and push
+        working-directory: ${{ runner.temp }}/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ env.GHCR_REPO }}@sha256:%s ' *)
 
   build_and_push_server:
     name: Build and Push Server
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.runner }}
     needs: pre-job
     if: ${{ needs.pre-job.outputs.should_run_server == 'true' }}
     env:
       image: immich-server
       context: .
       file: server/Dockerfile
+      GHCR_REPO: ghcr.io/${{ github.repository_owner }}/immich-server
     strategy:
       fail-fast: false
       matrix:
         include:
-          - platforms: linux/amd64,linux/arm64
-            device: cpu
+          - platform: linux/amd64
+            runner: ubuntu-latest
+          - platform: linux/arm64
+            runner: ubuntu-24.04-arm
     steps:
+      - name: Prepare
+        run: |
+          platform=${{ matrix.platform }}
+          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
+
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.2.0
-
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.8.0
-
-      - name: Login to Docker Hub
-        # Only push to Docker Hub when making a release
-        if: ${{ github.event_name == 'release' }}
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
-        # Skip when PR from a fork
         if: ${{ !github.event.pull_request.head.repo.fork }}
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Generate docker image tags
-        id: metadata
-        uses: docker/metadata-action@v5
-        with:
-          flavor: |
-            # Disable latest tag
-            latest=false
-          images: |
-            name=ghcr.io/${{ github.repository_owner }}/${{env.image}}
-            name=altran1502/${{env.image}},enable=${{ github.event_name == 'release' }}
-          tags: |
-            # Tag with branch name
-            type=ref,event=branch,suffix=${{ matrix.suffix }}
-            # Tag with pr-number
-            type=ref,event=pr,suffix=${{ matrix.suffix }}
-            # Tag with git tag on release
-            type=ref,event=tag,suffix=${{ matrix.suffix }}
-            type=raw,value=release,enable=${{ github.event_name == 'release' }},suffix=${{ matrix.suffix }}
-
-      - name: Determine build cache output
-        id: cache-target
+      - name: Generate cache key suffix
         run: |
           if [[ "${{ github.event_name }}" == "pull_request" ]]; then
-            # Essentially just ignore the cache output (PR can't write to registry cache)
+            echo "CACHE_KEY_SUFFIX=pr-${{ github.event.number }}" >> $GITHUB_ENV
+          else
+            echo "CACHE_KEY_SUFFIX=$(echo ${{ github.ref_name }} | sed 's/[^a-zA-Z0-9]/-/g')" >> $GITHUB_ENV
+          fi
+
+      - name: Generate cache target
+        id: cache-target
+        run: |
+          if [[ "${{ github.event.pull_request.head.repo.fork }}" == "true" ]]; then
+            # Essentially just ignore the cache output (forks can't write to registry cache)
             echo "cache-to=type=local,dest=/tmp/discard,ignore-error=true" >> $GITHUB_OUTPUT
           else
-            echo "cache-to=type=registry,mode=max,ref=ghcr.io/${{ github.repository_owner }}/immich-build-cache:${{ env.image }}" >> $GITHUB_OUTPUT
+            echo "cache-to=type=registry,ref=${{ env.GHCR_REPO }}-build-cache:${{ env.PLATFORM_PAIR }}-${{ matrix.device }}-${{ env.CACHE_KEY_SUFFIX }},mode=max,compression=zstd" >> $GITHUB_OUTPUT
           fi
 
       - name: Build and push image
-        uses: docker/build-push-action@v6.10.0
+        id: build
+        uses: docker/build-push-action@v6.13.0
         with:
           context: ${{ env.context }}
           file: ${{ env.file }}
-          platforms: ${{ matrix.platforms }}
-          # Skip pushing when PR from a fork
-          push: ${{ !github.event.pull_request.head.repo.fork }}
-          cache-from: type=registry,ref=ghcr.io/${{ github.repository_owner }}/immich-build-cache:${{env.image}}
-          cache-to: ${{ steps.cache-target.outputs.cache-to }}
-          tags: ${{ steps.metadata.outputs.tags }}
+          platforms: ${{ matrix.platform }}
           labels: ${{ steps.metadata.outputs.labels }}
+          cache-to: ${{ steps.cache-target.outputs.cache-to }}
+          cache-from: |
+            type=registry,ref=${{ env.GHCR_REPO }}-build-cache:${{ env.PLATFORM_PAIR }}-${{ env.CACHE_KEY_SUFFIX }}
+            type=registry,ref=${{ env.GHCR_REPO }}-build-cache:${{ env.PLATFORM_PAIR }}-main
+          outputs: type=image,"name=${{ env.GHCR_REPO }}",push-by-digest=true,name-canonical=true,push=${{ !github.event.pull_request.head.repo.fork }}
           build-args: |
-            DEVICE=${{ matrix.device }}
+            DEVICE=cpu
             BUILD_ID=${{ github.run_id }}
             BUILD_IMAGE=${{ github.event_name == 'release' && github.ref_name || steps.metadata.outputs.tags }}
             BUILD_SOURCE_REF=${{ github.ref_name }}
             BUILD_SOURCE_COMMIT=${{ github.sha }}
 
+      - name: Export digest
+        run: |
+          mkdir -p ${{ runner.temp }}/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "${{ runner.temp }}/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v4
+        with:
+          name: server-digests-${{ env.PLATFORM_PAIR }}
+          path: ${{ runner.temp }}/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge_server:
+    name: Merge & Push Server
+    runs-on: ubuntu-latest
+    if: ${{ needs.pre-job.outputs.should_run_server == 'true' && !github.event.pull_request.head.repo.fork }}
+    env:
+      GHCR_REPO: ghcr.io/${{ github.repository_owner }}/immich-server
+      DOCKER_REPO: altran1502/immich-server
+    needs:
+      - build_and_push_server
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v4
+        with:
+          path: ${{ runner.temp }}/digests
+          pattern: server-digests-*
+          merge-multiple: true
+
+      - name: Login to Docker Hub
+        if: ${{ github.event_name == 'release' }}
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Generate docker image tags
+        id: meta
+        uses: docker/metadata-action@v5
+        env:
+          DOCKER_METADATA_PR_HEAD_SHA: "true"
+        with:
+          flavor: |
+            # Disable latest tag
+            latest=false
+          images: |
+            name=${{ env.GHCR_REPO }}
+            name=${{ env.DOCKER_REPO }},enable=${{ github.event_name == 'release' }}
+          tags: |
+            # Tag with branch name
+            type=ref,event=branch,suffix=${{ matrix.suffix }}
+            # Tag with pr-number
+            type=ref,event=pr,suffix=${{ matrix.suffix }}
+            # Tag with long commit sha hash
+            type=sha,format=long,prefix=commit-,suffix=${{ matrix.suffix }}
+            # Tag with git tag on release
+            type=ref,event=tag,suffix=${{ matrix.suffix }}
+            type=raw,value=release,enable=${{ github.event_name == 'release' }},suffix=${{ matrix.suffix }}
+
+      - name: Create manifest list and push
+        working-directory: ${{ runner.temp }}/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ env.GHCR_REPO }}@sha256:%s ' *)
+
   success-check-server:
     name: Docker Build & Push Server Success
-    needs: [build_and_push_server, retag_server]
+    needs: [merge_server, retag_server]
     runs-on: ubuntu-latest
     if: always()
     steps:
@@ -298,7 +444,7 @@ jobs:
 
   success-check-ml:
     name: Docker Build & Push ML Success
-    needs: [build_and_push_ml, retag_ml]
+    needs: [merge_ml, retag_ml]
     runs-on: ubuntu-latest
     if: always()
     steps:

.github/workflows/docs-build.yml

@@ -15,7 +15,7 @@ jobs:
   pre-job:
     runs-on: ubuntu-latest
     outputs:
-      should_run: ${{ steps.found_paths.outputs.docs == 'true' || steps.should_force.outputs.should_force == 'true' }}
+      should_run: ${{ steps.found_paths.outputs.docs == 'true' ||  steps.should_force.outputs.should_force == 'true' }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -25,9 +25,11 @@ jobs:
           filters: |
             docs:
               - 'docs/**'
+            workflow:
+              - '.github/workflows/docs-build.yml'
       - name: Check if we should force jobs to run
         id: should_force
-        run: echo "should_force=${{ github.event_name == 'release' || github.ref_name == 'main' }}" >> "$GITHUB_OUTPUT"
+        run: echo "should_force=${{ steps.found_paths.outputs.workflow == 'true' || github.event_name == 'release' || github.ref_name == 'main' }}" >> "$GITHUB_OUTPUT"
 
   build:
     name: Docs Build

.github/workflows/prepare-release.yml

@@ -68,10 +68,17 @@ jobs:
     needs: build_mobile
 
     steps:
+      - name: Generate a token
+        id: generate-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
+          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
+      
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          token: ${{ secrets.ORG_RELEASE_TOKEN }}
+          token: ${{ steps.generate-token.outputs.token }}
 
       - name: Download APK
         uses: actions/download-artifact@v4

.github/workflows/preview-label.yaml

@@ -0,0 +1,33 @@
+name: Preview label
+
+on:
+  pull_request:
+    types: [labeled]
+
+jobs:
+  comment-status:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.action == 'labeled' && github.event.label.name == 'preview' }}
+    permissions:
+      pull-requests: write
+    steps:
+      - uses: mshick/add-pr-comment@v2
+        with:
+          message-id: "preview-status"
+          message: "Deploying preview environment to https://pr-${{ github.event.pull_request.number }}.preview.internal.immich.cloud/"
+
+  remove-label:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.action == 'closed' && contains(github.event.pull_request.labels.*.name, 'preview') }}
+    permissions:
+      pull-requests: write
+    steps:
+      - uses: actions/github-script@v7
+        with:
+          script: |
+            github.rest.issues.removeLabel({
+              issue_number: context.payload.pull_request.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              name: 'preview'
+            })

.github/workflows/static_analysis.yml

@@ -23,9 +23,11 @@ jobs:
           filters: |
             mobile:
               - 'mobile/**'
+            workflow:
+              - '.github/workflows/static_analysis.yml'
       - name: Check if we should force jobs to run
         id: should_force
-        run: echo "should_force=${{ github.event_name == 'release' }}" >> "$GITHUB_OUTPUT"
+        run: echo "should_force=${{ steps.found_paths.outputs.workflow == 'true' || github.event_name == 'release' }}" >> "$GITHUB_OUTPUT"
 
   mobile-dart-analyze:
     name: Run Dart Code Analysis

.github/workflows/test.yml

@@ -43,10 +43,12 @@ jobs:
               - 'mobile/**'
             machine-learning:
               - 'machine-learning/**'
+            workflow:
+              - '.github/workflows/test.yml'
 
       - name: Check if we should force jobs to run
         id: should_force
-        run: echo "should_force=${{ github.event_name == 'workflow_dispatch' }}" >> "$GITHUB_OUTPUT"
+        run: echo "should_force=${{ steps.found_paths.outputs.workflow == 'true' || github.event_name == 'workflow_dispatch' }}" >> "$GITHUB_OUTPUT"
 
   server-unit-tests:
     name: Test & Lint Server
@@ -244,25 +246,30 @@ jobs:
         run: npm run check
         if: ${{ !cancelled() }}
 
-  medium-tests-server:
+  server-medium-tests:
     name: Medium Tests (Server)
     needs: pre-job
     if: ${{ needs.pre-job.outputs.should_run_server == 'true' }}
-    runs-on: mich
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./server
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-        with:
-          submodules: 'recursive'
 
-      - name: Production build
-        if: ${{ !cancelled() }}
-        run: docker compose -f e2e/docker-compose.yml build
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: './server/.nvmrc'
+
+      - name: Run npm install
+        run: npm ci
 
       - name: Run medium tests
+        run: npm run test:medium
         if: ${{ !cancelled() }}
-        run: make test-medium
 
   e2e-tests-server-cli:
     name: End-to-End Tests (Server & CLI)
@@ -502,6 +509,7 @@ jobs:
         run: |
           echo "ERROR: Generated migration files not up to date!"
           echo "Changed files: ${{ steps.verify-changed-files.outputs.changed_files }}"
+          cat ./src/migrations/*-TestMigration.ts
           exit 1
 
       - name: Run SQL generation

README.md

@@ -29,6 +29,7 @@
   <a href="readme_i18n/README_nl_NL.md">Nederlands</a>
   <a href="readme_i18n/README_tr_TR.md">Türkçe</a>
   <a href="readme_i18n/README_zh_CN.md">中文</a>
+  <a href="readme_i18n/README_uk_UA.md">Українська</a>
   <a href="readme_i18n/README_ru_RU.md">Русский</a>
   <a href="readme_i18n/README_pt_BR.md">Português Brasileiro</a>
   <a href="readme_i18n/README_sv_SE.md">Svenska</a>

cli/.nvmrc

@@ -1 +1 @@
-22.12.0
+22.14.0

cli/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:22.12.0-alpine3.20@sha256:96cc8323e25c8cc6ddcb8b965e135cfd57846e8003ec0d7bcec16c5fd5f6d39f AS core
+FROM node:22.13.1-alpine3.20@sha256:c52e20859a92b3eccbd3a36c5e1a90adc20617d8d421d65e8a622e87b5dac963 AS core
 
 WORKDIR /usr/src/open-api/typescript-sdk
 COPY open-api/typescript-sdk/package*.json open-api/typescript-sdk/tsconfig*.json ./

cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@immich/cli",
-  "version": "2.2.37",
+  "version": "2.2.51",
   "description": "Command Line Interface (CLI) for Immich",
   "type": "module",
   "exports": "./dist/index.js",
@@ -20,15 +20,15 @@
     "@types/cli-progress": "^3.11.0",
     "@types/lodash-es": "^4.17.12",
     "@types/mock-fs": "^4.13.1",
-    "@types/node": "^22.10.2",
+    "@types/node": "^22.13.4",
     "@typescript-eslint/eslint-plugin": "^8.15.0",
     "@typescript-eslint/parser": "^8.15.0",
-    "@vitest/coverage-v8": "^2.0.5",
+    "@vitest/coverage-v8": "^3.0.0",
     "byte-size": "^9.0.0",
     "cli-progress": "^3.12.0",
     "commander": "^12.0.0",
     "eslint": "^9.14.0",
-    "eslint-config-prettier": "^9.1.0",
+    "eslint-config-prettier": "^10.0.0",
     "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-unicorn": "^56.0.1",
     "globals": "^15.9.0",
@@ -36,9 +36,9 @@
     "prettier": "^3.2.5",
     "prettier-plugin-organize-imports": "^4.0.0",
     "typescript": "^5.3.3",
-    "vite": "^5.0.12",
+    "vite": "^6.0.0",
     "vite-tsconfig-paths": "^5.0.0",
-    "vitest": "^2.0.5",
+    "vitest": "^3.0.0",
     "vitest-fetch-mock": "^0.4.0",
     "yaml": "^2.3.1"
   },
@@ -67,6 +67,6 @@
     "lodash-es": "^4.17.21"
   },
   "volta": {
-    "node": "22.12.0"
+    "node": "22.14.0"
   }
 }

cli/src/utils.spec.ts

@@ -6,6 +6,7 @@ interface Test {
   test: string;
   options: Omit<CrawlOptions, 'extensions'>;
   files: Record<string, boolean>;
+  skipOnWin32?: boolean;
 }
 
 const cwd = process.cwd();
@@ -48,6 +49,18 @@ const tests: Test[] = [
       '/photos/image.jpg': true,
     },
   },
+  {
+    test: 'should crawl folders with quotes',
+    options: {
+      pathsToCrawl: ["/photo's/", '/photo"s/', '/photo`s/'],
+    },
+    files: {
+      "/photo's/image1.jpg": true,
+      '/photo"s/image2.jpg': true,
+      '/photo`s/image3.jpg': true,
+    },
+    skipOnWin32: true, // single quote interferes with mockfs root on Windows
+  },
   {
     test: 'should crawl a single file',
     options: {
@@ -270,8 +283,12 @@ describe('crawl', () => {
   });
 
   describe('crawl', () => {
-    for (const { test, options, files } of tests) {
-      it(test, async () => {
+    for (const { test: name, options, files, skipOnWin32 } of tests) {
+      if (process.platform === 'win32' && skipOnWin32) {
+        test.skip(name);
+        continue;
+      }
+      it(name, async () => {
         // The file contents is the same as the path.
         mockfs(Object.fromEntries(Object.keys(files).map((file) => [file, file])));
 

cli/src/utils.ts

@@ -146,7 +146,7 @@ export const crawl = async (options: CrawlOptions): Promise<string[]> => {
   }
 
   const searchPatterns = patterns.map((pattern) => {
-    let escapedPattern = pattern;
+    let escapedPattern = pattern.replaceAll("'", "[']").replaceAll('"', '["]').replaceAll('`', '[`]');
     if (recursive) {
       escapedPattern = escapedPattern + '/**';
     }

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

@@ -2,37 +2,37 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.opentofu.org/cloudflare/cloudflare" {
-  version     = "4.48.0"
-  constraints = "4.48.0"
+  version     = "4.52.0"
+  constraints = "4.52.0"
   hashes = [
-    "h1:0IKUOR32xEI1suS5QCOjfxjQ2mRd058btXk8hVnaOJ4=",
-    "h1:3YG6vu/bFPcYOeLdSUZhiAWiWKaFlOAR34z2o8cbE9k=",
-    "h1:FvGy06/i9AMtVkSIUnCrXNv5xF6jqBqMH8oPVLyeeAg=",
-    "h1:GXH7nIF0ocMqebbA41+fSGIYfM+VAM/PvTe7fJr8UrQ=",
-    "h1:H0ll0ph4404vFE868W3qJ3zhOyy4jbXrOMtdkViEZsU=",
-    "h1:SX42e3k73IcFcrQlZ2e/Veqt2tvCMy6fwlo5yNUktCE=",
-    "h1:Uu/gjBc99GefdPdSrlBwU75DWU0ZcwGcrd3ZFyTeL0s=",
-    "h1:VZw0uN41PWRmNlhg7Ze0Eh7cdoklX1oZbfNAXNYnU1I=",
-    "h1:cMdV7ql6PsFa4qtb0EoZSctvTaTqV7yplBSDwcLRCLc=",
-    "h1:ePGvSurmlqOCkD761vkhRmz7bsK36/EnIvx2Xy8TdXo=",
-    "h1:fOYufF+1bzw2N3aHLpkLB6E8VbZ4ysXDODYQOlwhwd4=",
-    "h1:qe8RbnWq0T4xhqjn9QcbO6YW5YDx47P+eJ0NUMIfwCc=",
-    "h1:tRD2av6PafHDP/b9jDQsG5/aX+lHeKxpbIEHYYLBVUc=",
-    "h1:zyl6Gvx/CFpwYW8pFFDesfO8Lxv+a6CopyAsIMhp54s=",
-    "zh:04c0a49c2b23140b2f21cfd0d52f9798d70d3bdae3831613e156aabe519bbc6c",
-    "zh:185f21b4834ba63e8df1f84aa34639d8a7e126429a4007bb5f9ad82f2602a997",
-    "zh:234724f52cb4c0c3f7313d3b2697caef26d921d134f26ae14801e7afac522f7b",
-    "zh:38a56fcd1b3e40706af995611c977816543b53f1e55fe2720944aae2b6828fcb",
-    "zh:419938f5430fc78eff933470aefbf94a460a478f867cf7761a3dea177b4eb153",
-    "zh:4b46d92bfde1deab7de7ba1a6bbf4ba7c711e4fd925341ddf09d4cc28dae03d8",
-    "zh:537acd4a31c752f1bae305ba7190f60b71ad1a459f22d464f3f914336c9e919f",
-    "zh:5ff36b005aad07697dd0b30d4f0c35dbcdc30dc52b41722552060792fa87ce04",
-    "zh:635c5ee419daea098060f794d9d7d999275301181e49562c4e4c08f043076937",
-    "zh:859277c330d61f91abe9e799389467ca11b77131bf34bedbef52f8da68b2bb49",
+    "h1:2BEJyXJtYC4B4nda/WCYUmuJYDaYk88F8t1pwPzr0iQ=",
+    "h1:4IASk5SESeWKQ7JU0+M7KApuF5mZyklvwMXPBabim3c=",
+    "h1:5ImZxxALSnWfH/4EXw/wFirSmk5Tr0ACmcysy51AafE=",
+    "h1:6TJ3dxLSin4ZKBJLsZDn95H2ZYnGm8S7GGHvvXuuMQU=",
+    "h1:IzTUjg9kQ4N3qizP9CjYLeHwjsuGgtxwXvfUQWyOLcA=",
+    "h1:NTaOQfYINA0YTG/V1/9+SYtgX1it63+cBugj4WK4FWc=",
+    "h1:PXH48LuJn329sCfMXprdMDk51EZaWFyajVvS03qhQLs=",
+    "h1:Pi5M+GeoMSN2eJ6QnIeXjBf19O+rby/74CfB2ocpv20=",
+    "h1:ShXZ2ZjBvm3thfoPPzPT8+OhyismnydQVkUAfI8X12w=",
+    "h1:WQ9hu0Wge2msBbODfottCSKgu8oKUrw4Opz+fDPVVHk=",
+    "h1:Z5yXML2DE0uH9UU+M0ut9JMQAORcwVZz1CxBHzeBmao=",
+    "h1:jqI2qKknpleS3JDSplyGYHMu0u9K/tor1ZOjFwDgEMk=",
+    "h1:kgfutDh14Q5nw4eg6qGFamFxIiY8Ae0FPKRBLDOzpcI=",
+    "h1:zCAO7GZmfYhWb+i6TfqlqhMeDyPZWGio2IzEzAh3YTs=",
+    "zh:19be1a91c982b902c42aba47766860dfa5dc151eed1e95fd39ca642229381ef0",
+    "zh:1de451c4d1ecf7efbe67b6dace3426ba810711afdd644b0f1b870364c8ae91f8",
+    "zh:352b4a2120173298622e669258744554339d959ac3a95607b117a48ee4a83238",
+    "zh:3c6f1346d9154afbd2d558fabb4b0150fc8d559aa961254144fe1bc17fe6032f",
+    "zh:4c4c92d53fb535b1e0eff26f222bbd627b97d3b4c891ec9c321268676d06152f",
+    "zh:53276f68006c9ceb7cdb10a6ccf91a5c1eadd1407a28edb5741e84e88d7e29e8",
+    "zh:7925a97773948171a63d4f65bb81ee92fd6d07a447e36012977313293a5435c9",
+    "zh:7dfb0a4496cfe032437386d0a2cd9229a1956e9c30bd920923c141b0f0440060",
     "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f",
-    "zh:927dfdb8d9aef37ead03fceaa29e87ba076a3dd24e19b6cefdbb0efe9987ff8c",
-    "zh:bbf2226f07f6b1e721877328e69ded4b64f9c196634d2e2429e3cfabbe41e532",
-    "zh:daeed873d6f38604232b46ee4a5830c85d195b967f8dbcafe2fcffa98daf9c5f",
-    "zh:f8f2fc4646c1ba44085612fa7f4dbb7cbcead43b4e661f2b98ddfb4f68afc758",
+    "zh:8d4aa79f0a414bb4163d771063c70cd991c8fac6c766e685bac2ee12903c5bd6",
+    "zh:a67540c13565616a7e7e51ee9366e88b0dc60046e1d75c72680e150bd02725bb",
+    "zh:a936383a4767f5393f38f622e92bf2d0c03fe04b69c284951f27345766c7b31b",
+    "zh:d4887d73c466ff036eecf50ad6404ba38fd82ea4855296b1846d244b0f13c380",
+    "zh:e9093c8bd5b6cd99c81666e315197791781b8f93afa14fc2e0f732d1bb2a44b7",
+    "zh:efd3b3f1ec59a37f635aa1d4efcf178734c2fcf8ddb0d56ea690bec342da8672",
   ]
 }

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

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

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

@@ -2,37 +2,37 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.opentofu.org/cloudflare/cloudflare" {
-  version     = "4.48.0"
-  constraints = "4.48.0"
+  version     = "4.52.0"
+  constraints = "4.52.0"
   hashes = [
-    "h1:0IKUOR32xEI1suS5QCOjfxjQ2mRd058btXk8hVnaOJ4=",
-    "h1:3YG6vu/bFPcYOeLdSUZhiAWiWKaFlOAR34z2o8cbE9k=",
-    "h1:FvGy06/i9AMtVkSIUnCrXNv5xF6jqBqMH8oPVLyeeAg=",
-    "h1:GXH7nIF0ocMqebbA41+fSGIYfM+VAM/PvTe7fJr8UrQ=",
-    "h1:H0ll0ph4404vFE868W3qJ3zhOyy4jbXrOMtdkViEZsU=",
-    "h1:SX42e3k73IcFcrQlZ2e/Veqt2tvCMy6fwlo5yNUktCE=",
-    "h1:Uu/gjBc99GefdPdSrlBwU75DWU0ZcwGcrd3ZFyTeL0s=",
-    "h1:VZw0uN41PWRmNlhg7Ze0Eh7cdoklX1oZbfNAXNYnU1I=",
-    "h1:cMdV7ql6PsFa4qtb0EoZSctvTaTqV7yplBSDwcLRCLc=",
-    "h1:ePGvSurmlqOCkD761vkhRmz7bsK36/EnIvx2Xy8TdXo=",
-    "h1:fOYufF+1bzw2N3aHLpkLB6E8VbZ4ysXDODYQOlwhwd4=",
-    "h1:qe8RbnWq0T4xhqjn9QcbO6YW5YDx47P+eJ0NUMIfwCc=",
-    "h1:tRD2av6PafHDP/b9jDQsG5/aX+lHeKxpbIEHYYLBVUc=",
-    "h1:zyl6Gvx/CFpwYW8pFFDesfO8Lxv+a6CopyAsIMhp54s=",
-    "zh:04c0a49c2b23140b2f21cfd0d52f9798d70d3bdae3831613e156aabe519bbc6c",
-    "zh:185f21b4834ba63e8df1f84aa34639d8a7e126429a4007bb5f9ad82f2602a997",
-    "zh:234724f52cb4c0c3f7313d3b2697caef26d921d134f26ae14801e7afac522f7b",
-    "zh:38a56fcd1b3e40706af995611c977816543b53f1e55fe2720944aae2b6828fcb",
-    "zh:419938f5430fc78eff933470aefbf94a460a478f867cf7761a3dea177b4eb153",
-    "zh:4b46d92bfde1deab7de7ba1a6bbf4ba7c711e4fd925341ddf09d4cc28dae03d8",
-    "zh:537acd4a31c752f1bae305ba7190f60b71ad1a459f22d464f3f914336c9e919f",
-    "zh:5ff36b005aad07697dd0b30d4f0c35dbcdc30dc52b41722552060792fa87ce04",
-    "zh:635c5ee419daea098060f794d9d7d999275301181e49562c4e4c08f043076937",
-    "zh:859277c330d61f91abe9e799389467ca11b77131bf34bedbef52f8da68b2bb49",
+    "h1:2BEJyXJtYC4B4nda/WCYUmuJYDaYk88F8t1pwPzr0iQ=",
+    "h1:4IASk5SESeWKQ7JU0+M7KApuF5mZyklvwMXPBabim3c=",
+    "h1:5ImZxxALSnWfH/4EXw/wFirSmk5Tr0ACmcysy51AafE=",
+    "h1:6TJ3dxLSin4ZKBJLsZDn95H2ZYnGm8S7GGHvvXuuMQU=",
+    "h1:IzTUjg9kQ4N3qizP9CjYLeHwjsuGgtxwXvfUQWyOLcA=",
+    "h1:NTaOQfYINA0YTG/V1/9+SYtgX1it63+cBugj4WK4FWc=",
+    "h1:PXH48LuJn329sCfMXprdMDk51EZaWFyajVvS03qhQLs=",
+    "h1:Pi5M+GeoMSN2eJ6QnIeXjBf19O+rby/74CfB2ocpv20=",
+    "h1:ShXZ2ZjBvm3thfoPPzPT8+OhyismnydQVkUAfI8X12w=",
+    "h1:WQ9hu0Wge2msBbODfottCSKgu8oKUrw4Opz+fDPVVHk=",
+    "h1:Z5yXML2DE0uH9UU+M0ut9JMQAORcwVZz1CxBHzeBmao=",
+    "h1:jqI2qKknpleS3JDSplyGYHMu0u9K/tor1ZOjFwDgEMk=",
+    "h1:kgfutDh14Q5nw4eg6qGFamFxIiY8Ae0FPKRBLDOzpcI=",
+    "h1:zCAO7GZmfYhWb+i6TfqlqhMeDyPZWGio2IzEzAh3YTs=",
+    "zh:19be1a91c982b902c42aba47766860dfa5dc151eed1e95fd39ca642229381ef0",
+    "zh:1de451c4d1ecf7efbe67b6dace3426ba810711afdd644b0f1b870364c8ae91f8",
+    "zh:352b4a2120173298622e669258744554339d959ac3a95607b117a48ee4a83238",
+    "zh:3c6f1346d9154afbd2d558fabb4b0150fc8d559aa961254144fe1bc17fe6032f",
+    "zh:4c4c92d53fb535b1e0eff26f222bbd627b97d3b4c891ec9c321268676d06152f",
+    "zh:53276f68006c9ceb7cdb10a6ccf91a5c1eadd1407a28edb5741e84e88d7e29e8",
+    "zh:7925a97773948171a63d4f65bb81ee92fd6d07a447e36012977313293a5435c9",
+    "zh:7dfb0a4496cfe032437386d0a2cd9229a1956e9c30bd920923c141b0f0440060",
     "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f",
-    "zh:927dfdb8d9aef37ead03fceaa29e87ba076a3dd24e19b6cefdbb0efe9987ff8c",
-    "zh:bbf2226f07f6b1e721877328e69ded4b64f9c196634d2e2429e3cfabbe41e532",
-    "zh:daeed873d6f38604232b46ee4a5830c85d195b967f8dbcafe2fcffa98daf9c5f",
-    "zh:f8f2fc4646c1ba44085612fa7f4dbb7cbcead43b4e661f2b98ddfb4f68afc758",
+    "zh:8d4aa79f0a414bb4163d771063c70cd991c8fac6c766e685bac2ee12903c5bd6",
+    "zh:a67540c13565616a7e7e51ee9366e88b0dc60046e1d75c72680e150bd02725bb",
+    "zh:a936383a4767f5393f38f622e92bf2d0c03fe04b69c284951f27345766c7b31b",
+    "zh:d4887d73c466ff036eecf50ad6404ba38fd82ea4855296b1846d244b0f13c380",
+    "zh:e9093c8bd5b6cd99c81666e315197791781b8f93afa14fc2e0f732d1bb2a44b7",
+    "zh:efd3b3f1ec59a37f635aa1d4efcf178734c2fcf8ddb0d56ea690bec342da8672",
   ]
 }

deployment/modules/cloudflare/docs/config.tf

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

docker/docker-compose.dev.yml

@@ -1,4 +1,13 @@
-# See:
+#
+# WARNING: To install Immich, follow our guide: https://immich.app/docs/install/docker-compose
+#
+# Make sure to use the docker-compose.yml of the current release:
+#
+# https://github.com/immich-app/immich/releases/latest/download/docker-compose.yml
+#
+# The compose file on main may not be compatible with the latest release.
+
+# For development see:
 # - https://immich.app/docs/developer/setup
 # - https://immich.app/docs/developer/troubleshooting
 
@@ -71,6 +80,7 @@ services:
       - ../web:/usr/src/app
       - ../i18n:/usr/src/i18n
       - ../open-api/:/usr/src/open-api/
+      # - ../../ui:/usr/ui
       - /usr/src/app/node_modules
     ulimits:
       nofile:
@@ -106,7 +116,7 @@ services:
 
   redis:
     container_name: immich_redis
-    image: redis:6.2-alpine@sha256:eaba718fecd1196d88533de7ba49bf903ad33664a92debb24660a922ecd9cac8
+    image: redis:6.2-alpine@sha256:148bb5411c184abd288d9aaed139c98123eeb8824c5d3fce03cf721db58066d8
     healthcheck:
       test: redis-cli ping || exit 1
 

docker/docker-compose.prod.yml

@@ -1,3 +1,12 @@
+#
+# WARNING: To install Immich, follow our guide: https://immich.app/docs/install/docker-compose
+#
+# Make sure to use the docker-compose.yml of the current release:
+#
+# https://github.com/immich-app/immich/releases/latest/download/docker-compose.yml
+#
+# The compose file on main may not be compatible with the latest release.
+
 name: immich-prod
 
 services:
@@ -47,7 +56,7 @@ services:
 
   redis:
     container_name: immich_redis
-    image: redis:6.2-alpine@sha256:eaba718fecd1196d88533de7ba49bf903ad33664a92debb24660a922ecd9cac8
+    image: redis:6.2-alpine@sha256:148bb5411c184abd288d9aaed139c98123eeb8824c5d3fce03cf721db58066d8
     healthcheck:
       test: redis-cli ping || exit 1
     restart: always
@@ -91,7 +100,7 @@ services:
     container_name: immich_prometheus
     ports:
       - 9090:9090
-    image: prom/prometheus@sha256:565ee86501224ebbb98fc10b332fa54440b100469924003359edf49cbce374bd
+    image: prom/prometheus@sha256:5888c188cf09e3f7eebc97369c3b2ce713e844cdbd88ccf36f5047c958aea120
     volumes:
       - ./prometheus.yml:/etc/prometheus/prometheus.yml
       - prometheus-data:/prometheus
@@ -103,7 +112,7 @@ services:
     command: ['./run.sh', '-disable-reporting']
     ports:
       - 3000:3000
-    image: grafana/grafana:11.4.0-ubuntu@sha256:afccec22ba0e4815cca1d2bf3836e414322390dc78d77f1851976ffa8d61051c
+    image: grafana/grafana:11.5.1-ubuntu@sha256:9a4ab78cec1a2ec7d1ca5dfd5aacec6412706a1bc9e971fc7184e2f6696a63f5
     volumes:
       - grafana-data:/var/lib/grafana
 

docker/docker-compose.yml

@@ -1,10 +1,11 @@
 #
-# WARNING: Make sure to use the docker-compose.yml of the current release:
+# WARNING: To install Immich, follow our guide: https://immich.app/docs/install/docker-compose
+#
+# Make sure to use the docker-compose.yml of the current release:
 #
 # https://github.com/immich-app/immich/releases/latest/download/docker-compose.yml
 #
 # The compose file on main may not be compatible with the latest release.
-#
 
 name: immich
 
@@ -48,7 +49,7 @@ services:
 
   redis:
     container_name: immich_redis
-    image: docker.io/redis:6.2-alpine@sha256:eaba718fecd1196d88533de7ba49bf903ad33664a92debb24660a922ecd9cac8
+    image: docker.io/redis:6.2-alpine@sha256:148bb5411c184abd288d9aaed139c98123eeb8824c5d3fce03cf721db58066d8
     healthcheck:
       test: redis-cli ping || exit 1
     restart: always

docker/hwaccel.transcoding.yml

@@ -48,6 +48,7 @@ services:
   vaapi-wsl: # use this for VAAPI if you're running Immich in WSL2
     devices:
       - /dev/dri:/dev/dri
+      - /dev/dxg:/dev/dxg
     volumes:
       - /usr/lib/wsl:/usr/lib/wsl
     environment:

docs/.nvmrc

@@ -1 +1 @@
-22.12.0
+22.14.0

docs/docs/FAQ.mdx

@@ -49,13 +49,22 @@ The behaviors differ based on your device manufacturer and operating system, but
 On iOS (iPhone and iPad), the operating system determines if a particular app can invoke background tasks based on multiple factors, most of which the Immich app has no control over. To increase the likelihood that the background backup task is run, follow the steps below:
 
 - Enable Background App Refresh for Immich in the iOS settings at `Settings > General > Background App Refresh`.
+- Disable **Low Power Mode** when not needed, as this can prevent apps from running in the background.
 - Disable Background App Refresh for apps that don't need background tasks to run. This will reduce the competition for background task invocation for Immich.
 - Use the Immich app more often.
 
-### Why are features not working with a self-signed cert or mTLS?
+### Why are features in the mobile app not working with a self-signed certificate, Basic Auth, custom headers, or mutual TLS?
 
-Due to limitations in the upstream app/video library, using a self-signed TLS certificate or mutual TLS may break video playback or asset upload (both foreground and/or background).
-We recommend using a real SSL certificate from a free provider, for example [Let's Encrypt](https://letsencrypt.org/).
+These network features are experimental. They often do not work with video playback, asset upload or download, and other features.
+Many of these limitations are tracked in [#15230](https://github.com/immich-app/immich/issues/15230).
+Instead of these experimental features, we recommend using the URL switching feature, a VPN, or a [free trusted SSL certificate](https://letsencrypt.org/) for your domain.
+
+We are not actively developing these features and will not be able to provide support, but welcome contributions to improve them.
+Please discuss any large PRs with our dev team to ensure your time is not wasted.
+
+### Why isn't the mobile app updated yet?
+
+The app stores can take a few days to approve new builds of the app. If you're impatient, android APKs can be downloaded from the GitHub releases.
 
 ---
 
@@ -88,7 +97,7 @@ Make sure to [set your reverse proxy](/docs/administration/reverse-proxy/) to al
 Also, check the disk space of your reverse proxy.
 In some cases, proxies cache requests to disk before passing them on, and if disk space runs out, the request fails.
 
-If you are using Cloudflare Tunnel, please know that they set a maxiumum filesize of 100 MB that cannot be changed.
+If you are using Cloudflare Tunnel, please know that they set a maximum filesize of 100 MB that cannot be changed.
 At times, files larger than this may work, potentially up to 1 GB. However, the official limit is 100 MB.
 If you are having issues, we recommend switching to a different network deployment.
 
@@ -155,6 +164,35 @@ For example, say you have existing transcodes with the policy "Videos higher tha
 
 No. Our design principle is that the original assets should always be untouched.
 
+### How can I mount a CIFS/Samba volume within Docker?
+
+If you aren't able to or prefer not to mount Samba on the host (such as Windows environment), you can mount the volume within Docker.
+Below is an example in the `docker-compose.yml`.
+
+Change your username, password, local IP, and share name, and see below where the line `- originals:/usr/src/app/originals`,
+correlates to the section where the volume `originals` was created. You can call this whatever you like, and map it to the docker container as you like.
+For example you could change `originals:` to `Photos:`, and change `- originals:/usr/src/app/originals` to `Photos:/usr/src/app/photos`.
+
+```diff
+...
+services:
+  immich-server:
+...
+    volumes:
+      # Do not edit the next line. If you want to change the media storage location on your system, edit the value of UPLOAD_LOCATION in the .env file
+      - ${UPLOAD_LOCATION}:/usr/src/app/upload
+      - /etc/localtime:/etc/localtime:ro
++     - originals:/usr/src/app/originals
+...
+volumes:
+  model-cache:
++ originals:
++   driver_opts:
++     type: cifs
++     o: 'iocharset=utf8,username=USERNAMEHERE,password=PASSWORDHERE,rw' # change to `ro` if read only desired
++     device: '//localipaddress/sharename'
+```
+
 ---
 
 ## Albums
@@ -277,7 +315,7 @@ The initial backup is the most intensive due to the number of jobs running. The
   - For facial recognition on new images to work properly, You must re-run the Face Detection job for all images after this.
 - At the container level, you can [set resource constraints](/docs/FAQ#can-i-limit-cpu-and-ram-usage) to lower usage further.
   - It's recommended to only apply these constraints _after_ taking some of the measures here for best performance.
-- If these changes are not enough, see [below](/docs/FAQ#how-can-i-disable-machine-learning) for instructions on how to disable machine learning.
+- If these changes are not enough, see [above](/docs/FAQ#how-can-i-disable-machine-learning) for instructions on how to disable machine learning.
 
 ### Can I limit CPU and RAM usage?
 
@@ -420,7 +458,7 @@ A result of `on` means that checksums are enabled.
 <summary>Check if checksums are enabled</summary>
 
 ```bash
-docker exec -it immich_postgres psql --dbname=immich --username=<DB_USERNAME> --command="show data_checksums"
+docker exec -it immich_postgres psql --dbname=postgres --username=<DB_USERNAME> --command="show data_checksums"
  data_checksums
 ----------------
  on
@@ -435,7 +473,7 @@ If checksums are enabled, you can check the status of the database with the foll
 <summary>Check for database corruption</summary>
 
 ```bash
-docker exec -it immich_postgres psql --dbname=immich --username=<DB_USERNAME> --command="SELECT datname, checksum_failures, checksum_last_failure FROM pg_stat_database WHERE datname IS NOT NULL"
+docker exec -it immich_postgres psql --dbname=postgres --username=<DB_USERNAME> --command="SELECT datname, checksum_failures, checksum_last_failure FROM pg_stat_database WHERE datname IS NOT NULL"
   datname  | checksum_failures | checksum_last_failure
 -----------+-------------------+-----------------------
  postgres  |                 0 |
@@ -447,6 +485,24 @@ docker exec -it immich_postgres psql --dbname=immich --username=<DB_USERNAME> --
 
 </details>
 
+You can also scan the Postgres database file structure for errors:
+
+<details>
+<summary>Scan for file structure errors</summary>
+```bash
+docker exec -it immich_postgres pg_amcheck --username=postgres --heapallindexed --parent-check --rootdescend --progress --all --install-missing
+```
+
+A normal result will end something like this and return with an exit code of `0`:
+
+```bash
+7470/8832 relations (84%), 730829/734735 pages (99%)
+8425/8832 relations (95%), 734367/734735 pages (99%)
+8832/8832 relations (100%), 734735/734735 pages (100%)
+```
+
+</details>
+
 If corruption is detected, you should immediately make a backup before performing any other work in the database.
 To do so, you may need to set the `zero_damaged_pages=on` flag for the database server to allow `pg_dumpall` to succeed.
 After taking a backup, the recommended next step is to restore the database from a healthy backup before corruption was detected.

docs/docs/administration/backup-and-restore.md

@@ -55,7 +55,7 @@ sleep 10                        # Wait for Postgres server to start up
 # Check the database user if you deviated from the default
 gunzip < "/path/to/backup/dump.sql.gz" \
 | sed "s/SELECT pg_catalog.set_config('search_path', '', false);/SELECT pg_catalog.set_config('search_path', 'public, pg_catalog', true);/g" \
-| docker exec -i immich_postgres psql --username=postgres  # Restore Backup
+| docker exec -i immich_postgres psql --dbname=postgres --username=<DB_USERNAME>  # Restore Backup
 docker compose up -d            # Start remainder of Immich apps
 ```
 
@@ -70,18 +70,16 @@ docker compose up -d            # Start remainder of Immich apps
 docker compose down -v  # CAUTION! Deletes all Immich data to start from scratch
 ## Uncomment the next line and replace DB_DATA_LOCATION with your Postgres path to permanently reset the Postgres database
 # Remove-Item -Recurse -Force DB_DATA_LOCATION # CAUTION! Deletes all Immich data to start from scratch
-## You should mount the backup (as a volume, example: - 'C:\path\to\backup\dump.sql':/dump.sql) into the immich_postgres container using the docker-compose.yml
-docker compose pull             # Update to latest version of Immich (if desired)
-docker compose create           # Create Docker containers for Immich apps without running them
-docker start immich_postgres    # Start Postgres server
-sleep 10                        # Wait for Postgres server to start up
-docker exec -it immich_postgres bash    # Enter the Docker shell and run the following command
-# Check the database user if you deviated from the default
-cat "/dump.sql" \
-| sed "s/SELECT pg_catalog.set_config('search_path', '', false);/SELECT pg_catalog.set_config('search_path', 'public, pg_catalog', true);/g" \
-| psql --username=postgres      # Restore Backup
-exit                            # Exit the Docker shell
-docker compose up -d            # Start remainder of Immich apps
+## You should mount the backup (as a volume, example: `- 'C:\path\to\backup\dump.sql:/dump.sql'`) into the immich_postgres container using the docker-compose.yml
+docker compose pull                               # Update to latest version of Immich (if desired)
+docker compose create                             # Create Docker containers for Immich apps without running them
+docker start immich_postgres                      # Start Postgres server
+sleep 10                                          # Wait for Postgres server to start up
+docker exec -it immich_postgres bash              # Enter the Docker shell and run the following command
+# Check the database user if you deviated from the default. If your backup ends in `.gz`, replace `cat` with `gunzip`
+cat < "/dump.sql" | sed "s/SELECT pg_catalog.set_config('search_path', '', false);/SELECT pg_catalog.set_config('search_path', 'public, pg_catalog', true);/g" | psql --dbname=postgres --username=<DB_USERNAME>
+exit                                              # Exit the Docker shell
+docker compose up -d                              # Start remainder of Immich apps
 ```
 
 </TabItem>
@@ -95,12 +93,14 @@ Some deployment methods make it difficult to start the database without also sta
 
 ## Filesystem
 
-Immich stores two types of content in the filesystem: (1) original, unmodified assets (photos and videos), and (2) generated content. Only the original content needs to be backed-up, which is stored in the following folders:
+Immich stores two types of content in the filesystem: (a) original, unmodified assets (photos and videos), and (b) generated content. We recommend backing up the entire contents of `UPLOAD_LOCATION`, but only the original content is critical, which is stored in the following folders:
 
 1. `UPLOAD_LOCATION/library`
 2. `UPLOAD_LOCATION/upload`
 3. `UPLOAD_LOCATION/profile`
 
+If you choose to back up only those folders, you will need to rerun the transcoding and thumbnail generation jobs for all assets after you restore from a backup.
+
 :::caution
 If you moved some of these folders onto a different storage device, such as `profile/`, make sure to adjust the backup path to match your setup
 :::

docs/docs/administration/postgres-standalone.md

@@ -42,6 +42,10 @@ Typically Immich expects superuser permission in the database, which you can gra
 This method is recommended for **advanced users only** and often requires manual intervention when updating Immich.
 :::
 
+:::danger
+Currently, automated backups require superuser permission due to the usage of `pg_dumpall`.
+:::
+
 Immich can run without superuser permissions by following the below instructions at the `psql` prompt to prepare the database.
 
 ```sql title="Set up Postgres for Immich"
@@ -66,4 +70,4 @@ When installing a new version of pgvecto.rs, you will need to manually update th
 
 If you get the error `driverError: error: permission denied for view pg_vector_index_stat`, you can fix this by connecting to the Immich database and running `GRANT SELECT ON TABLE pg_vector_index_stat TO <immichdbusername>;`.
 
-[vectors-install]: https://docs.pgvecto.rs/getting-started/installation.html
+[vectors-install]: https://docs.vectorchord.ai/getting-started/installation.html

docs/docs/administration/system-settings.md

@@ -98,6 +98,14 @@ The default Immich log level is `Log` (commonly known as `Info`). The Immich adm
 Through this setting, you can manage all the settings related to machine learning in Immich, from the setting of remote machine learning to the model and its parameters
 You can choose to disable a certain type of machine learning, for example smart search or facial recognition.
 
+### URL
+
+The built in (`http://immich-machine-learning:3003`) machine learning server will be configured by default, but you can change this or add additional servers.
+
+Hosting the `immich-machine-learning` container on a machine with a more powerful GPU can be helpful to for processing a large number of photos (such as during batch import) or for faster search.
+
+If more than one URL is provided, each server will be attempted one-at-a-time until one responds successfully, in order from first to last. Servers that don't respond will be temporarily ignored until they come back online.
+
 ### Smart Search
 
 The [smart search](/docs/features/searching) settings allow you to change the [CLIP model](https://openai.com/research/clip). Larger models will typically provide [more accurate search results](https://github.com/immich-app/immich/discussions/11862) but consume more processing power and RAM. When [changing the CLIP model](/docs/FAQ#can-i-use-a-custom-clip-model) it is mandatory to re-run the Smart Search job on all images to fully apply the change.

docs/docs/developer/architecture.mdx

@@ -50,19 +50,18 @@ The Immich CLI is an [npm](https://www.npmjs.com/) package that lets users contr
 
 The Immich backend is divided into several services, which are run as individual docker containers.
 
-1. `immich-server` - Handle and respond to REST API requests
-1. `immich-microservices` - Execute background jobs (thumbnail generation, metadata extraction, transcoding, etc.)
+1. `immich-server` - Handle and respond to REST API requests, execute background jobs (thumbnail generation, metadata extraction, transcoding, etc.)
 1. `immich-machine-learning` - Execute machine learning models
 1. `postgres` - Persistent data storage
-1. `redis`- Queue management for `immich-microservices`
+1. `redis`- Queue management for background jobs
 
 ### Immich Server
 
-The Immich Server is a [TypeScript](https://www.typescriptlang.org/) project written for [Node.js](https://nodejs.org/). It uses the [Nest.js](https://nestjs.com) framework, with [TypeORM](https://typeorm.io/) for database management. The server codebase also loosely follows the [Hexagonal Architecture](<https://en.wikipedia.org/wiki/Hexagonal_architecture_(software)>). Specifically, we aim to separate technology specific implementations (`infra/`) from core business logic (`domain/`).
+The Immich Server is a [TypeScript](https://www.typescriptlang.org/) project written for [Node.js](https://nodejs.org/). It uses the [Nest.js](https://nestjs.com) framework, [Express](https://expressjs.com/) server, and the query builder [Kysely](https://kysely.dev/). The server codebase also loosely follows the [Hexagonal Architecture](<https://en.wikipedia.org/wiki/Hexagonal_architecture_(software)>). Specifically, we aim to separate technology specific implementations (`src/repositories`) from core business logic (`src/services`).
 
-#### REST Endpoints
+### API Endpoints
 
-The server is a list of HTTP endpoints and associated handlers (controllers). Each controller usually implements the following CRUD operations:
+An incoming HTTP request is mapped to a controller (`src/controllers`). Controllers are collections of HTTP endpoints. Each controller usually implements the following CRUD operations for its respective resource type:
 
 - `POST` `/<type>` - **Create**
 - `GET` `/<type>` - **Read** (all)
@@ -70,13 +69,13 @@ The server is a list of HTTP endpoints and associated handlers (controllers). Ea
 - `PUT` `/<type>/:id` - **Updated** (by id)
 - `DELETE` `/<type>/:id` - **Delete** (by id)
 
-#### DTOs
+### Domain Transfer Objects (DTOs)
 
 The server uses [Domain Transfer Objects](https://en.wikipedia.org/wiki/Data_transfer_object) as public interfaces for the inputs (query, params, and body) and outputs (response) for each endpoint. DTOs translate to [OpenAPI](./open-api.md) schemas and control the generated code used by each client.
 
-### Microservices
+### Background Jobs
 
-The Immich Microservices image uses the same `Dockerfile` as the Immich Server, but with a different entrypoint. The Immich Microservices service mainly handles executing jobs, which include the following:
+Immich uses a [worker](https://github.com/immich-app/immich/blob/main/server/src/utils/misc.ts#L266) to run background jobs. These jobs include:
 
 - Thumbnail Generation
 - Metadata Extraction

docs/docs/developer/setup.md

@@ -63,9 +63,20 @@ If you only want to do web development connected to an existing, remote backend,
 IMMICH_SERVER_URL=https://demo.immich.app/ npm run dev
 ```
 
+#### `@immich/ui`
+
+To see local changes to `@immich/ui` in Immich, do the following:
+
+1. Install `@immich/ui` as a sibling to `immich/`, for example `/home/user/immich` and `/home/user/ui`
+1. Build the `@immich/ui` project via `npm run build`
+1. Uncomment the corresponding volume in web service of the `docker/docker-compose.dev.yaml` file (`../../ui:/usr/ui`)
+1. Uncomment the corresponding alias in the `web/vite.config.js` file (`'@immich/ui': path.resolve(\_\_dirname, '../../ui')`)
+1. Start up the stack via `make dev`
+1. After making changes in `@immich/ui`, rebuild it (`npm run build`)
+
 ### Mobile app
 
-The mobile app `(/mobile)` will required Flutter toolchain 3.13.x to be installed on your system.
+The mobile app `(/mobile)` will required Flutter toolchain 3.13.x and FVM to be installed on your system.
 
 Please refer to the [Flutter's official documentation](https://flutter.dev/docs/get-started/install) for more information on setting up the toolchain on your machine.
 

docs/docs/features/libraries.md

@@ -58,7 +58,7 @@ If your photos are on a network drive, automatic file watching likely won't work
 
 #### Troubleshooting
 
-If you encounter an `ENOSPC` error, you need to increase your file watcher limit. In sysctl, this key is called `fs.inotify.max_user_watched` and has a default value of 8192. Increase this number to a suitable value greater than the number of files you will be watching. Note that Immich has to watch all files in your import paths including any ignored files.
+If you encounter an `ENOSPC` error, you need to increase your file watcher limit. In sysctl, this key is called `fs.inotify.max_user_watches` and has a default value of 8192. Increase this number to a suitable value greater than the number of files you will be watching. Note that Immich has to watch all files in your import paths including any ignored files.
 
 ```
 ERROR [LibraryService] Library watcher for library c69faf55-f96d-4aa0-b83b-2d80cbc27d98 encountered error: Error: ENOSPC: System limit for number of file watchers reached, watch '/media/photo.jpg'
@@ -111,11 +111,10 @@ These actions must be performed by the Immich administrator.
 - Click on Administration -> Libraries
 - Click on Create External Library
 - Select which user owns the library, this can not be changed later
+- Enter `/mnt/media/christmas-trip` then click Add
+- Click on Save
 - Click the drop-down menu on the newly created library
 - Click on Rename Library and rename it to "Christmas Trip"
-- Click Edit Import Paths
-- Click on Add Path
-- Enter `/mnt/media/christmas-trip` then click Add
 
 NOTE: We have to use the `/mnt/media/christmas-trip` path and not the `/mnt/nas/christmas-trip` path since all paths have to be what the Docker containers see.
 

docs/docs/features/ml-hardware-acceleration.md

@@ -11,7 +11,7 @@ You do not need to redo any machine learning jobs after enabling hardware accele
 
 - ARM NN (Mali)
 - CUDA (NVIDIA GPUs with [compute capability](https://developer.nvidia.com/cuda-gpus) 5.2 or higher)
-- OpenVINO (Intel discrete GPUs such as Iris Xe and Arc)
+- OpenVINO (Intel GPUs such as Iris Xe and Arc)
 
 ## Limitations
 
@@ -43,8 +43,9 @@ You do not need to redo any machine learning jobs after enabling hardware accele
 
 #### OpenVINO
 
-- The server must have a discrete GPU, i.e. Iris Xe or Arc. Expect issues when attempting to use integrated graphics.
+- Integrated GPUs are more likely to experience issues than discrete GPUs, especially for older processors or servers with low RAM.
 - Ensure the server's kernel version is new enough to use the device for hardware accceleration.
+- Expect higher RAM usage when using OpenVINO compared to CPU processing.
 
 ## Setup
 

docs/docs/features/mobile-app.mdx

@@ -36,11 +36,15 @@ You can enable automatic backup on supported devices. For more information see [
 If you have a large number of photos on the device, and you would prefer not to backup all the photos, then it might be prudent to only backup selected photos from device to the Immich server.
 
 First, you need to enable the Storage Indicator in your app's settings. Navigate to **<ins>Settings -> Photo Grid</ins>** and enable **"Show Storage indicator on asset tiles"**; this makes it easy to distinguish local-only assets and synced assets.
+
 :::note
+
 This will enable a small cloud icon on the bottom right corner of the asset tile, indicating that the asset is synced to the server:
 
 1. <Icon path={mdiCloudOffOutline} size={1} /> - Local-only asset; not synced to the server
-2. <Icon path={mdiCloudCheckOutline} size={1} /> - Asset is synced to the server :::
+2. <Icon path={mdiCloudCheckOutline} size={1} /> - Asset is synced to the server
+
+:::
 
 Now make sure that the local album is selected in the backup screen (steps 1-2 above). You can find these albums listed in **<ins>Library -> On this device</ins>**. To selectively upload photos from these albums, simply select the local-only photos and tap on "Upload" button in the dynamic bottom menu.
 

docs/docs/features/monitoring.md

@@ -68,7 +68,7 @@ After bringing down the containers with `docker compose down` and back up with `
 :::note
 To see exactly what metrics are made available, you can additionally add `8081:8081` to the server container's ports and `8082:8082` to the microservices container's ports.
 Visiting the `/metrics` endpoint for these services will show the same raw data that Prometheus collects.
-To configure these ports see [`IMMICH_API_METRICS_PORT` & `IMMICH_MICROSERVICES_METRICS_PORT`](../install/environment-variables/#general).
+To configure these ports see [`IMMICH_API_METRICS_PORT` & `IMMICH_MICROSERVICES_METRICS_PORT`](/docs/install/environment-variables/#general).
 :::
 
 ### Usage

docs/docs/features/searching.md

@@ -31,6 +31,7 @@ The filters smart search allows you to search by include:
   - Not in any album
   - Archived
   - Favorited
+  - Rating
 
 <Tabs>
   <TabItem value="Computer" label="Computer" default>

docs/docs/features/supported-formats.md

@@ -8,22 +8,23 @@ For the full list, refer to the [Immich source code](https://github.com/immich-a
 
 ## Image formats
 
-| Format    | Extension(s)                  |     Supported?     | Notes           |
-| :-------- | :---------------------------- | :----------------: | :-------------- |
-| `AVIF`    | `.avif`                       | :white_check_mark: |                 |
-| `BMP`     | `.bmp`                        | :white_check_mark: |                 |
-| `GIF`     | `.gif`                        | :white_check_mark: |                 |
-| `HEIC`    | `.heic`                       | :white_check_mark: |                 |
-| `HEIF`    | `.heif`                       | :white_check_mark: |                 |
-| `JPEG`    | `.webp` `.jpg` `.jpe` `.insp` | :white_check_mark: |                 |
-| `JPEG XL` | `.jxl`                        | :white_check_mark: |                 |
-| `PNG`     | `.webp`                       | :white_check_mark: |                 |
-| `PSD`     | `.psd`                        | :white_check_mark: | Adobe Photoshop |
-| `RAW`     | `.raw`                        | :white_check_mark: |                 |
-| `RW2`     | `.rw2`                        | :white_check_mark: |                 |
-| `SVG`     | `.svg`                        | :white_check_mark: |                 |
-| `TIFF`    | `.tif` `.tiff`                | :white_check_mark: |                 |
-| `WEBP`    | `.webp`                       | :white_check_mark: |                 |
+| Format      | Extension(s)                  |     Supported?     | Notes           |
+| :---------- | :---------------------------- | :----------------: | :-------------- |
+| `AVIF`      | `.avif`                       | :white_check_mark: |                 |
+| `BMP`       | `.bmp`                        | :white_check_mark: |                 |
+| `GIF`       | `.gif`                        | :white_check_mark: |                 |
+| `HEIC`      | `.heic`                       | :white_check_mark: |                 |
+| `HEIF`      | `.heif`                       | :white_check_mark: |                 |
+| `JPEG 2000` | `.jp2`                        | :white_check_mark: |                 |
+| `JPEG`      | `.webp` `.jpg` `.jpe` `.insp` | :white_check_mark: |                 |
+| `JPEG XL`   | `.jxl`                        | :white_check_mark: |                 |
+| `PNG`       | `.webp`                       | :white_check_mark: |                 |
+| `PSD`       | `.psd`                        | :white_check_mark: | Adobe Photoshop |
+| `RAW`       | `.raw`                        | :white_check_mark: |                 |
+| `RW2`       | `.rw2`                        | :white_check_mark: |                 |
+| `SVG`       | `.svg`                        | :white_check_mark: |                 |
+| `TIFF`      | `.tif` `.tiff`                | :white_check_mark: |                 |
+| `WEBP`      | `.webp`                       | :white_check_mark: |                 |
 
 ## Video formats
 
@@ -34,7 +35,7 @@ For the full list, refer to the [Immich source code](https://github.com/immich-a
 | `FLV`       | `.flv`                | :white_check_mark: |       |
 | `M4V`       | `.m4v`                | :white_check_mark: |       |
 | `MATROSKA`  | `.mkv`                | :white_check_mark: |       |
-| `MP2T`      | `.mts` `.m2ts`        | :white_check_mark: |       |
+| `MP2T`      | `.mts` `.m2ts` `.m2t` | :white_check_mark: |       |
 | `MP4`       | `.mp4` `.insv`        | :white_check_mark: |       |
 | `MPEG`      | `.mpg` `.mpe` `.mpeg` | :white_check_mark: |       |
 | `QUICKTIME` | `.mov`                | :white_check_mark: |       |

docs/docs/guides/custom-locations.md

@@ -6,7 +6,7 @@ This guide explains how to store generated and raw files with docker's volume mo
 It is important to remember to update the backup settings after following the guide to back up the new backup paths if using automatic backup tools, especially `profile/`.
 :::
 
-In our `.env` file, we will define variables that will help us in the future when we want to move to a more advanced server
+In our `.env` file, we will define the paths we want to use. Note that you don't have to define all of these: UPLOAD_LOCATION will be the base folder that files are stored in by default, with the other paths acting as overrides.
 
 ```diff title=".env"
 # You can find documentation for all the supported environment variables [here](/docs/install/environment-variables)
@@ -21,7 +21,7 @@ In our `.env` file, we will define variables that will help us in the future whe
 ...
 ```
 
-After defining the locations of these files, we will edit the `docker-compose.yml` file accordingly and add the new variables to the `immich-server` container.
+After defining the locations of these files, we will edit the `docker-compose.yml` file accordingly and add the new variables to the `immich-server` container. These paths are where the mount attaches inside of the container, so don't change those.
 
 ```diff title="docker-compose.yml"
 services:
@@ -35,7 +35,8 @@ services:
       - /etc/localtime:/etc/localtime:ro
 ```
 
-Restart Immich to register the changes.
+After making this change, you have to move the files over to the new folders to make sure Immich can find everything it needs. If you haven't uploaded anything important yet, you can also reset Immich entirely by deleting the database folder.
+Then restart Immich to register the changes:
 
 ```
 docker compose up -d
@@ -49,5 +50,3 @@ The `thumbs/` folder contains both the small thumbnails displayed in the timelin
 
 The storage metrics of the Immich server will track available storage at `UPLOAD_LOCATION`, so the administrator must set up some sort of monitoring to ensure the storage does not run out of space. The `profile/` folder is much smaller, usually less than 1 MB.
 :::
-
-Thanks to [Jrasm91](https://github.com/immich-app/immich/discussions/2110#discussioncomment-5477767) for writing the guide.

docs/docs/guides/database-queries.md

@@ -5,9 +5,9 @@ Keep in mind that mucking around in the database might set the moon on fire. Avo
 :::
 
 :::tip
-Run `docker exec -it immich_postgres psql --dbname=immich --username=<DB_USERNAME>` to connect to the database via the container directly.
+Run `docker exec -it immich_postgres psql --dbname=<DB_DATABASE_NAME> --username=<DB_USERNAME>` to connect to the database via the container directly.
 
-(Replace `<DB_USERNAME>` with the value from your [`.env` file](/docs/install/environment-variables#database)).
+(Replace `<DB_DATABASE_NAME>` and `<DB_USERNAME>` with the values from your [`.env` file](/docs/install/environment-variables#database)).
 :::
 
 ## Assets
@@ -27,6 +27,10 @@ SELECT * FROM "assets" WHERE "originalPath" = 'upload/library/admin/2023/2023-09
 SELECT * FROM "assets" WHERE "originalPath" LIKE 'upload/library/admin/2023/%';
 ```
 
+```sql title="Find by ID"
+SELECT * FROM "assets" WHERE "id" = '9f94e60f-65b6-47b7-ae44-a4df7b57f0e9';
+```
+
 :::note
 You can calculate the checksum for a particular file by using the command `sha1sum <filename>`.
 :::

docs/docs/install/docker-compose.mdx

@@ -37,7 +37,7 @@ You can alternatively download these two files from your browser and move them t
 </CodeBlock>
 
 - Populate `UPLOAD_LOCATION` with your preferred location for storing backup assets. It should be a new directory on the server with enough free space.
-- Consider changing `DB_PASSWORD` to a custom value. Postgres is not publically exposed, so this password is only used for local authentication.
+- Consider changing `DB_PASSWORD` to a custom value. Postgres is not publicly exposed, so this password is only used for local authentication.
   To avoid issues with Docker parsing this value, it is best to use only the characters `A-Za-z0-9`. `pwgen` is a handy utility for this.
 - Set your timezone by uncommenting the `TZ=` line.
 - Populate custom database information if necessary.

docs/docs/install/environment-variables.md

@@ -148,24 +148,28 @@ Redis (Sentinel) URL example JSON before encoding:
 
 ## Machine Learning
 
-| Variable                                                  | Description                                                                                         |             Default             | Containers       |
-| :-------------------------------------------------------- | :-------------------------------------------------------------------------------------------------- | :-----------------------------: | :--------------- |
-| `MACHINE_LEARNING_MODEL_TTL`                              | Inactivity time (s) before a model is unloaded (disabled if \<= 0)                                  |              `300`              | machine learning |
-| `MACHINE_LEARNING_MODEL_TTL_POLL_S`                       | Interval (s) between checks for the model TTL (disabled if \<= 0)                                   |              `10`               | machine learning |
-| `MACHINE_LEARNING_CACHE_FOLDER`                           | Directory where models are downloaded                                                               |            `/cache`             | machine learning |
-| `MACHINE_LEARNING_REQUEST_THREADS`<sup>\*1</sup>          | Thread count of the request thread pool (disabled if \<= 0)                                         |       number of CPU cores       | machine learning |
-| `MACHINE_LEARNING_MODEL_INTER_OP_THREADS`                 | Number of parallel model operations                                                                 |               `1`               | machine learning |
-| `MACHINE_LEARNING_MODEL_INTRA_OP_THREADS`                 | Number of threads for each model operation                                                          |               `2`               | machine learning |
-| `MACHINE_LEARNING_WORKERS`<sup>\*2</sup>                  | Number of worker processes to spawn                                                                 |               `1`               | machine learning |
-| `MACHINE_LEARNING_HTTP_KEEPALIVE_TIMEOUT_S`<sup>\*3</sup> | HTTP Keep-alive time in seconds                                                                     |               `2`               | machine learning |
-| `MACHINE_LEARNING_WORKER_TIMEOUT`                         | Maximum time (s) of unresponsiveness before a worker is killed                                      | `120` (`300` if using OpenVINO) | machine learning |
-| `MACHINE_LEARNING_PRELOAD__CLIP`                          | Name of a CLIP model to be preloaded and kept in cache                                              |                                 | machine learning |
-| `MACHINE_LEARNING_PRELOAD__FACIAL_RECOGNITION`            | Name of a facial recognition model to be preloaded and kept in cache                                |                                 | machine learning |
-| `MACHINE_LEARNING_ANN`                                    | Enable ARM-NN hardware acceleration if supported                                                    |             `True`              | machine learning |
-| `MACHINE_LEARNING_ANN_FP16_TURBO`                         | Execute operations in FP16 precision: increasing speed, reducing precision (applies only to ARM-NN) |             `False`             | machine learning |
-| `MACHINE_LEARNING_ANN_TUNING_LEVEL`                       | ARM-NN GPU tuning level (1: rapid, 2: normal, 3: exhaustive)                                        |               `2`               | machine learning |
-| `MACHINE_LEARNING_DEVICE_IDS`<sup>\*4</sup>               | Device IDs to use in multi-GPU environments                                                         |               `0`               | machine learning |
-| `MACHINE_LEARNING_MAX_BATCH_SIZE__FACIAL_RECOGNITION`     | Set the maximum number of faces that will be processed at once by the facial recognition model      |  None (`1` if using OpenVINO)   | machine learning |
+| Variable                                                    | Description                                                                                         |             Default             | Containers       |
+| :---------------------------------------------------------- | :-------------------------------------------------------------------------------------------------- | :-----------------------------: | :--------------- |
+| `MACHINE_LEARNING_MODEL_TTL`                                | Inactivity time (s) before a model is unloaded (disabled if \<= 0)                                  |              `300`              | machine learning |
+| `MACHINE_LEARNING_MODEL_TTL_POLL_S`                         | Interval (s) between checks for the model TTL (disabled if \<= 0)                                   |              `10`               | machine learning |
+| `MACHINE_LEARNING_CACHE_FOLDER`                             | Directory where models are downloaded                                                               |            `/cache`             | machine learning |
+| `MACHINE_LEARNING_REQUEST_THREADS`<sup>\*1</sup>            | Thread count of the request thread pool (disabled if \<= 0)                                         |       number of CPU cores       | machine learning |
+| `MACHINE_LEARNING_MODEL_INTER_OP_THREADS`                   | Number of parallel model operations                                                                 |               `1`               | machine learning |
+| `MACHINE_LEARNING_MODEL_INTRA_OP_THREADS`                   | Number of threads for each model operation                                                          |               `2`               | machine learning |
+| `MACHINE_LEARNING_WORKERS`<sup>\*2</sup>                    | Number of worker processes to spawn                                                                 |               `1`               | machine learning |
+| `MACHINE_LEARNING_HTTP_KEEPALIVE_TIMEOUT_S`<sup>\*3</sup>   | HTTP Keep-alive time in seconds                                                                     |               `2`               | machine learning |
+| `MACHINE_LEARNING_WORKER_TIMEOUT`                           | Maximum time (s) of unresponsiveness before a worker is killed                                      | `120` (`300` if using OpenVINO) | machine learning |
+| `MACHINE_LEARNING_PRELOAD__CLIP__TEXTUAL`                   | Comma-separated list of (textual) CLIP model(s) to preload and cache                                |                                 | machine learning |
+| `MACHINE_LEARNING_PRELOAD__CLIP__VISUAL`                    | Comma-separated list of (visual) CLIP model(s) to preload and cache                                 |                                 | machine learning |
+| `MACHINE_LEARNING_PRELOAD__FACIAL_RECOGNITION__RECOGNITION` | Comma-separated list of (recognition) facial recognition model(s) to preload and cache              |                                 | machine learning |
+| `MACHINE_LEARNING_PRELOAD__FACIAL_RECOGNITION__DETECTION`   | Comma-separated list of (detection) facial recognition model(s) to preload and cache                |                                 | machine learning |
+| `MACHINE_LEARNING_ANN`                                      | Enable ARM-NN hardware acceleration if supported                                                    |             `True`              | machine learning |
+| `MACHINE_LEARNING_ANN_FP16_TURBO`                           | Execute operations in FP16 precision: increasing speed, reducing precision (applies only to ARM-NN) |             `False`             | machine learning |
+| `MACHINE_LEARNING_ANN_TUNING_LEVEL`                         | ARM-NN GPU tuning level (1: rapid, 2: normal, 3: exhaustive)                                        |               `2`               | machine learning |
+| `MACHINE_LEARNING_DEVICE_IDS`<sup>\*4</sup>                 | Device IDs to use in multi-GPU environments                                                         |               `0`               | machine learning |
+| `MACHINE_LEARNING_MAX_BATCH_SIZE__FACIAL_RECOGNITION`       | Set the maximum number of faces that will be processed at once by the facial recognition model      |  None (`1` if using OpenVINO)   | machine learning |
+| `MACHINE_LEARNING_PING_TIMEOUT`                             | How long (ms) to wait for a PING response when checking if an ML server is available                |             `2000`              | server           |
+| `MACHINE_LEARNING_AVAILABILITY_BACKOFF_TIME`                | How long to ignore ML servers that are offline before trying again                                  |             `30000`             | server           |
 
 \*1: It is recommended to begin with this parameter when changing the concurrency levels of the machine learning service and then tune the other ones.
 

docs/docs/install/requirements.md

@@ -14,6 +14,9 @@ Hardware and software requirements for Immich:
     If you still want to try to use a non-Linux OS, you can set it up as follows:
     - Windows: [Docker Desktop on Windows](https://docs.docker.com/desktop/install/windows-install/) or [WSL 2](https://docs.docker.com/desktop/wsl/).
     - macOS: [Docker Desktop on Mac](https://docs.docker.com/desktop/install/mac-install/).
+  - Immich runs well in a virtualized environment when running in a full virtual machine.
+    The use of Docker in LXC containers is [not recommended](https://pve.proxmox.com/wiki/Linux_Container), but may be possible for advanced users.
+    If you have issues, we recommend that you switch to a supported VM deployment.
 - **RAM**: Minimum 4GB, recommended 6GB.
 - **CPU**: Minimum 2 cores, recommended 4 cores.
 - **Storage**: Recommended Unix-compatible filesystem (EXT4, ZFS, APFS, etc.) with support for user/group ownership and permissions.

docs/docs/install/script.md

@@ -27,7 +27,7 @@ The script will perform the following actions:
 1. Download [docker-compose.yml](https://github.com/immich-app/immich/releases/latest/download/docker-compose.yml), and the [.env](https://github.com/immich-app/immich/releases/latest/download/example.env) file from the main branch of the [repository](https://github.com/immich-app/immich).
 2. Start the containers.
 
-The web application will be available at `http://<machine-ip-address>:2283`, and the server URL for the mobile app will be `http://<machine-ip-address>:2283/api`
+The web application and mobile app will be available at `http://<machine-ip-address>:2283`
 
 The directory which is used to store the library files is `./immich-app` relative to the current directory.
 

docs/docs/install/synology.md

@@ -0,0 +1,76 @@
+---
+sidebar_position: 85
+---
+
+# Synology [Community]
+
+:::note
+This is a community contribution and not officially supported by the Immich team, but included here for convenience.
+
+Community support can be found in the dedicated channel on the [Discord Server](https://discord.immich.app/).
+
+**Please report app issues to the corresponding [Github Repository](https://github.com/truenas/charts/tree/master/community/immich).**
+:::
+
+Immich can easily be installed on a Synology NAS using Container Manager within DSM. If you have not installed Container Manager already, you can install it in the Packages Center. Refer to the [Container Manager docs](https://kb.synology.com/en-us/DSM/help/ContainerManager/docker_desc?version=7) for more information on using Container Manager.
+
+## Step 1 - Download the required files
+
+Create a directory of your choice (e.g. `./immich-app`) to house Immich. In general, it's a best practice to have all Docker-based applications running under the `./docker` directory, so in this case, your directory structure will look like `./docker/immich-app`.
+
+Now create a `./postgres` and `./library` directory as sub-directories of the `./docker/immich-app`.
+
+When you're all done, you should have the following:
+
+- `./docker/immich-app/postgres`
+- `./docker/immich-app/library`
+
+Download [`docker-compose.yml`](https://github.com/immich-app/immich/releases/latest/download/docker-compose.yml) and [`example.env`](https://github.com/immich-app/immich/releases/latest/download/example.env) to your computer. Upload the files to the `./docker/immich-app` directory.
+
+## Step 2 - Populate the .env file with custom values
+
+Follow [Step 2 in Docker Compose](./docker-compose#step-2---populate-the-env-file-with-custom-values) for instructions on customizing the `.env` file, and then return back to this guide to continue.
+
+## Step 3 - Create a new project in Container Manager
+
+Open Container Manager, and select the "**Project**" action on the left navigation bar and then click "**Create**".
+![Create Project](../../static/img/synology-container-manager-create-project.png)
+
+In the settings of your new project, set "**Project name**" to a name you'll remember, such as _immich-app_. When setting the "**Path**", select the `./docker/immich-app` directory you created earlier. Doing so will prompt a message to use the existing `docker-compose.yml` already present in the directory for your project. Click "**OK**" to continue.
+
+![Set Path](../../static/img/synology-container-manager-set-path.png)
+
+The following screen will give you the option to further customize your `docker-compose.yml` file, giving you a warning regarding the `start_interval` property. Under the `healthcheck` heading, remove the `start_interval: 30s` completely and click "**Next**".
+
+![start interval](../../static/img/synology-container-manager-customize-docker-compose.png)
+
+Skip the section asking to set-up a portal for Web Station, and then complete the wizard which will build and start the containers for your project.
+
+Once your containers are successfully running, navigate to the "**Container**" section of Container Manager, right-click on the "**immich-server**" container, and choose the "**Details**".
+
+Scroll to the bottom of the "**Details**" section, and find the `IP Address` of the container, located in the `Network` section. Take note of the container's IP address as you will need it for **Step 4**.
+
+![Container Details](../../static/img/synology-container-manager-container-details.png)
+
+## Step 4 - Configure Firewall Settings
+
+Once your project completes the build process, your containers will start. In order to be able to access Immich from your browser, you need to configure the firewall settings for your Synology NAS.
+
+Open "**Control Panel**" on your Synology NAS, and select "**Security**". Navigate to "**Firewall**"
+
+![Firewall rules](../../static/img/synology-firewall-rules.png)
+
+Click "**Edit Rules**" and add the following firewall rules:
+
+- Add a "**Source IP**" rule for the IP address of your container that you obtained in Step 3 above
+- Add a "**Ports**" rule for the port specified in the `docker-compose.yml`, which should be `2283`
+
+## Next Steps
+
+Read the [Post Installation](/docs/install/post-install.mdx) steps or setup optional features below.
+
+### Setting up optional features
+
+- [External Libraries](/docs/features/libraries.md): Adding your existing photo library to Immich
+- [Hardware Transcoding](/docs/features/hardware-transcoding.md): Speeding up video transcoding
+- [Hardware-Accelerated Machine Learning](/docs/features/ml-hardware-acceleration.md): Speeding up various machine learning tasks in Immich

docs/docs/install/truenas.md

@@ -41,7 +41,7 @@ className="border rounded-xl"
 :::info Permissions
 The **pgData** dataset must be owned by the user `netdata` (UID 999) for postgres to start. The other datasets must be owned by the user `root` (UID 0) or a group that includes the user `root` (UID 0) for immich to have the necessary permissions.
 
-If the **library** dataset uses ACL it must have [ACL mode](https://www.truenas.com/docs/core/coretutorials/storage/pools/permissions/#access-control-lists) set to `Passthrough` if you plan on using a [storage template](/docs/administration/storage-template.mdx) and the dataset is configured for network sharing (its ACL type is set to `SMB/NFSv4`). When the template is applied and files need to be moved from **upload** to **library**, immich performs `chmod` internally and needs to be allowed to execute the command. [More info.](https://github.com/immich-app/immich/pull/13017)
+If the **library** dataset uses ACL it must have [ACL mode](https://www.truenas.com/docs/core/coretutorials/storage/pools/permissions/#access-control-lists) set to `Passthrough` if you plan on using a [storage template](/docs/administration/storage-template.mdx) and the dataset is configured for network sharing (its ACL type is set to `SMB/NFSv4`). When the template is applied and files need to be moved from **upload** to **library**, Immich performs `chmod` internally and needs to be allowed to execute the command. [More info.](https://github.com/immich-app/immich/pull/13017)
 :::
 
 ## Installing the Immich Application
@@ -160,6 +160,10 @@ The image above has example values.
 
 ### Additional Storage [(External Libraries)](/docs/features/libraries)
 
+:::danger Advanced Users Only
+This feature should only be used by advanced users. If this is your first time installing Immich, then DO NOT mount an external library until you have a working setup. Also, your mount path MUST be something unique and should NOT be your library or upload location or a Linux directory like `/lib`. The picture below shows a valid example.
+:::
+
 <img
 src={require('./img/truenas10.webp').default}
 width="40%"
@@ -168,7 +172,7 @@ className="border rounded-xl"
 />
 
 You may configure [External Libraries](/docs/features/libraries) by mounting them using **Additional Storage**.
-The **Mount Path** is the loaction you will need to copy and paste into the External Library settings within Immich.
+The **Mount Path** is the location you will need to copy and paste into the External Library settings within Immich.
 The **Host Path** is the location on the TrueNAS SCALE server where your external library is located.
 
 <!-- A section for Labels would go here but I don't know what they do. -->
@@ -194,7 +198,7 @@ The **CPU** value was specified in a different format with a default of `4000m`
 The **Memory** value was specified in a different format with a default of `8Gi` which is 8 GiB of RAM. The value was specified in bytes or a number with a measurement suffix. Examples: `129M`, `123Mi`, `1000000000`
 :::
 
-Enable **GPU Configuration** options if you have a GPU that you will use for [Hardware Transcoding](/docs/features/hardware-transcoding) and/or [Hardware-Accelerated Machine Learning](/docs/features/ml-hardware-acceleration.md). More info: [GPU Passtrough Docs for TrueNAS Apps](https://www.truenas.com/docs/truenasapps/#gpu-passthrough)
+Enable **GPU Configuration** options if you have a GPU that you will use for [Hardware Transcoding](/docs/features/hardware-transcoding) and/or [Hardware-Accelerated Machine Learning](/docs/features/ml-hardware-acceleration.md). More info: [GPU Passthrough Docs for TrueNAS Apps](https://www.truenas.com/docs/truenasapps/#gpu-passthrough)
 
 ### Install
 

docs/docs/install/unraid.md

@@ -72,7 +72,7 @@ alt="Select Plugins > Compose.Manager > Add New Stack > Label it Immich"
         </ul>
     </details>
 
-5.  Click "**Save Changes**", you will be promoted to edit stack UI labels, just leave this blank and click "**Ok**"
+5.  Click "**Save Changes**", you will be prompted to edit stack UI labels, just leave this blank and click "**Ok**"
 6.  Select the cog ⚙️ next to Immich, click "**Edit Stack**", then click "**Env File**"
 7.  Paste the entire contents of the [Immich example.env](https://github.com/immich-app/immich/releases/latest/download/example.env) file into the Unraid editor, then **before saving** edit the following:
 
@@ -111,7 +111,7 @@ alt="Go to Docker Tab and visit the address listed next to immich-web"
 
 <details >
     <summary>Using the FolderView plugin for organizing your Docker containers? Click me! Otherwise you're complete!</summary>
-    <p>If you are using the FolderView plugin go the Docker tab and select "<b>New Folder</b>".<br />Label it <i>"Immich"</i> and use this URL as the logo: https://raw.githubusercontent.com/immich-app/immich/main/design/immich-logo.webp<br/>Then simply select all the Immich related containers before clicking "<b>Submit</b>"</p>
+    <p>If you are using the FolderView plugin go the Docker tab and select "<b>New Folder</b>".<br />Label it <i>"Immich"</i> and use this URL as the logo: https://raw.githubusercontent.com/immich-app/immich/main/design/immich-logo.png<br/>Then simply select all the Immich related containers before clicking "<b>Submit</b>"</p>
     <img
         src={require('./img/unraid07.webp').default}
         width="80%"

docs/docs/overview/Comparison.md

@@ -1,8 +0,0 @@
----
-sidebar_position: 2
----
-
-# Comparison
-
-If you're new here and came from other asset self-hosting alternatives you might want to look at a comparison between Immich and your current solution.
-Here you can see a [comparison between the various OpenSource Photo Libraries](https://meichthys.github.io/foss_photo_libraries/) including Immich.

docs/docs/partials/_mobile-app-login.md

@@ -1,3 +1,3 @@
-Login to the mobile app with the server endpoint URL at `http://<machine-ip-address>:2283/api`
+Login to the mobile app with the server endpoint URL at `http://<machine-ip-address>:2283`
 
 <img src={require('./img/sign-in-phone.webp').default} width='50%' title='Mobile App Sign In' />

docs/docusaurus.config.js

@@ -110,9 +110,9 @@ const config = {
             label: 'API',
           },
           {
-            to: '/blog',
+            href: 'https://immich.store',
             position: 'right',
-            label: 'Blog',
+            label: 'Merch',
           },
           {
             href: 'https://github.com/immich-app/immich',

docs/package.json

@@ -16,8 +16,8 @@
     "write-heading-ids": "docusaurus write-heading-ids"
   },
   "dependencies": {
-    "@docusaurus/core": "~3.5.2",
-    "@docusaurus/preset-classic": "~3.5.2",
+    "@docusaurus/core": "~3.7.0",
+    "@docusaurus/preset-classic": "~3.7.0",
     "@mdi/js": "^7.3.67",
     "@mdi/react": "^1.6.1",
     "@mdx-js/react": "^3.0.0",
@@ -35,7 +35,9 @@
     "url": "^0.11.0"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "~3.5.2",
+    "@docusaurus/module-type-aliases": "~3.7.0",
+    "@docusaurus/tsconfig": "^3.7.0",
+    "@docusaurus/types": "^3.7.0",
     "prettier": "^3.2.4",
     "typescript": "^5.1.6"
   },
@@ -55,6 +57,6 @@
     "node": ">=20"
   },
   "volta": {
-    "node": "22.12.0"
+    "node": "22.14.0"
   }
 }

docs/src/components/community-guides.tsx

@@ -53,6 +53,11 @@ const guides: CommunityGuidesProps[] = [
     description: 'How to configure an existing fail2ban installation to block incorrect login attempts.',
     url: 'https://github.com/immich-app/immich/discussions/3243#discussioncomment-6681948',
   },
+  {
+    title: 'Immich remote access with NordVPN Meshnet',
+    description: 'Access Immich with an end-to-end encrypted connection.',
+    url: 'https://meshnet.nordvpn.com/how-to/remote-files-media-access/immich-remote-access',
+  },
 ];
 
 function CommunityGuide({ title, description, url }: CommunityGuidesProps): JSX.Element {

docs/src/components/community-projects.tsx

@@ -99,6 +99,11 @@ const projects: CommunityProjectProps[] = [
     description: 'Downloads a configurable number of random photos based on people or album ID.',
     url: 'https://github.com/jon6fingrs/immich-dl',
   },
+  {
+    title: 'Immich Upload Optimizer',
+    description: 'Automatically optimize files uploaded to Immich in order to save storage space',
+    url: 'https://github.com/miguelangel-nubla/immich-upload-optimizer',
+  },
 ];
 
 function CommunityProject({ title, description, url }: CommunityProjectProps): JSX.Element {

docs/src/components/version-switcher.tsx

@@ -24,10 +24,13 @@ export default function VersionSwitcher(): JSX.Element {
           { label: 'Next', url: 'https://main.preview.immich.app' },
           { label: 'Latest', url: 'https://immich.app' },
           ...archiveVersions,
-        ];
+        ].map(({ label, url }) => ({
+          label,
+          url: new URL(url),
+        }));
         setVersions(allVersions);
 
-        const activeVersion = allVersions.find((version) => new URL(version.url).origin === window.location.origin);
+        const activeVersion = allVersions.find((version) => version.url.origin === window.location.origin);
         if (activeVersion) {
           setLabel(activeVersion.label);
         }
@@ -44,12 +47,12 @@ export default function VersionSwitcher(): JSX.Element {
   return (
     versions.length > 0 && (
       <DropdownNavbarItem
-        className="navbar__item"
+        className="version-switcher-34ab39"
         label={label}
         mobile={windowSize === 'mobile'}
         items={versions.map(({ label, url }) => ({
           label,
-          to: url,
+          to: new URL(location.pathname + location.search + location.hash, url).href,
           target: '_self',
         }))}
       />

docs/src/css/custom.css

@@ -75,6 +75,11 @@ div[class^='announcementBar_'] {
   font-weight: 500;
 }
 
+/* workaround for version switcher PR 15894 */
+div[class*='navbar__items'] > li:has(a[class*='version-switcher-34ab39']) {
+  display: none;
+}
+
 code {
   font-weight: 600;
 }

docs/src/pages/index.tsx

@@ -50,6 +50,13 @@ function HomepageHeader() {
           >
             Demo
           </Link>
+
+          <Link
+            className="flex place-items-center place-content-center py-3 px-8 border bg-immich-primary/10 dark:bg-gray-300  rounded-xl hover:no-underline text-immich-primary dark:text-immich-dark-bg font-bold uppercase"
+            to="https://immich.store"
+          >
+            Buy Merch
+          </Link>
         </div>
 
         <div className="my-12 flex gap-1 font-medium place-items-center place-content-center text-immich-primary dark:text-immich-dark-primary">
@@ -73,9 +80,9 @@ function HomepageHeader() {
         />
 
         <div>
-          <p className="font-bold text-2xl md:text-5xl ">Download mobile app</p>
+          <p className="font-bold text-2xl md:text-5xl ">Download the mobile app</p>
           <p className="text-lg">
-            Download Immich app and start backing up your photos and videos securely to your own server
+            Download the Immich app and start backing up your photos and videos securely to your own server
           </p>
         </div>
         <div className="flex flex-col sm:flex-row place-items-center place-content-center mt-4 gap-1">

docs/static/_redirects

@@ -1,32 +1,32 @@
-/docs /docs/overview/introduction 301
-/docs/mobile-app-beta-program /docs/features/mobile-app 301
-/docs/contribution-guidelines /docs/overview/support-the-project#contributing 301
-/docs/install /docs/install/docker-compose 301
-/docs/installation/one-step-installation /docs/install/script 301
-/docs/installation/portainer-installation /docs/install/portainer 301
-/docs/installation/recommended-installation /docs/install/docker-compose 301
-/docs/installation/unraid /docs/install/unraid 301
-/docs/installation/requirements /docs/install/requirements 301
-/docs/overview/logo-meaning /docs/overview/logo 301
-/docs/overview/technology-stack /docs/developer/architecture 301
-/docs/usage/automatic-backup /docs/features/automatic-backup 301
-/docs/usage/bulk-upload /docs/features/command-line-interface 301
-/docs/features/bulk-upload /docs/features/command-line-interface 301
-/docs/usage/oauth /docs/administration/oauth 301
-/docs/usage/post-installation /docs/install/post-install 301
-/docs/usage/update /docs/install/docker-compose#step-4---upgrading 301
-/docs/usage/server-commands /docs/administration/server-commands 301
-/docs/features/jobs /docs/administration/jobs 301
-/docs/features/oauth /docs/administration/oauth 301
-/docs/features/password-login /docs/administration/password-login 301
-/docs/features/server-commands /docs/administration/server-commands 301
-/docs/features/storage-template /docs/administration/storage-template 301
-/docs/features/user-management /docs/administration/user-management 301
-/docs/developer/contributing /docs/developer/pr-checklist 301
-/docs/guides/machine-learning /docs/guides/remote-machine-learning 301
-/docs/administration/password-login /docs/administration/system-settings 301
-/docs/features/search /docs/features/searching 301
-/docs/features/smart-search /docs/features/searching 301
-/docs/guides/api-album-sync /docs/community-projects 301
-/docs/guides/remove-offline-files /docs/community-projects 301
-/milestones /roadmap 301
+/docs /docs/overview/introduction 307
+/docs/mobile-app-beta-program /docs/features/mobile-app 307
+/docs/contribution-guidelines /docs/overview/support-the-project#contributing 307
+/docs/install /docs/install/docker-compose 307
+/docs/installation/one-step-installation /docs/install/script 307
+/docs/installation/portainer-installation /docs/install/portainer 307
+/docs/installation/recommended-installation /docs/install/docker-compose 307
+/docs/installation/unraid /docs/install/unraid 307
+/docs/installation/requirements /docs/install/requirements 307
+/docs/overview/logo-meaning /docs/overview/logo 307
+/docs/overview/technology-stack /docs/developer/architecture 307
+/docs/usage/automatic-backup /docs/features/automatic-backup 307
+/docs/usage/bulk-upload /docs/features/command-line-interface 307
+/docs/features/bulk-upload /docs/features/command-line-interface 307
+/docs/usage/oauth /docs/administration/oauth 307
+/docs/usage/post-installation /docs/install/post-install 307
+/docs/usage/update /docs/install/docker-compose#step-4---upgrading 307
+/docs/usage/server-commands /docs/administration/server-commands 307
+/docs/features/jobs /docs/administration/jobs 307
+/docs/features/oauth /docs/administration/oauth 307
+/docs/features/password-login /docs/administration/password-login 307
+/docs/features/server-commands /docs/administration/server-commands 307
+/docs/features/storage-template /docs/administration/storage-template 307
+/docs/features/user-management /docs/administration/user-management 307
+/docs/developer/contributing /docs/developer/pr-checklist 307
+/docs/guides/machine-learning /docs/guides/remote-machine-learning 307
+/docs/administration/password-login /docs/administration/system-settings 307
+/docs/features/search /docs/features/searching 307
+/docs/features/smart-search /docs/features/searching 307
+/docs/guides/api-album-sync /docs/community-projects 307
+/docs/guides/remove-offline-files /docs/community-projects 307
+/milestones /roadmap 307

docs/static/archived-versions.json

@@ -1,4 +1,52 @@
 [
+  {
+    "label": "v1.127.0",
+    "url": "https://v1.127.0.archive.immich.app"
+  },
+  {
+    "label": "v1.126.1",
+    "url": "https://v1.126.1.archive.immich.app"
+  },
+  {
+    "label": "v1.126.0",
+    "url": "https://v1.126.0.archive.immich.app"
+  },
+  {
+    "label": "v1.125.7",
+    "url": "https://v1.125.7.archive.immich.app"
+  },
+  {
+    "label": "v1.125.6",
+    "url": "https://v1.125.6.archive.immich.app"
+  },
+  {
+    "label": "v1.125.5",
+    "url": "https://v1.125.5.archive.immich.app"
+  },
+  {
+    "label": "v1.125.3",
+    "url": "https://v1.125.3.archive.immich.app"
+  },
+  {
+    "label": "v1.125.2",
+    "url": "https://v1.125.2.archive.immich.app"
+  },
+  {
+    "label": "v1.125.1",
+    "url": "https://v1.125.1.archive.immich.app"
+  },
+  {
+    "label": "v1.124.2",
+    "url": "https://v1.124.2.archive.immich.app"
+  },
+  {
+    "label": "v1.124.1",
+    "url": "https://v1.124.1.archive.immich.app"
+  },
+  {
+    "label": "v1.124.0",
+    "url": "https://v1.124.0.archive.immich.app"
+  },
   {
     "label": "v1.123.0",
     "url": "https://v1.123.0.archive.immich.app"
@@ -149,46 +197,46 @@
   },
   {
     "label": "v1.105.1",
-    "url": "https://v1.105.1.archive.immich.app/"
+    "url": "https://v1.105.1.archive.immich.app"
   },
   {
     "label": "v1.105.0",
-    "url": "https://v1.105.0.archive.immich.app/"
+    "url": "https://v1.105.0.archive.immich.app"
   },
   {
     "label": "v1.104.0",
-    "url": "https://v1.104.0.archive.immich.app/"
+    "url": "https://v1.104.0.archive.immich.app"
   },
   {
     "label": "v1.103.1",
-    "url": "https://v1.103.1.archive.immich.app/"
+    "url": "https://v1.103.1.archive.immich.app"
   },
   {
     "label": "v1.103.0",
-    "url": "https://v1.103.0.archive.immich.app/"
+    "url": "https://v1.103.0.archive.immich.app"
   },
   {
     "label": "v1.102.3",
-    "url": "https://v1.102.3.archive.immich.app/"
+    "url": "https://v1.102.3.archive.immich.app"
   },
   {
     "label": "v1.102.2",
-    "url": "https://v1.102.2.archive.immich.app/"
+    "url": "https://v1.102.2.archive.immich.app"
   },
   {
     "label": "v1.102.1",
-    "url": "https://v1.102.1.archive.immich.app/"
+    "url": "https://v1.102.1.archive.immich.app"
   },
   {
     "label": "v1.102.0",
-    "url": "https://v1.102.0.archive.immich.app/"
+    "url": "https://v1.102.0.archive.immich.app"
   },
   {
     "label": "v1.101.0",
-    "url": "https://v1.101.0.archive.immich.app/"
+    "url": "https://v1.101.0.archive.immich.app"
   },
   {
     "label": "v1.100.0",
-    "url": "https://v1.100.0.archive.immich.app/"
+    "url": "https://v1.100.0.archive.immich.app"
   }
 ]

docs/tailwind.config.js

@@ -5,7 +5,7 @@ module.exports = {
     preflight: false, // disable Tailwind's reset
   },
   content: ['./src/**/*.{js,jsx,ts,tsx}', './{docs,blog}/**/*.{md,mdx}'], // my markdown stuff is in ../docs, not /src
-  darkMode: ['class', '[data-theme="dark"]'], // hooks into docusaurus' dark mode settigns
+  darkMode: ['class', '[data-theme="dark"]'], // hooks into docusaurus' dark mode settings
   theme: {
     extend: {
       colors: {

docs/tsconfig.json

@@ -1,9 +1,8 @@
 {
   // This file is not used in compilation. It is here just for a nice editor experience.
-  "extends": "@tsconfig/docusaurus/tsconfig.json",
+  "extends": "@docusaurus/tsconfig",
 
   "compilerOptions": {
-    "baseUrl": ".",
-    "module": "Node16"
+    "baseUrl": "."
   }
 }

e2e/.nvmrc

@@ -1 +1 @@
-22.12.0
+22.14.0

e2e/docker-compose.yml

@@ -34,7 +34,7 @@ services:
       - 2285:2285
 
   redis:
-    image: redis:6.2-alpine@sha256:eaba718fecd1196d88533de7ba49bf903ad33664a92debb24660a922ecd9cac8
+    image: redis:6.2-alpine@sha256:148bb5411c184abd288d9aaed139c98123eeb8824c5d3fce03cf721db58066d8
 
   database:
     image: tensorchord/pgvecto-rs:pg14-v0.2.0@sha256:90724186f0a3517cf6914295b5ab410db9ce23190a2d9d0b9dd6463e3fa298f0

e2e/package.json

@@ -1,6 +1,6 @@
 {
   "name": "immich-e2e",
-  "version": "1.123.0",
+  "version": "1.127.0",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -25,16 +25,16 @@
     "@immich/sdk": "file:../open-api/typescript-sdk",
     "@playwright/test": "^1.44.1",
     "@types/luxon": "^3.4.2",
-    "@types/node": "^22.10.2",
+    "@types/node": "^22.13.4",
     "@types/oidc-provider": "^8.5.1",
     "@types/pg": "^8.11.0",
     "@types/pngjs": "^6.0.4",
     "@types/supertest": "^6.0.2",
     "@typescript-eslint/eslint-plugin": "^8.15.0",
     "@typescript-eslint/parser": "^8.15.0",
-    "@vitest/coverage-v8": "^2.0.5",
+    "@vitest/coverage-v8": "^3.0.0",
     "eslint": "^9.14.0",
-    "eslint-config-prettier": "^9.1.0",
+    "eslint-config-prettier": "^10.0.0",
     "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-unicorn": "^56.0.1",
     "exiftool-vendored": "^28.3.1",
@@ -50,9 +50,9 @@
     "supertest": "^7.0.0",
     "typescript": "^5.3.3",
     "utimes": "^5.2.1",
-    "vitest": "^2.0.5"
+    "vitest": "^3.0.0"
   },
   "volta": {
-    "node": "22.12.0"
+    "node": "22.14.0"
   }
 }

e2e/src/api/specs/album.e2e-spec.ts

@@ -22,79 +22,92 @@ const user1NotShared = 'user1NotShared';
 const user2SharedUser = 'user2SharedUser';
 const user2SharedLink = 'user2SharedLink';
 const user2NotShared = 'user2NotShared';
+const user4DeletedAsset = 'user4DeletedAsset';
+const user4Empty = 'user4Empty';
 
 describe('/albums', () => {
   let admin: LoginResponseDto;
   let user1: LoginResponseDto;
   let user1Asset1: AssetMediaResponseDto;
   let user1Asset2: AssetMediaResponseDto;
+  let user4Asset1: AssetMediaResponseDto;
   let user1Albums: AlbumResponseDto[];
   let user2: LoginResponseDto;
   let user2Albums: AlbumResponseDto[];
+  let deletedAssetAlbum: AlbumResponseDto;
   let user3: LoginResponseDto; // deleted
+  let user4: LoginResponseDto;
 
   beforeAll(async () => {
     await utils.resetDatabase();
 
     admin = await utils.adminSetup();
 
-    [user1, user2, user3] = await Promise.all([
+    [user1, user2, user3, user4] = await Promise.all([
       utils.userSetup(admin.accessToken, createUserDto.user1),
       utils.userSetup(admin.accessToken, createUserDto.user2),
       utils.userSetup(admin.accessToken, createUserDto.user3),
+      utils.userSetup(admin.accessToken, createUserDto.user4),
     ]);
 
-    [user1Asset1, user1Asset2] = await Promise.all([
+    [user1Asset1, user1Asset2, user4Asset1] = await Promise.all([
       utils.createAsset(user1.accessToken, { isFavorite: true }),
       utils.createAsset(user1.accessToken),
+      utils.createAsset(user1.accessToken),
     ]);
 
-    user1Albums = await Promise.all([
-      utils.createAlbum(user1.accessToken, {
-        albumName: user1SharedEditorUser,
-        albumUsers: [{ userId: user2.userId, role: AlbumUserRole.Editor }],
-        assetIds: [user1Asset1.id],
-      }),
-      utils.createAlbum(user1.accessToken, {
-        albumName: user1SharedLink,
-        assetIds: [user1Asset1.id],
-      }),
-      utils.createAlbum(user1.accessToken, {
-        albumName: user1NotShared,
-        assetIds: [user1Asset1.id, user1Asset2.id],
-      }),
-      utils.createAlbum(user1.accessToken, {
-        albumName: user1SharedViewerUser,
-        albumUsers: [{ userId: user2.userId, role: AlbumUserRole.Viewer }],
-        assetIds: [user1Asset1.id],
+    [user1Albums, user2Albums, deletedAssetAlbum] = await Promise.all([
+      Promise.all([
+        utils.createAlbum(user1.accessToken, {
+          albumName: user1SharedEditorUser,
+          albumUsers: [
+            { userId: admin.userId, role: AlbumUserRole.Editor },
+            { userId: user2.userId, role: AlbumUserRole.Editor },
+          ],
+          assetIds: [user1Asset1.id],
+        }),
+        utils.createAlbum(user1.accessToken, {
+          albumName: user1SharedLink,
+          assetIds: [user1Asset1.id],
+        }),
+        utils.createAlbum(user1.accessToken, {
+          albumName: user1NotShared,
+          assetIds: [user1Asset1.id, user1Asset2.id],
+        }),
+        utils.createAlbum(user1.accessToken, {
+          albumName: user1SharedViewerUser,
+          albumUsers: [{ userId: user2.userId, role: AlbumUserRole.Viewer }],
+          assetIds: [user1Asset1.id],
+        }),
+      ]),
+      Promise.all([
+        utils.createAlbum(user2.accessToken, {
+          albumName: user2SharedUser,
+          albumUsers: [
+            { userId: user1.userId, role: AlbumUserRole.Editor },
+            { userId: user3.userId, role: AlbumUserRole.Editor },
+          ],
+        }),
+        utils.createAlbum(user2.accessToken, { albumName: user2SharedLink }),
+        utils.createAlbum(user2.accessToken, { albumName: user2NotShared }),
+      ]),
+      utils.createAlbum(user4.accessToken, { albumName: user4DeletedAsset }),
+      utils.createAlbum(user4.accessToken, { albumName: user4Empty }),
+      utils.createAlbum(user3.accessToken, {
+        albumName: 'Deleted',
+        albumUsers: [{ userId: user1.userId, role: AlbumUserRole.Editor }],
       }),
     ]);
 
-    user2Albums = await Promise.all([
-      utils.createAlbum(user2.accessToken, {
-        albumName: user2SharedUser,
-        albumUsers: [
-          { userId: user1.userId, role: AlbumUserRole.Editor },
-          { userId: user3.userId, role: AlbumUserRole.Editor },
-        ],
-      }),
-      utils.createAlbum(user2.accessToken, { albumName: user2SharedLink }),
-      utils.createAlbum(user2.accessToken, { albumName: user2NotShared }),
-    ]);
-
-    await utils.createAlbum(user3.accessToken, {
-      albumName: 'Deleted',
-      albumUsers: [{ userId: user1.userId, role: AlbumUserRole.Editor }],
-    });
-
-    await addAssetsToAlbum(
-      { id: user2Albums[0].id, bulkIdsDto: { ids: [user1Asset1.id, user1Asset2.id] } },
-      { headers: asBearerAuth(user1.accessToken) },
-    );
-
-    user2Albums[0] = await getAlbumInfo({ id: user2Albums[0].id }, { headers: asBearerAuth(user2.accessToken) });
-
     await Promise.all([
+      addAssetsToAlbum(
+        { id: user2Albums[0].id, bulkIdsDto: { ids: [user1Asset1.id, user1Asset2.id] } },
+        { headers: asBearerAuth(user1.accessToken) },
+      ),
+      addAssetsToAlbum(
+        { id: deletedAssetAlbum.id, bulkIdsDto: { ids: [user4Asset1.id] } },
+        { headers: asBearerAuth(user4.accessToken) },
+      ),
       // add shared link to user1SharedLink album
       utils.createSharedLink(user1.accessToken, {
         type: SharedLinkType.Album,
@@ -107,7 +120,11 @@ describe('/albums', () => {
       }),
     ]);
 
-    await deleteUserAdmin({ id: user3.userId, userAdminDeleteDto: {} }, { headers: asBearerAuth(admin.accessToken) });
+    [user2Albums[0]] = await Promise.all([
+      getAlbumInfo({ id: user2Albums[0].id }, { headers: asBearerAuth(user2.accessToken) }),
+      deleteUserAdmin({ id: user3.userId, userAdminDeleteDto: {} }, { headers: asBearerAuth(admin.accessToken) }),
+      utils.deleteAssets(user1.accessToken, [user4Asset1.id]),
+    ]);
   });
 
   describe('GET /albums', () => {
@@ -142,6 +159,10 @@ describe('/albums', () => {
         ...user1Albums[0],
         assets: [expect.objectContaining({ isFavorite: false })],
         lastModifiedAssetTimestamp: expect.any(String),
+        startDate: expect.any(String),
+        endDate: expect.any(String),
+        shared: true,
+        albumUsers: expect.any(Array),
       });
     });
 
@@ -280,6 +301,25 @@ describe('/albums', () => {
       expect(status).toBe(200);
       expect(body).toHaveLength(5);
     });
+
+    it('should return empty albums and albums where all assets are deleted', async () => {
+      const { status, body } = await request(app).get('/albums').set('Authorization', `Bearer ${user4.accessToken}`);
+      expect(status).toBe(200);
+      expect(body).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            ownerId: user4.userId,
+            albumName: user4DeletedAsset,
+            shared: false,
+          }),
+          expect.objectContaining({
+            ownerId: user4.userId,
+            albumName: user4Empty,
+            shared: false,
+          }),
+        ]),
+      );
+    });
   });
 
   describe('GET /albums/:id', () => {
@@ -299,6 +339,10 @@ describe('/albums', () => {
         ...user1Albums[0],
         assets: [expect.objectContaining({ id: user1Albums[0].assets[0].id })],
         lastModifiedAssetTimestamp: expect.any(String),
+        startDate: expect.any(String),
+        endDate: expect.any(String),
+        albumUsers: expect.any(Array),
+        shared: true,
       });
     });
 
@@ -330,6 +374,10 @@ describe('/albums', () => {
         ...user1Albums[0],
         assets: [expect.objectContaining({ id: user1Albums[0].assets[0].id })],
         lastModifiedAssetTimestamp: expect.any(String),
+        startDate: expect.any(String),
+        endDate: expect.any(String),
+        albumUsers: expect.any(Array),
+        shared: true,
       });
     });
 
@@ -344,6 +392,30 @@ describe('/albums', () => {
         assets: [],
         assetCount: 1,
         lastModifiedAssetTimestamp: expect.any(String),
+        endDate: expect.any(String),
+        startDate: expect.any(String),
+        albumUsers: expect.any(Array),
+        shared: true,
+      });
+    });
+
+    it('should not count trashed assets', async () => {
+      await utils.deleteAssets(user1.accessToken, [user1Asset2.id]);
+
+      const { status, body } = await request(app)
+        .get(`/albums/${user2Albums[0].id}?withoutAssets=true`)
+        .set('Authorization', `Bearer ${user1.accessToken}`);
+
+      expect(status).toBe(200);
+      expect(body).toEqual({
+        ...user2Albums[0],
+        assets: [],
+        assetCount: 1,
+        lastModifiedAssetTimestamp: expect.any(String),
+        endDate: expect.any(String),
+        startDate: expect.any(String),
+        albumUsers: expect.any(Array),
+        shared: true,
       });
     });
   });

e2e/src/api/specs/asset.e2e-spec.ts

@@ -3,11 +3,11 @@ import {
   AssetMediaStatus,
   AssetResponseDto,
   AssetTypeEnum,
-  LoginResponseDto,
-  SharedLinkType,
   getAssetInfo,
   getConfig,
   getMyUser,
+  LoginResponseDto,
+  SharedLinkType,
   updateConfig,
 } from '@immich/sdk';
 import { exiftool } from 'exiftool-vendored';
@@ -19,7 +19,7 @@ import { Socket } from 'socket.io-client';
 import { createUserDto, uuidDto } from 'src/fixtures';
 import { makeRandomImage } from 'src/generators';
 import { errorDto } from 'src/responses';
-import { app, asBearerAuth, tempDir, testAssetDir, utils } from 'src/utils';
+import { app, asBearerAuth, tempDir, TEN_TIMES, testAssetDir, utils } from 'src/utils';
 import request from 'supertest';
 import { afterAll, beforeAll, describe, expect, it } from 'vitest';
 
@@ -41,8 +41,6 @@ const makeUploadDto = (options?: { omit: string }): Record<string, any> => {
   return dto;
 };
 
-const TEN_TIMES = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
-
 const locationAssetFilepath = `${testAssetDir}/metadata/gps-position/thompson-springs.jpg`;
 const ratingAssetFilepath = `${testAssetDir}/metadata/rating/mongolels.jpg`;
 const facesAssetFilepath = `${testAssetDir}/metadata/faces/portrait.jpg`;
@@ -703,6 +701,20 @@ describe('/asset', () => {
       expect(status).toEqual(200);
     });
 
+    it('should set the negative rating', async () => {
+      const { status, body } = await request(app)
+        .put(`/assets/${user1Assets[0].id}`)
+        .set('Authorization', `Bearer ${user1.accessToken}`)
+        .send({ rating: -1 });
+      expect(body).toMatchObject({
+        id: user1Assets[0].id,
+        exifInfo: expect.objectContaining({
+          rating: -1,
+        }),
+      });
+      expect(status).toEqual(200);
+    });
+
     it('should reject invalid rating', async () => {
       for (const test of [{ rating: 7 }, { rating: 3.5 }, { rating: null }]) {
         const { status, body } = await request(app)
@@ -766,7 +778,7 @@ describe('/asset', () => {
       expect(body).toEqual(errorDto.badRequest('Not found or no asset.delete access'));
     });
 
-    it('should move an asset to the trash', async () => {
+    it('should move an asset to trash', async () => {
       const { id: assetId } = await utils.createAsset(admin.accessToken);
 
       const before = await utils.getAssetInfo(admin.accessToken, assetId);
@@ -782,6 +794,38 @@ describe('/asset', () => {
       expect(after.isTrashed).toBe(true);
     });
 
+    it('should permanently delete an asset from trash', async () => {
+      const { id: assetId } = await utils.createAsset(admin.accessToken);
+
+      {
+        const { status } = await request(app)
+          .delete('/assets')
+          .send({ ids: [assetId] })
+          .set('Authorization', `Bearer ${admin.accessToken}`);
+        expect(status).toBe(204);
+      }
+
+      const trashed = await utils.getAssetInfo(admin.accessToken, assetId);
+      expect(trashed.isTrashed).toBe(true);
+
+      {
+        const { status } = await request(app)
+          .delete('/assets')
+          .send({ ids: [assetId], force: true })
+          .set('Authorization', `Bearer ${admin.accessToken}`);
+        expect(status).toBe(204);
+      }
+
+      await utils.waitForWebsocketEvent({ event: 'assetDelete', id: assetId });
+
+      {
+        const { status } = await request(app)
+          .get(`/assets/${assetId}`)
+          .set('Authorization', `Bearer ${admin.accessToken}`);
+        expect(status).toBe(400);
+      }
+    });
+
     it('should clean up live photos', async () => {
       const { id: motionId } = await utils.createAsset(admin.accessToken, {
         assetData: { filename: 'test.mp4', bytes: makeRandomImage() },

e2e/src/api/specs/jobs.e2e-spec.ts

@@ -0,0 +1,86 @@
+import { JobCommand, JobName, LoginResponseDto } from '@immich/sdk';
+import { readFile } from 'node:fs/promises';
+import { basename } from 'node:path';
+import { errorDto } from 'src/responses';
+import { app, testAssetDir, utils } from 'src/utils';
+import request from 'supertest';
+import { afterEach, beforeAll, describe, expect, it } from 'vitest';
+
+describe('/jobs', () => {
+  let admin: LoginResponseDto;
+
+  beforeAll(async () => {
+    await utils.resetDatabase();
+    admin = await utils.adminSetup({ onboarding: false });
+  });
+
+  describe('PUT /jobs', () => {
+    afterEach(async () => {
+      await utils.jobCommand(admin.accessToken, JobName.MetadataExtraction, {
+        command: JobCommand.Resume,
+        force: false,
+      });
+    });
+
+    it('should require authentication', async () => {
+      const { status, body } = await request(app).put('/jobs/metadataExtraction');
+      expect(status).toBe(401);
+      expect(body).toEqual(errorDto.unauthorized);
+    });
+
+    it('should queue metadata extraction for missing assets', async () => {
+      const path1 = `${testAssetDir}/formats/raw/Nikon/D700/philadelphia.nef`;
+      const path2 = `${testAssetDir}/formats/raw/Nikon/D80/glarus.nef`;
+
+      await utils.createAsset(admin.accessToken, {
+        assetData: { bytes: await readFile(path1), filename: basename(path1) },
+      });
+
+      await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
+
+      await utils.jobCommand(admin.accessToken, JobName.MetadataExtraction, {
+        command: JobCommand.Pause,
+        force: false,
+      });
+
+      const { id } = await utils.createAsset(admin.accessToken, {
+        assetData: { bytes: await readFile(path2), filename: basename(path2) },
+      });
+
+      await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
+
+      {
+        const asset = await utils.getAssetInfo(admin.accessToken, id);
+
+        expect(asset.exifInfo).toBeDefined();
+        expect(asset.exifInfo?.make).toBeNull();
+      }
+
+      await utils.jobCommand(admin.accessToken, JobName.MetadataExtraction, {
+        command: JobCommand.Empty,
+        force: false,
+      });
+
+      await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
+
+      await utils.jobCommand(admin.accessToken, JobName.MetadataExtraction, {
+        command: JobCommand.Resume,
+        force: false,
+      });
+
+      await utils.jobCommand(admin.accessToken, JobName.MetadataExtraction, {
+        command: JobCommand.Start,
+        force: false,
+      });
+
+      await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
+
+      {
+        const asset = await utils.getAssetInfo(admin.accessToken, id);
+
+        expect(asset.exifInfo).toBeDefined();
+        expect(asset.exifInfo?.make).toBe('NIKON CORPORATION');
+      }
+    });
+  });
+});

e2e/src/api/specs/library.e2e-spec.ts

@@ -1,4 +1,4 @@
-import { LibraryResponseDto, LoginResponseDto, getAllLibraries, scanLibrary } from '@immich/sdk';
+import { LibraryResponseDto, LoginResponseDto, getAllLibraries } from '@immich/sdk';
 import { cpSync, existsSync, rmSync, unlinkSync } from 'node:fs';
 import { Socket } from 'socket.io-client';
 import { userDto, uuidDto } from 'src/fixtures';
@@ -8,8 +8,6 @@ import request from 'supertest';
 import { utimes } from 'utimes';
 import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest';
 
-const scan = async (accessToken: string, id: string) => scanLibrary({ id }, { headers: asBearerAuth(accessToken) });
-
 describe('/libraries', () => {
   let admin: LoginResponseDto;
   let user: LoginResponseDto;
@@ -298,13 +296,35 @@ describe('/libraries', () => {
       expect(status).toBe(204);
 
       await utils.waitForQueueFinish(admin.accessToken, 'library');
+      await utils.waitForQueueFinish(admin.accessToken, 'sidecar');
+      await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
 
       const { assets } = await utils.searchAssets(admin.accessToken, {
         originalPath: `${testAssetDirInternal}/temp/directoryA/assetA.png`,
+        libraryId: library.id,
       });
       expect(assets.count).toBe(1);
     });
 
+    it('should process metadata and thumbnails for external asset', async () => {
+      const library = await utils.createLibrary(admin.accessToken, {
+        ownerId: admin.userId,
+        importPaths: [`${testAssetDirInternal}/temp/directoryA`],
+      });
+
+      await utils.scan(admin.accessToken, library.id);
+
+      const { assets } = await utils.searchAssets(admin.accessToken, {
+        originalPath: `${testAssetDirInternal}/temp/directoryA/assetA.png`,
+        libraryId: library.id,
+      });
+      expect(assets.count).toBe(1);
+      const asset = assets.items[0];
+      expect(asset.exifInfo).not.toBe(null);
+      expect(asset.exifInfo?.dateTimeOriginal).not.toBe(null);
+      expect(asset.thumbhash).not.toBe(null);
+    });
+
     it('should scan external library with exclusion pattern', async () => {
       const library = await utils.createLibrary(admin.accessToken, {
         ownerId: admin.userId,
@@ -312,13 +332,7 @@ describe('/libraries', () => {
         exclusionPatterns: ['**/directoryA'],
       });
 
-      const { status } = await request(app)
-        .post(`/libraries/${library.id}/scan`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send();
-      expect(status).toBe(204);
-
-      await utils.waitForQueueFinish(admin.accessToken, 'library');
+      await utils.scan(admin.accessToken, library.id);
 
       const { assets } = await utils.searchAssets(admin.accessToken, { libraryId: library.id });
 
@@ -332,13 +346,7 @@ describe('/libraries', () => {
         importPaths: [`${testAssetDirInternal}/temp/directoryA`, `${testAssetDirInternal}/temp/directoryB`],
       });
 
-      const { status } = await request(app)
-        .post(`/libraries/${library.id}/scan`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send();
-      expect(status).toBe(204);
-
-      await utils.waitForQueueFinish(admin.accessToken, 'library');
+      await utils.scan(admin.accessToken, library.id);
 
       const { assets } = await utils.searchAssets(admin.accessToken, { libraryId: library.id });
 
@@ -357,13 +365,7 @@ describe('/libraries', () => {
       utils.createImageFile(`${testAssetDir}/temp/folder, a/assetA.png`);
       utils.createImageFile(`${testAssetDir}/temp/folder, b/assetB.png`);
 
-      const { status } = await request(app)
-        .post(`/libraries/${library.id}/scan`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send();
-      expect(status).toBe(204);
-
-      await utils.waitForQueueFinish(admin.accessToken, 'library');
+      await utils.scan(admin.accessToken, library.id);
 
       const { assets } = await utils.searchAssets(admin.accessToken, { libraryId: library.id });
 
@@ -385,13 +387,7 @@ describe('/libraries', () => {
       utils.createImageFile(`${testAssetDir}/temp/folder{ a/assetA.png`);
       utils.createImageFile(`${testAssetDir}/temp/folder} b/assetB.png`);
 
-      const { status } = await request(app)
-        .post(`/libraries/${library.id}/scan`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send();
-      expect(status).toBe(204);
-
-      await utils.waitForQueueFinish(admin.accessToken, 'library');
+      await utils.scan(admin.accessToken, library.id);
 
       const { assets } = await utils.searchAssets(admin.accessToken, { libraryId: library.id });
 
@@ -443,13 +439,7 @@ describe('/libraries', () => {
       utils.createImageFile(`${testAssetDir}/temp/folder${char}1/asset1.png`);
       utils.createImageFile(`${testAssetDir}/temp/folder${char}2/asset2.png`);
 
-      const { status } = await request(app)
-        .post(`/libraries/${library.id}/scan`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send();
-      expect(status).toBe(204);
-
-      await utils.waitForQueueFinish(admin.accessToken, 'library');
+      await utils.scan(admin.accessToken, library.id);
 
       const { assets } = await utils.searchAssets(admin.accessToken, { libraryId: library.id });
 
@@ -473,23 +463,12 @@ describe('/libraries', () => {
       utils.createImageFile(`${testAssetDir}/temp/reimport/asset.jpg`);
       await utimes(`${testAssetDir}/temp/reimport/asset.jpg`, 447_775_200_000);
 
-      await scan(admin.accessToken, library.id);
-      await utils.waitForQueueFinish(admin.accessToken, 'library');
-      await utils.waitForQueueFinish(admin.accessToken, 'sidecar');
-      await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
+      await utils.scan(admin.accessToken, library.id);
 
       cpSync(`${testAssetDir}/albums/nature/tanners_ridge.jpg`, `${testAssetDir}/temp/reimport/asset.jpg`);
       await utimes(`${testAssetDir}/temp/reimport/asset.jpg`, 447_775_200_001);
 
-      const { status } = await request(app)
-        .post(`/libraries/${library.id}/scan`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send();
-      expect(status).toBe(204);
-
-      await utils.waitForQueueFinish(admin.accessToken, 'library');
-      await utils.waitForQueueFinish(admin.accessToken, 'sidecar');
-      await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
+      await utils.scan(admin.accessToken, library.id);
 
       const { assets } = await utils.searchAssets(admin.accessToken, {
         libraryId: library.id,
@@ -520,21 +499,12 @@ describe('/libraries', () => {
       utils.createImageFile(`${testAssetDir}/temp/reimport/asset.jpg`);
       await utimes(`${testAssetDir}/temp/reimport/asset.jpg`, 447_775_200_000);
 
-      await scan(admin.accessToken, library.id);
-      await utils.waitForQueueFinish(admin.accessToken, 'library');
+      await utils.scan(admin.accessToken, library.id);
 
       cpSync(`${testAssetDir}/albums/nature/tanners_ridge.jpg`, `${testAssetDir}/temp/reimport/asset.jpg`);
       await utimes(`${testAssetDir}/temp/reimport/asset.jpg`, 447_775_200_000);
 
-      const { status } = await request(app)
-        .post(`/libraries/${library.id}/scan`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send();
-      expect(status).toBe(204);
-
-      await utils.waitForQueueFinish(admin.accessToken, 'library');
-      await utils.waitForQueueFinish(admin.accessToken, 'sidecar');
-      await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
+      await utils.scan(admin.accessToken, library.id);
 
       const { assets } = await utils.searchAssets(admin.accessToken, {
         libraryId: library.id,
@@ -556,6 +526,47 @@ describe('/libraries', () => {
       utils.removeImageFile(`${testAssetDir}/temp/reimport/asset.jpg`);
     });
 
+    it('should not reimport a modified file more than once', async () => {
+      const library = await utils.createLibrary(admin.accessToken, {
+        ownerId: admin.userId,
+        importPaths: [`${testAssetDirInternal}/temp/reimport`],
+      });
+
+      utils.createImageFile(`${testAssetDir}/temp/reimport/asset.jpg`);
+      await utimes(`${testAssetDir}/temp/reimport/asset.jpg`, 447_775_200_000);
+
+      await utils.scan(admin.accessToken, library.id);
+
+      cpSync(`${testAssetDir}/albums/nature/tanners_ridge.jpg`, `${testAssetDir}/temp/reimport/asset.jpg`);
+      await utimes(`${testAssetDir}/temp/reimport/asset.jpg`, 447_775_200_001);
+
+      await utils.scan(admin.accessToken, library.id);
+
+      cpSync(`${testAssetDir}/albums/nature/el_torcal_rocks.jpg`, `${testAssetDir}/temp/reimport/asset.jpg`);
+      await utimes(`${testAssetDir}/temp/reimport/asset.jpg`, 447_775_200_001);
+
+      await utils.scan(admin.accessToken, library.id);
+
+      const { assets } = await utils.searchAssets(admin.accessToken, {
+        libraryId: library.id,
+      });
+
+      expect(assets.count).toEqual(1);
+
+      const asset = await utils.getAssetInfo(admin.accessToken, assets.items[0].id);
+
+      expect(asset).toEqual(
+        expect.objectContaining({
+          originalFileName: 'asset.jpg',
+          exifInfo: expect.objectContaining({
+            model: 'NIKON D750',
+          }),
+        }),
+      );
+
+      utils.removeImageFile(`${testAssetDir}/temp/reimport/asset.jpg`);
+    });
+
     it('should set an asset offline if its file is missing', async () => {
       const library = await utils.createLibrary(admin.accessToken, {
         ownerId: admin.userId,
@@ -564,21 +575,14 @@ describe('/libraries', () => {
 
       utils.createImageFile(`${testAssetDir}/temp/offline/offline.png`);
 
-      await scan(admin.accessToken, library.id);
-      await utils.waitForQueueFinish(admin.accessToken, 'library');
+      await utils.scan(admin.accessToken, library.id);
 
       const { assets } = await utils.searchAssets(admin.accessToken, { libraryId: library.id });
       expect(assets.count).toBe(1);
 
       utils.removeImageFile(`${testAssetDir}/temp/offline/offline.png`);
 
-      const { status } = await request(app)
-        .post(`/libraries/${library.id}/scan`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send();
-      expect(status).toBe(204);
-
-      await utils.waitForQueueFinish(admin.accessToken, 'library');
+      await utils.scan(admin.accessToken, library.id);
 
       const trashedAsset = await utils.getAssetInfo(admin.accessToken, assets.items[0].id);
       expect(trashedAsset.originalPath).toBe(`${testAssetDirInternal}/temp/offline/offline.png`);
@@ -588,7 +592,7 @@ describe('/libraries', () => {
       expect(newAssets.items).toEqual([]);
     });
 
-    it('should set an asset offline its file is not in any import path', async () => {
+    it('should set an asset offline if its file is not in any import path', async () => {
       utils.createImageFile(`${testAssetDir}/temp/offline/offline.png`);
 
       const library = await utils.createLibrary(admin.accessToken, {
@@ -596,26 +600,18 @@ describe('/libraries', () => {
         importPaths: [`${testAssetDirInternal}/temp/offline`],
       });
 
-      await scan(admin.accessToken, library.id);
-      await utils.waitForQueueFinish(admin.accessToken, 'library');
+      await utils.scan(admin.accessToken, library.id);
 
       const { assets } = await utils.searchAssets(admin.accessToken, { libraryId: library.id });
       expect(assets.count).toBe(1);
 
       utils.createDirectory(`${testAssetDir}/temp/another-path/`);
 
-      await request(app)
-        .put(`/libraries/${library.id}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ importPaths: [`${testAssetDirInternal}/temp/another-path/`] });
+      await utils.updateLibrary(admin.accessToken, library.id, {
+        importPaths: [`${testAssetDirInternal}/temp/another-path/`],
+      });
 
-      const { status } = await request(app)
-        .post(`/libraries/${library.id}/scan`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send();
-      expect(status).toBe(204);
-
-      await utils.waitForQueueFinish(admin.accessToken, 'library');
+      await utils.scan(admin.accessToken, library.id);
 
       const trashedAsset = await utils.getAssetInfo(admin.accessToken, assets.items[0].id);
       expect(trashedAsset.originalPath).toBe(`${testAssetDirInternal}/temp/offline/offline.png`);
@@ -635,8 +631,7 @@ describe('/libraries', () => {
         importPaths: [`${testAssetDirInternal}/temp`],
       });
 
-      await scan(admin.accessToken, library.id);
-      await utils.waitForQueueFinish(admin.accessToken, 'library');
+      await utils.scan(admin.accessToken, library.id);
 
       const { assets } = await utils.searchAssets(admin.accessToken, {
         libraryId: library.id,
@@ -644,13 +639,9 @@ describe('/libraries', () => {
       });
       expect(assets.count).toBe(1);
 
-      await request(app)
-        .put(`/libraries/${library.id}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ exclusionPatterns: ['**/directoryB/**'] });
+      await utils.updateLibrary(admin.accessToken, library.id, { exclusionPatterns: ['**/directoryB/**'] });
 
-      await scan(admin.accessToken, library.id);
-      await utils.waitForQueueFinish(admin.accessToken, 'library');
+      await utils.scan(admin.accessToken, library.id);
 
       const trashedAsset = await utils.getAssetInfo(admin.accessToken, assets.items[0].id);
       expect(trashedAsset.isTrashed).toBe(true);
@@ -666,25 +657,18 @@ describe('/libraries', () => {
       ]);
     });
 
-    it('should not trash an online asset', async () => {
+    it('should not set an asset offline if its file exists, is in an import path, and not covered by an exclusion pattern', async () => {
       const library = await utils.createLibrary(admin.accessToken, {
         ownerId: admin.userId,
         importPaths: [`${testAssetDirInternal}/temp`],
       });
 
-      await scan(admin.accessToken, library.id);
-      await utils.waitForQueueFinish(admin.accessToken, 'library');
+      await utils.scan(admin.accessToken, library.id);
 
       const { assets: assetsBefore } = await utils.searchAssets(admin.accessToken, { libraryId: library.id });
       expect(assetsBefore.count).toBeGreaterThan(1);
 
-      const { status } = await request(app)
-        .post(`/libraries/${library.id}/scan`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send();
-      expect(status).toBe(204);
-
-      await utils.waitForQueueFinish(admin.accessToken, 'library');
+      await utils.scan(admin.accessToken, library.id);
 
       const { assets } = await utils.searchAssets(admin.accessToken, { libraryId: library.id });
 
@@ -701,11 +685,7 @@ describe('/libraries', () => {
         cpSync(`${testAssetDir}/metadata/xmp/dates/2000.xmp`, `${testAssetDir}/temp/xmp/glarus.xmp`);
         cpSync(`${testAssetDir}/formats/raw/Nikon/D80/glarus.nef`, `${testAssetDir}/temp/xmp/glarus.nef`);
 
-        await scan(admin.accessToken, library.id);
-
-        await utils.waitForQueueFinish(admin.accessToken, 'library');
-        await utils.waitForQueueFinish(admin.accessToken, 'sidecar');
-        await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
+        await utils.scan(admin.accessToken, library.id);
 
         const { assets: newAssets } = await utils.searchAssets(admin.accessToken, { libraryId: library.id });
 
@@ -728,10 +708,7 @@ describe('/libraries', () => {
         cpSync(`${testAssetDir}/metadata/xmp/dates/2000.xmp`, `${testAssetDir}/temp/xmp/glarus.nef.xmp`);
         cpSync(`${testAssetDir}/formats/raw/Nikon/D80/glarus.nef`, `${testAssetDir}/temp/xmp/glarus.nef`);
 
-        await scan(admin.accessToken, library.id);
-        await utils.waitForQueueFinish(admin.accessToken, 'library');
-        await utils.waitForQueueFinish(admin.accessToken, 'sidecar');
-        await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
+        await utils.scan(admin.accessToken, library.id);
 
         const { assets: newAssets } = await utils.searchAssets(admin.accessToken, { libraryId: library.id });
 
@@ -755,10 +732,7 @@ describe('/libraries', () => {
         cpSync(`${testAssetDir}/metadata/xmp/dates/2010.xmp`, `${testAssetDir}/temp/xmp/glarus.xmp`);
         cpSync(`${testAssetDir}/formats/raw/Nikon/D80/glarus.nef`, `${testAssetDir}/temp/xmp/glarus.nef`);
 
-        await scan(admin.accessToken, library.id);
-        await utils.waitForQueueFinish(admin.accessToken, 'library');
-        await utils.waitForQueueFinish(admin.accessToken, 'sidecar');
-        await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
+        await utils.scan(admin.accessToken, library.id);
 
         const { assets: newAssets } = await utils.searchAssets(admin.accessToken, { libraryId: library.id });
 
@@ -782,19 +756,13 @@ describe('/libraries', () => {
         cpSync(`${testAssetDir}/formats/raw/Nikon/D80/glarus.nef`, `${testAssetDir}/temp/xmp/glarus.nef`);
         await utimes(`${testAssetDir}/temp/xmp/glarus.nef`, 447_775_200_000);
 
-        await scan(admin.accessToken, library.id);
-        await utils.waitForQueueFinish(admin.accessToken, 'library');
-        await utils.waitForQueueFinish(admin.accessToken, 'sidecar');
-        await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
+        await utils.scan(admin.accessToken, library.id);
 
         cpSync(`${testAssetDir}/metadata/xmp/dates/2010.xmp`, `${testAssetDir}/temp/xmp/glarus.nef.xmp`);
         unlinkSync(`${testAssetDir}/temp/xmp/glarus.xmp`);
         await utimes(`${testAssetDir}/temp/xmp/glarus.nef`, 447_775_200_001);
 
-        await scan(admin.accessToken, library.id);
-        await utils.waitForQueueFinish(admin.accessToken, 'library');
-        await utils.waitForQueueFinish(admin.accessToken, 'sidecar');
-        await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
+        await utils.scan(admin.accessToken, library.id);
 
         const { assets: newAssets } = await utils.searchAssets(admin.accessToken, { libraryId: library.id });
 
@@ -817,18 +785,12 @@ describe('/libraries', () => {
         cpSync(`${testAssetDir}/formats/raw/Nikon/D80/glarus.nef`, `${testAssetDir}/temp/xmp/glarus.nef`);
         await utimes(`${testAssetDir}/temp/xmp/glarus.nef`, 447_775_200_000);
 
-        await scan(admin.accessToken, library.id);
-        await utils.waitForQueueFinish(admin.accessToken, 'library');
-        await utils.waitForQueueFinish(admin.accessToken, 'sidecar');
-        await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
+        await utils.scan(admin.accessToken, library.id);
 
         cpSync(`${testAssetDir}/metadata/xmp/dates/2000.xmp`, `${testAssetDir}/temp/xmp/glarus.xmp`);
         await utimes(`${testAssetDir}/temp/xmp/glarus.nef`, 447_775_200_001);
 
-        await scan(admin.accessToken, library.id);
-        await utils.waitForQueueFinish(admin.accessToken, 'library');
-        await utils.waitForQueueFinish(admin.accessToken, 'sidecar');
-        await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
+        await utils.scan(admin.accessToken, library.id);
 
         const { assets: newAssets } = await utils.searchAssets(admin.accessToken, { libraryId: library.id });
 
@@ -851,18 +813,12 @@ describe('/libraries', () => {
         cpSync(`${testAssetDir}/formats/raw/Nikon/D80/glarus.nef`, `${testAssetDir}/temp/xmp/glarus.nef`);
         await utimes(`${testAssetDir}/temp/xmp/glarus.nef`, 447_775_200_000);
 
-        await scan(admin.accessToken, library.id);
-        await utils.waitForQueueFinish(admin.accessToken, 'library');
-        await utils.waitForQueueFinish(admin.accessToken, 'sidecar');
-        await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
+        await utils.scan(admin.accessToken, library.id);
 
         cpSync(`${testAssetDir}/metadata/xmp/dates/2000.xmp`, `${testAssetDir}/temp/xmp/glarus.nef.xmp`);
         await utimes(`${testAssetDir}/temp/xmp/glarus.nef`, 447_775_200_001);
 
-        await scan(admin.accessToken, library.id);
-        await utils.waitForQueueFinish(admin.accessToken, 'library');
-        await utils.waitForQueueFinish(admin.accessToken, 'sidecar');
-        await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
+        await utils.scan(admin.accessToken, library.id);
 
         const { assets: newAssets } = await utils.searchAssets(admin.accessToken, { libraryId: library.id });
 
@@ -886,19 +842,13 @@ describe('/libraries', () => {
         cpSync(`${testAssetDir}/formats/raw/Nikon/D80/glarus.nef`, `${testAssetDir}/temp/xmp/glarus.nef`);
         await utimes(`${testAssetDir}/temp/xmp/glarus.nef`, 447_775_200_000);
 
-        await scan(admin.accessToken, library.id);
-        await utils.waitForQueueFinish(admin.accessToken, 'library');
-        await utils.waitForQueueFinish(admin.accessToken, 'sidecar');
-        await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
+        await utils.scan(admin.accessToken, library.id);
 
         cpSync(`${testAssetDir}/metadata/xmp/dates/2010.xmp`, `${testAssetDir}/temp/xmp/glarus.xmp`);
         unlinkSync(`${testAssetDir}/temp/xmp/glarus.nef.xmp`);
         await utimes(`${testAssetDir}/temp/xmp/glarus.nef`, 447_775_200_001);
 
-        await scan(admin.accessToken, library.id);
-        await utils.waitForQueueFinish(admin.accessToken, 'library');
-        await utils.waitForQueueFinish(admin.accessToken, 'sidecar');
-        await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
+        await utils.scan(admin.accessToken, library.id);
 
         const { assets: newAssets } = await utils.searchAssets(admin.accessToken, { libraryId: library.id });
 
@@ -922,18 +872,12 @@ describe('/libraries', () => {
         cpSync(`${testAssetDir}/formats/raw/Nikon/D80/glarus.nef`, `${testAssetDir}/temp/xmp/glarus.nef`);
         await utimes(`${testAssetDir}/temp/xmp/glarus.nef`, 447_775_200_000);
 
-        await scan(admin.accessToken, library.id);
-        await utils.waitForQueueFinish(admin.accessToken, 'library');
-        await utils.waitForQueueFinish(admin.accessToken, 'sidecar');
-        await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
+        await utils.scan(admin.accessToken, library.id);
 
         unlinkSync(`${testAssetDir}/temp/xmp/glarus.nef.xmp`);
         await utimes(`${testAssetDir}/temp/xmp/glarus.nef`, 447_775_200_001);
 
-        await scan(admin.accessToken, library.id);
-        await utils.waitForQueueFinish(admin.accessToken, 'library');
-        await utils.waitForQueueFinish(admin.accessToken, 'sidecar');
-        await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
+        await utils.scan(admin.accessToken, library.id);
 
         const { assets: newAssets } = await utils.searchAssets(admin.accessToken, { libraryId: library.id });
 
@@ -957,18 +901,12 @@ describe('/libraries', () => {
         cpSync(`${testAssetDir}/formats/raw/Nikon/D80/glarus.nef`, `${testAssetDir}/temp/xmp/glarus.nef`);
         await utimes(`${testAssetDir}/temp/xmp/glarus.nef`, 447_775_200_000);
 
-        await scan(admin.accessToken, library.id);
-        await utils.waitForQueueFinish(admin.accessToken, 'library');
-        await utils.waitForQueueFinish(admin.accessToken, 'sidecar');
-        await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
+        await utils.scan(admin.accessToken, library.id);
 
         unlinkSync(`${testAssetDir}/temp/xmp/glarus.xmp`);
         await utimes(`${testAssetDir}/temp/xmp/glarus.nef`, 447_775_200_001);
 
-        await scan(admin.accessToken, library.id);
-        await utils.waitForQueueFinish(admin.accessToken, 'library');
-        await utils.waitForQueueFinish(admin.accessToken, 'sidecar');
-        await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
+        await utils.scan(admin.accessToken, library.id);
 
         const { assets: newAssets } = await utils.searchAssets(admin.accessToken, { libraryId: library.id });
 
@@ -982,6 +920,144 @@ describe('/libraries', () => {
         rmSync(`${testAssetDir}/temp/xmp`, { recursive: true, force: true });
       });
     });
+
+    it('should set an offline asset to online if its file exists, is in an import path, and not covered by an exclusion pattern', async () => {
+      utils.createImageFile(`${testAssetDir}/temp/offline/offline.png`);
+
+      const library = await utils.createLibrary(admin.accessToken, {
+        ownerId: admin.userId,
+        importPaths: [`${testAssetDirInternal}/temp/offline`],
+      });
+
+      await utils.scan(admin.accessToken, library.id);
+
+      const { assets } = await utils.searchAssets(admin.accessToken, { libraryId: library.id });
+
+      utils.renameImageFile(`${testAssetDir}/temp/offline/offline.png`, `${testAssetDir}/temp/offline.png`);
+
+      await utils.scan(admin.accessToken, library.id);
+
+      const offlineAsset = await utils.getAssetInfo(admin.accessToken, assets.items[0].id);
+      expect(offlineAsset.isTrashed).toBe(true);
+      expect(offlineAsset.originalPath).toBe(`${testAssetDirInternal}/temp/offline/offline.png`);
+      expect(offlineAsset.isOffline).toBe(true);
+
+      {
+        const { assets } = await utils.searchAssets(admin.accessToken, { libraryId: library.id, withDeleted: true });
+        expect(assets.count).toBe(1);
+      }
+
+      utils.renameImageFile(`${testAssetDir}/temp/offline.png`, `${testAssetDir}/temp/offline/offline.png`);
+
+      await utils.scan(admin.accessToken, library.id);
+
+      const backOnlineAsset = await utils.getAssetInfo(admin.accessToken, assets.items[0].id);
+
+      expect(backOnlineAsset.isTrashed).toBe(false);
+      expect(backOnlineAsset.originalPath).toBe(`${testAssetDirInternal}/temp/offline/offline.png`);
+      expect(backOnlineAsset.isOffline).toBe(false);
+
+      {
+        const { assets } = await utils.searchAssets(admin.accessToken, { libraryId: library.id });
+        expect(assets.count).toBe(1);
+      }
+    });
+
+    it('should not set an offline asset to online if its file exists, is not covered by an exclusion pattern, but is outside of all import paths', async () => {
+      utils.createImageFile(`${testAssetDir}/temp/offline/offline.png`);
+
+      const library = await utils.createLibrary(admin.accessToken, {
+        ownerId: admin.userId,
+        importPaths: [`${testAssetDirInternal}/temp/offline`],
+      });
+
+      await utils.scan(admin.accessToken, library.id);
+
+      const { assets } = await utils.searchAssets(admin.accessToken, { libraryId: library.id });
+
+      utils.renameImageFile(`${testAssetDir}/temp/offline/offline.png`, `${testAssetDir}/temp/offline.png`);
+
+      await utils.scan(admin.accessToken, library.id);
+
+      {
+        const { assets } = await utils.searchAssets(admin.accessToken, { libraryId: library.id, withDeleted: true });
+        expect(assets.count).toBe(1);
+      }
+
+      const offlineAsset = await utils.getAssetInfo(admin.accessToken, assets.items[0].id);
+
+      expect(offlineAsset.isTrashed).toBe(true);
+      expect(offlineAsset.originalPath).toBe(`${testAssetDirInternal}/temp/offline/offline.png`);
+      expect(offlineAsset.isOffline).toBe(true);
+
+      utils.renameImageFile(`${testAssetDir}/temp/offline.png`, `${testAssetDir}/temp/offline/offline.png`);
+
+      utils.createDirectory(`${testAssetDir}/temp/another-path/`);
+
+      await utils.updateLibrary(admin.accessToken, library.id, {
+        importPaths: [`${testAssetDirInternal}/temp/another-path`],
+      });
+
+      await utils.scan(admin.accessToken, library.id);
+
+      const stillOfflineAsset = await utils.getAssetInfo(admin.accessToken, assets.items[0].id);
+
+      expect(stillOfflineAsset.isTrashed).toBe(true);
+      expect(stillOfflineAsset.originalPath).toBe(`${testAssetDirInternal}/temp/offline/offline.png`);
+      expect(stillOfflineAsset.isOffline).toBe(true);
+
+      {
+        const { assets } = await utils.searchAssets(admin.accessToken, { libraryId: library.id, withDeleted: true });
+        expect(assets.count).toBe(1);
+      }
+
+      utils.removeDirectory(`${testAssetDir}/temp/another-path/`);
+    });
+
+    it('should not set an offline asset to online if its file exists, is in an import path, but is covered by an exclusion pattern', async () => {
+      utils.createImageFile(`${testAssetDir}/temp/offline/offline.png`);
+
+      const library = await utils.createLibrary(admin.accessToken, {
+        ownerId: admin.userId,
+        importPaths: [`${testAssetDirInternal}/temp/offline`],
+      });
+
+      await utils.scan(admin.accessToken, library.id);
+
+      const { assets } = await utils.searchAssets(admin.accessToken, { libraryId: library.id });
+
+      utils.renameImageFile(`${testAssetDir}/temp/offline/offline.png`, `${testAssetDir}/temp/offline.png`);
+
+      await utils.scan(admin.accessToken, library.id);
+
+      {
+        const { assets } = await utils.searchAssets(admin.accessToken, { libraryId: library.id, withDeleted: true });
+        expect(assets.count).toBe(1);
+      }
+
+      const offlineAsset = await utils.getAssetInfo(admin.accessToken, assets.items[0].id);
+
+      expect(offlineAsset.isTrashed).toBe(true);
+      expect(offlineAsset.originalPath).toBe(`${testAssetDirInternal}/temp/offline/offline.png`);
+      expect(offlineAsset.isOffline).toBe(true);
+
+      utils.renameImageFile(`${testAssetDir}/temp/offline.png`, `${testAssetDir}/temp/offline/offline.png`);
+
+      await utils.updateLibrary(admin.accessToken, library.id, { exclusionPatterns: ['**/offline/**'] });
+
+      await utils.scan(admin.accessToken, library.id);
+
+      const stillOfflineAsset = await utils.getAssetInfo(admin.accessToken, assets.items[0].id);
+
+      expect(stillOfflineAsset.isTrashed).toBe(true);
+      expect(stillOfflineAsset.originalPath).toBe(`${testAssetDirInternal}/temp/offline/offline.png`);
+      expect(stillOfflineAsset.isOffline).toBe(true);
+
+      {
+        const { assets } = await utils.searchAssets(admin.accessToken, { libraryId: library.id, withDeleted: true });
+        expect(assets.count).toBe(1);
+      }
+    });
   });
 
   describe('POST /libraries/:id/validate', () => {
@@ -1089,8 +1165,7 @@ describe('/libraries', () => {
         importPaths: [`${testAssetDirInternal}/temp`],
       });
 
-      await scan(admin.accessToken, library.id);
-      await utils.waitForQueueFinish(admin.accessToken, 'library');
+      await utils.scan(admin.accessToken, library.id);
 
       const { status, body } = await request(app)
         .delete(`/libraries/${library.id}`)

e2e/src/api/specs/memory.e2e-spec.ts

@@ -93,8 +93,6 @@ describe('/memories', () => {
         data: { year: 2021 },
         createdAt: expect.any(String),
         updatedAt: expect.any(String),
-        deletedAt: null,
-        seenAt: null,
         isSaved: false,
         memoryAt: expect.any(String),
         ownerId: user.userId,

e2e/src/api/specs/oauth.e2e-spec.ts

@@ -13,8 +13,8 @@ import request from 'supertest';
 import { beforeAll, describe, expect, it } from 'vitest';
 
 const authServer = {
-  internal: 'http://auth-server:3000',
-  external: 'http://127.0.0.1:3000',
+  internal: 'http://auth-server:2286',
+  external: 'http://127.0.0.1:2286',
 };
 
 const mobileOverrideRedirectUri = 'https://photos.immich.app/oauth/mobile-redirect';

e2e/src/api/specs/person.e2e-spec.ts

@@ -1,7 +1,7 @@
-import { LoginResponseDto, PersonResponseDto } from '@immich/sdk';
+import { getPerson, LoginResponseDto, PersonResponseDto } from '@immich/sdk';
 import { uuidDto } from 'src/fixtures';
 import { errorDto } from 'src/responses';
-import { app, utils } from 'src/utils';
+import { app, asBearerAuth, utils } from 'src/utils';
 import request from 'supertest';
 import { beforeAll, beforeEach, describe, expect, it } from 'vitest';
 
@@ -195,12 +195,29 @@ describe('/people', () => {
         .send({
           name: 'New Person',
           birthDate: '1990-01-01',
+          color: '#333',
         });
       expect(status).toBe(201);
       expect(body).toMatchObject({
         id: expect.any(String),
         name: 'New Person',
-        birthDate: '1990-01-01',
+        birthDate: '1990-01-01T00:00:00.000Z',
+      });
+    });
+
+    it('should create a favorite person', async () => {
+      const { status, body } = await request(app)
+        .post(`/people`)
+        .set('Authorization', `Bearer ${admin.accessToken}`)
+        .send({
+          name: 'New Favorite Person',
+          isFavorite: true,
+        });
+      expect(status).toBe(201);
+      expect(body).toMatchObject({
+        id: expect.any(String),
+        name: 'New Favorite Person',
+        isFavorite: true,
       });
     });
   });
@@ -216,6 +233,7 @@ describe('/people', () => {
       { key: 'name', type: 'string' },
       { key: 'featureFaceAssetId', type: 'string' },
       { key: 'isHidden', type: 'boolean value' },
+      { key: 'isFavorite', type: 'boolean value' },
     ]) {
       it(`should not allow null ${key}`, async () => {
         const { status, body } = await request(app)
@@ -244,7 +262,7 @@ describe('/people', () => {
         .set('Authorization', `Bearer ${admin.accessToken}`)
         .send({ birthDate: '1990-01-01' });
       expect(status).toBe(200);
-      expect(body).toMatchObject({ birthDate: '1990-01-01' });
+      expect(body).toMatchObject({ birthDate: '1990-01-01T00:00:00.000Z' });
     });
 
     it('should clear a date of birth', async () => {
@@ -255,6 +273,42 @@ describe('/people', () => {
       expect(status).toBe(200);
       expect(body).toMatchObject({ birthDate: null });
     });
+
+    it('should set a color', async () => {
+      const { status, body } = await request(app)
+        .put(`/people/${visiblePerson.id}`)
+        .set('Authorization', `Bearer ${admin.accessToken}`)
+        .send({ color: '#555' });
+      expect(status).toBe(200);
+      expect(body).toMatchObject({ color: '#555' });
+    });
+
+    it('should clear a color', async () => {
+      const { status, body } = await request(app)
+        .put(`/people/${visiblePerson.id}`)
+        .set('Authorization', `Bearer ${admin.accessToken}`)
+        .send({ color: null });
+      expect(status).toBe(200);
+      expect(body.color).toBeUndefined();
+    });
+
+    it('should mark a person as favorite', async () => {
+      const person = await utils.createPerson(admin.accessToken, {
+        name: 'visible_person',
+      });
+
+      expect(person.isFavorite).toBe(false);
+
+      const { status, body } = await request(app)
+        .put(`/people/${person.id}`)
+        .set('Authorization', `Bearer ${admin.accessToken}`)
+        .send({ isFavorite: true });
+      expect(status).toBe(200);
+      expect(body).toMatchObject({ isFavorite: true });
+
+      const person2 = await getPerson({ id: person.id }, { headers: asBearerAuth(admin.accessToken) });
+      expect(person2).toMatchObject({ id: person.id, isFavorite: true });
+    });
   });
 
   describe('POST /people/:id/merge', () => {

e2e/src/api/specs/search.e2e-spec.ts

@@ -1,10 +1,10 @@
-import { AssetMediaResponseDto, LoginResponseDto, deleteAssets, updateAsset } from '@immich/sdk';
+import { AssetMediaResponseDto, AssetResponseDto, deleteAssets, LoginResponseDto, updateAsset } from '@immich/sdk';
 import { DateTime } from 'luxon';
 import { readFile } from 'node:fs/promises';
 import { join } from 'node:path';
 import { Socket } from 'socket.io-client';
 import { errorDto } from 'src/responses';
-import { app, asBearerAuth, testAssetDir, utils } from 'src/utils';
+import { app, asBearerAuth, TEN_TIMES, testAssetDir, utils } from 'src/utils';
 import request from 'supertest';
 import { afterAll, beforeAll, describe, expect, it } from 'vitest';
 const today = DateTime.now();
@@ -462,6 +462,55 @@ describe('/search', () => {
     });
   });
 
+  describe('POST /search/random', () => {
+    beforeAll(async () => {
+      await Promise.all([
+        utils.createAsset(admin.accessToken),
+        utils.createAsset(admin.accessToken),
+        utils.createAsset(admin.accessToken),
+        utils.createAsset(admin.accessToken),
+        utils.createAsset(admin.accessToken),
+        utils.createAsset(admin.accessToken),
+      ]);
+
+      await utils.waitForQueueFinish(admin.accessToken, 'thumbnailGeneration');
+    });
+
+    it('should require authentication', async () => {
+      const { status, body } = await request(app).post('/search/random').send({ size: 1 });
+
+      expect(status).toBe(401);
+      expect(body).toEqual(errorDto.unauthorized);
+    });
+
+    it.each(TEN_TIMES)('should return 1 random assets', async () => {
+      const { status, body } = await request(app)
+        .post('/search/random')
+        .send({ size: 1 })
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+
+      expect(status).toBe(200);
+
+      const assets: AssetResponseDto[] = body;
+      expect(assets.length).toBe(1);
+      expect(assets[0].ownerId).toBe(admin.userId);
+    });
+
+    it.each(TEN_TIMES)('should return 2 random assets', async () => {
+      const { status, body } = await request(app)
+        .post('/search/random')
+        .send({ size: 2 })
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+
+      expect(status).toBe(200);
+
+      const assets: AssetResponseDto[] = body;
+      expect(assets.length).toBe(2);
+      expect(assets[0].ownerId).toBe(admin.userId);
+      expect(assets[1].ownerId).toBe(admin.userId);
+    });
+  });
+
   describe('GET /search/explore', () => {
     it('should require authentication', async () => {
       const { status, body } = await request(app).get('/search/explore');

e2e/src/api/specs/shared-link.e2e-spec.ts

@@ -89,13 +89,13 @@ describe('/shared-links', () => {
     await deleteUserAdmin({ id: user2.userId, userAdminDeleteDto: {} }, { headers: asBearerAuth(admin.accessToken) });
   });
 
-  describe('GET /share/${key}', () => {
+  describe('GET /share/:key', () => {
     it('should have correct asset count in meta tag for non-empty album', async () => {
       const resp = await request(shareUrl).get(`/${linkWithMetadata.key}`);
       expect(resp.status).toBe(200);
       expect(resp.header['content-type']).toContain('text/html');
       expect(resp.text).toContain(
-        `<meta name="description" content="${metadataAlbum.assets.length} shared photos & videos" />`,
+        `<meta name="description" content="${metadataAlbum.assets.length} shared photos &amp; videos" />`,
       );
     });
 
@@ -103,14 +103,14 @@ describe('/shared-links', () => {
       const resp = await request(shareUrl).get(`/${linkWithAlbum.key}`);
       expect(resp.status).toBe(200);
       expect(resp.header['content-type']).toContain('text/html');
-      expect(resp.text).toContain(`<meta name="description" content="0 shared photos & videos" />`);
+      expect(resp.text).toContain(`<meta name="description" content="0 shared photos &amp; videos" />`);
     });
 
     it('should have correct asset count in meta tag for shared asset', async () => {
       const resp = await request(shareUrl).get(`/${linkWithAssets.key}`);
       expect(resp.status).toBe(200);
       expect(resp.header['content-type']).toContain('text/html');
-      expect(resp.text).toContain(`<meta name="description" content="1 shared photos & videos" />`);
+      expect(resp.text).toContain(`<meta name="description" content="1 shared photos &amp; videos" />`);
     });
 
     it('should have fqdn og:image meta tag for shared asset', async () => {
@@ -139,7 +139,10 @@ describe('/shared-links', () => {
       expect(body).toEqual(
         expect.arrayContaining([
           expect.objectContaining({ id: linkWithAlbum.id }),
-          expect.objectContaining({ id: linkWithAssets.id }),
+          expect.objectContaining({
+            id: linkWithAssets.id,
+            assets: expect.arrayContaining([expect.objectContaining({ id: asset1.id })]),
+          }),
           expect.objectContaining({ id: linkWithPassword.id }),
           expect.objectContaining({ id: linkWithMetadata.id }),
           expect.objectContaining({ id: linkWithoutMetadata.id }),
@@ -147,6 +150,30 @@ describe('/shared-links', () => {
       );
     });
 
+    it('should filter on albumId', async () => {
+      const { status, body } = await request(app)
+        .get(`/shared-links?albumId=${album.id}`)
+        .set('Authorization', `Bearer ${user1.accessToken}`);
+
+      expect(status).toBe(200);
+      expect(body).toHaveLength(2);
+      expect(body).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ id: linkWithAlbum.id }),
+          expect.objectContaining({ id: linkWithPassword.id }),
+        ]),
+      );
+    });
+
+    it('should find 0 albums', async () => {
+      const { status, body } = await request(app)
+        .get(`/shared-links?albumId=${uuidDto.notFound}`)
+        .set('Authorization', `Bearer ${user1.accessToken}`);
+
+      expect(status).toBe(200);
+      expect(body).toHaveLength(0);
+    });
+
     it('should not get shared links created by other users', async () => {
       const { status, body } = await request(app)
         .get('/shared-links')
@@ -170,7 +197,7 @@ describe('/shared-links', () => {
       expect(status).toBe(200);
       expect(body).toEqual(
         expect.objectContaining({
-          album,
+          album: expect.objectContaining({ id: album.id }),
           userId: user1.userId,
           type: SharedLinkType.Album,
         }),
@@ -208,7 +235,7 @@ describe('/shared-links', () => {
       expect(status).toBe(200);
       expect(body).toEqual(
         expect.objectContaining({
-          album,
+          album: expect.objectContaining({ id: album.id }),
           userId: user1.userId,
           type: SharedLinkType.Album,
         }),
@@ -262,7 +289,7 @@ describe('/shared-links', () => {
       expect(status).toBe(200);
       expect(body).toEqual(
         expect.objectContaining({
-          album,
+          album: expect.objectContaining({ id: album.id }),
           userId: user1.userId,
           type: SharedLinkType.Album,
         }),

e2e/src/api/specs/stack.e2e-spec.ts

@@ -119,93 +119,84 @@ describe('/stacks', () => {
       const stacksAfter = await searchStacks({}, { headers: asBearerAuth(user1.accessToken) });
       expect(stacksAfter.length).toBe(stacksBefore.length);
     });
-
-    // it('should require a valid parent id', async () => {
-    //   const { status, body } = await request(app)
-    //     .put('/assets')
-    //     .set('Authorization', `Bearer ${user1.accessToken}`)
-    //     .send({ stackParentId: uuidDto.invalid, ids: [stackAssets[0].id] });
-
-    //   expect(status).toBe(400);
-    //   expect(body).toEqual(errorDto.badRequest(['stackParentId must be a UUID']));
-    // });
   });
 
-  // it('should require access to the parent', async () => {
-  //   const { status, body } = await request(app)
-  //     .put('/assets')
-  //     .set('Authorization', `Bearer ${user1.accessToken}`)
-  //     .send({ stackParentId: stackAssets[3].id, ids: [user1Assets[0].id] });
+  describe('GET /assets/:id', () => {
+    it('should include stack details for the primary asset', async () => {
+      const [asset1, asset2] = await Promise.all([
+        utils.createAsset(user1.accessToken),
+        utils.createAsset(user1.accessToken),
+      ]);
 
-  //   expect(status).toBe(400);
-  //   expect(body).toEqual(errorDto.noPermission);
-  // });
+      await utils.createStack(user1.accessToken, [asset1.id, asset2.id]);
 
-  // it('should add stack children', async () => {
-  //   const { status } = await request(app)
-  //     .put('/assets')
-  //     .set('Authorization', `Bearer ${stackUser.accessToken}`)
-  //     .send({ stackParentId: stackAssets[0].id, ids: [stackAssets[3].id] });
+      const { status, body } = await request(app)
+        .get(`/assets/${asset1.id}`)
+        .set('Authorization', `Bearer ${user1.accessToken}`);
 
-  //   expect(status).toBe(204);
+      expect(status).toBe(200);
+      expect(body).toEqual(
+        expect.objectContaining({
+          id: asset1.id,
+          stack: {
+            id: expect.any(String),
+            assetCount: 2,
+            primaryAssetId: asset1.id,
+          },
+        }),
+      );
+    });
 
-  //   const asset = await getAssetInfo({ id: stackAssets[0].id }, { headers: asBearerAuth(stackUser.accessToken) });
-  //   expect(asset.stack).not.toBeUndefined();
-  //   expect(asset.stack).toEqual(expect.arrayContaining([expect.objectContaining({ id: stackAssets[3].id })]));
-  // });
+    it('should include stack details for a non-primary asset', async () => {
+      const [asset1, asset2] = await Promise.all([
+        utils.createAsset(user1.accessToken),
+        utils.createAsset(user1.accessToken),
+      ]);
 
-  // it('should remove stack children', async () => {
-  //   const { status } = await request(app)
-  //     .put('/assets')
-  //     .set('Authorization', `Bearer ${stackUser.accessToken}`)
-  //     .send({ removeParent: true, ids: [stackAssets[1].id] });
+      await utils.createStack(user1.accessToken, [asset1.id, asset2.id]);
 
-  //   expect(status).toBe(204);
+      const { status, body } = await request(app)
+        .get(`/assets/${asset2.id}`)
+        .set('Authorization', `Bearer ${user1.accessToken}`);
 
-  //   const asset = await getAssetInfo({ id: stackAssets[0].id }, { headers: asBearerAuth(stackUser.accessToken) });
-  //   expect(asset.stack).not.toBeUndefined();
-  //   expect(asset.stack).toEqual(
-  //     expect.arrayContaining([
-  //       expect.objectContaining({ id: stackAssets[2].id }),
-  //       expect.objectContaining({ id: stackAssets[3].id }),
-  //     ]),
-  //   );
-  // });
+      expect(status).toBe(200);
+      expect(body).toEqual(
+        expect.objectContaining({
+          id: asset2.id,
+          stack: {
+            id: expect.any(String),
+            assetCount: 2,
+            primaryAssetId: asset1.id,
+          },
+        }),
+      );
+    });
+  });
 
-  // it('should remove all stack children', async () => {
-  //   const { status } = await request(app)
-  //     .put('/assets')
-  //     .set('Authorization', `Bearer ${stackUser.accessToken}`)
-  //     .send({ removeParent: true, ids: [stackAssets[2].id, stackAssets[3].id] });
+  describe('GET /stacks/:id', () => {
+    it('should include exifInfo in stack assets', async () => {
+      const [asset1, asset2] = await Promise.all([
+        utils.createAsset(user1.accessToken),
+        utils.createAsset(user1.accessToken),
+      ]);
 
-  //   expect(status).toBe(204);
+      const stack = await utils.createStack(user1.accessToken, [asset1.id, asset2.id]);
 
-  //   const asset = await getAssetInfo({ id: stackAssets[0].id }, { headers: asBearerAuth(stackUser.accessToken) });
-  //   expect(asset.stack).toBeUndefined();
-  // });
+      const { status, body } = await request(app)
+        .get(`/stacks/${stack.id}`)
+        .set('Authorization', `Bearer ${user1.accessToken}`);
 
-  // it('should merge stack children', async () => {
-  //   // create stack after previous test removed stack children
-  //   await updateAssets(
-  //     { assetBulkUpdateDto: { stackParentId: stackAssets[0].id, ids: [stackAssets[1].id, stackAssets[2].id] } },
-  //     { headers: asBearerAuth(stackUser.accessToken) },
-  //   );
-
-  //   const { status } = await request(app)
-  //     .put('/assets')
-  //     .set('Authorization', `Bearer ${stackUser.accessToken}`)
-  //     .send({ stackParentId: stackAssets[3].id, ids: [stackAssets[0].id] });
-
-  //   expect(status).toBe(204);
-
-  //   const asset = await getAssetInfo({ id: stackAssets[3].id }, { headers: asBearerAuth(stackUser.accessToken) });
-  //   expect(asset.stack).not.toBeUndefined();
-  //   expect(asset.stack).toEqual(
-  //     expect.arrayContaining([
-  //       expect.objectContaining({ id: stackAssets[0].id }),
-  //       expect.objectContaining({ id: stackAssets[1].id }),
-  //       expect.objectContaining({ id: stackAssets[2].id }),
-  //     ]),
-  //   );
-  // });
+      expect(status).toBe(200);
+      expect(body).toEqual(
+        expect.objectContaining({
+          id: stack.id,
+          primaryAssetId: asset1.id,
+          assets: expect.arrayContaining([
+            expect.objectContaining({ id: asset1.id, exifInfo: expect.any(Object) }),
+            expect.objectContaining({ id: asset2.id, exifInfo: expect.any(Object) }),
+          ]),
+        }),
+      );
+    });
+  });
 });

e2e/src/api/specs/trash.e2e-spec.ts

@@ -73,7 +73,7 @@ describe('/trash', () => {
       expect(existsSync(before.originalPath)).toBe(false);
     });
 
-    it('should not delete offline-trashed assets from disk', async () => {
+    it('should remove offline assets', async () => {
       const library = await utils.createLibrary(admin.accessToken, {
         ownerId: admin.userId,
         importPaths: [`${testAssetDirInternal}/temp/offline`],
@@ -88,7 +88,7 @@ describe('/trash', () => {
       expect(assets.items.length).toBe(1);
       const asset = assets.items[0];
 
-      utils.removeImageFile(`${testAssetDir}/temp/offline/offline.png`);
+      await utils.updateLibrary(admin.accessToken, library.id, { exclusionPatterns: ['**/offline/**'] });
 
       await scan(admin.accessToken, library.id);
       await utils.waitForQueueFinish(admin.accessToken, 'library');
@@ -105,6 +105,41 @@ describe('/trash', () => {
 
       const assetAfter = await utils.getAssetInfo(admin.accessToken, asset.id);
       expect(assetAfter).toMatchObject({ isTrashed: true, isOffline: true });
+    });
+
+    it.skip('should not delete offline assets from disk', async () => {
+      // Can't be tested at the moment due to no mechanism to forward time
+      const library = await utils.createLibrary(admin.accessToken, {
+        ownerId: admin.userId,
+        importPaths: [`${testAssetDirInternal}/temp/offline`],
+      });
+
+      utils.createImageFile(`${testAssetDir}/temp/offline/offline.png`);
+
+      await scan(admin.accessToken, library.id);
+      await utils.waitForQueueFinish(admin.accessToken, 'library');
+
+      const { assets } = await utils.searchAssets(admin.accessToken, { libraryId: library.id });
+      expect(assets.items.length).toBe(1);
+      const asset = assets.items[0];
+
+      await utils.updateLibrary(admin.accessToken, library.id, { exclusionPatterns: ['**/offline/**'] });
+
+      await scan(admin.accessToken, library.id);
+      await utils.waitForQueueFinish(admin.accessToken, 'library');
+
+      const assetBefore = await utils.getAssetInfo(admin.accessToken, asset.id);
+      expect(assetBefore).toMatchObject({ isTrashed: true, isOffline: true });
+
+      utils.createImageFile(`${testAssetDir}/temp/offline/offline.png`);
+
+      const { status } = await request(app).post('/trash/empty').set('Authorization', `Bearer ${admin.accessToken}`);
+      expect(status).toBe(200);
+
+      await utils.waitForQueueFinish(admin.accessToken, 'backgroundTask');
+
+      const after = await getAssetStatistics({ isTrashed: true }, { headers: asBearerAuth(admin.accessToken) });
+      expect(after.total).toBe(0);
 
       expect(existsSync(`${testAssetDir}/temp/offline/offline.png`)).toBe(true);
 
@@ -137,7 +172,7 @@ describe('/trash', () => {
       expect(after).toStrictEqual(expect.objectContaining({ id: assetId, isTrashed: false }));
     });
 
-    it('should not restore offline-trashed assets', async () => {
+    it('should not restore offline assets', async () => {
       const library = await utils.createLibrary(admin.accessToken, {
         ownerId: admin.userId,
         importPaths: [`${testAssetDirInternal}/temp/offline`],
@@ -152,7 +187,7 @@ describe('/trash', () => {
       expect(assets.count).toBe(1);
       const assetId = assets.items[0].id;
 
-      utils.removeImageFile(`${testAssetDir}/temp/offline/offline.png`);
+      await utils.updateLibrary(admin.accessToken, library.id, { exclusionPatterns: ['**/offline/**'] });
 
       await scan(admin.accessToken, library.id);
 
@@ -195,7 +230,7 @@ describe('/trash', () => {
       expect(after.isTrashed).toBe(false);
     });
 
-    it('should not restore an offline-trashed asset', async () => {
+    it('should not restore an offline asset', async () => {
       const library = await utils.createLibrary(admin.accessToken, {
         ownerId: admin.userId,
         importPaths: [`${testAssetDirInternal}/temp/offline`],
@@ -210,7 +245,7 @@ describe('/trash', () => {
       expect(assets.count).toBe(1);
       const assetId = assets.items[0].id;
 
-      utils.removeImageFile(`${testAssetDir}/temp/offline/offline.png`);
+      await utils.updateLibrary(admin.accessToken, library.id, { exclusionPatterns: ['**/offline/**'] });
 
       await scan(admin.accessToken, library.id);
       await utils.waitForQueueFinish(admin.accessToken, 'library');

e2e/src/api/specs/user-admin.e2e-spec.ts

@@ -356,5 +356,24 @@ describe('/admin/users', () => {
       expect(status).toBe(403);
       expect(body).toEqual(errorDto.forbidden);
     });
+
+    it('should restore a user', async () => {
+      const user = await utils.userSetup(admin.accessToken, createUserDto.create('restore'));
+
+      await deleteUserAdmin({ id: user.userId, userAdminDeleteDto: {} }, { headers: asBearerAuth(admin.accessToken) });
+
+      const { status, body } = await request(app)
+        .post(`/admin/users/${user.userId}/restore`)
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+      expect(status).toBe(200);
+      expect(body).toEqual(
+        expect.objectContaining({
+          id: user.userId,
+          email: user.userEmail,
+          status: 'active',
+          deletedAt: null,
+        }),
+      );
+    });
   });
 });

e2e/src/api/specs/user.e2e-spec.ts

@@ -129,6 +129,8 @@ describe('/users', () => {
       expect(body).toEqual({
         ...before,
         updatedAt: expect.any(String),
+        profileChangedAt: expect.any(String),
+        createdAt: expect.any(String),
         name: 'Name',
       });
     });
@@ -177,6 +179,8 @@ describe('/users', () => {
         ...before,
         email: 'non-admin@immich.cloud',
         updatedAt: expect.anything(),
+        createdAt: expect.anything(),
+        profileChangedAt: expect.anything(),
       });
     });
   });

e2e/src/setup/auth-server.ts

@@ -51,7 +51,7 @@ const setup = async () => {
   const { privateKey, publicKey } = await generateKeyPair('RS256');
 
   const redirectUris = ['http://127.0.0.1:2285/auth/login', 'https://photos.immich.app/oauth/mobile-redirect'];
-  const port = 3000;
+  const port = 2286;
   const host = '0.0.0.0';
   const oidc = new Provider(`http://${host}:${port}`, {
     renderError: async (ctx, out, error) => {

e2e/src/utils.ts

@@ -6,10 +6,13 @@ import {
   CheckExistingAssetsDto,
   CreateAlbumDto,
   CreateLibraryDto,
+  JobCommandDto,
+  JobName,
   MetadataSearchDto,
   Permission,
   PersonCreateDto,
   SharedLinkCreateDto,
+  UpdateLibraryDto,
   UserAdminCreateDto,
   UserPreferencesUpdateDto,
   ValidateLibraryDto,
@@ -27,7 +30,9 @@ import {
   getAssetInfo,
   getConfigDefaults,
   login,
+  scanLibrary,
   searchAssets,
+  sendJobCommand,
   setBaseUrl,
   signUpAdmin,
   tagAssets,
@@ -35,6 +40,7 @@ import {
   updateAlbumUser,
   updateAssets,
   updateConfig,
+  updateLibrary,
   updateMyPreferences,
   upsertTags,
   validate,
@@ -42,7 +48,7 @@ import {
 import { BrowserContext } from '@playwright/test';
 import { exec, spawn } from 'node:child_process';
 import { createHash } from 'node:crypto';
-import { existsSync, mkdirSync, rmSync, writeFileSync } from 'node:fs';
+import { existsSync, mkdirSync, renameSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import path, { dirname } from 'node:path';
 import { setTimeout as setAsyncTimeout } from 'node:timers/promises';
@@ -74,6 +80,7 @@ export const immichCli = (args: string[]) =>
 export const immichAdmin = (args: string[]) =>
   executeCommand('docker', ['exec', '-i', 'immich-e2e-server', '/bin/bash', '-c', `immich-admin ${args.join(' ')}`]);
 export const specialCharStrings = ["'", '"', ',', '{', '}', '*'];
+export const TEN_TIMES = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
 
 const executeCommand = (command: string, args: string[]) => {
   let _resolve: (value: CommandResponse) => void;
@@ -392,6 +399,14 @@ export const utils = {
     rmSync(path);
   },
 
+  renameImageFile: (oldPath: string, newPath: string) => {
+    if (!existsSync(oldPath)) {
+      return;
+    }
+
+    renameSync(oldPath, newPath);
+  },
+
   removeDirectory: (path: string) => {
     if (!existsSync(path)) {
       return;
@@ -447,6 +462,9 @@ export const utils = {
   validateLibrary: (accessToken: string, id: string, dto: ValidateLibraryDto) =>
     validate({ id, validateLibraryDto: dto }, { headers: asBearerAuth(accessToken) }),
 
+  updateLibrary: (accessToken: string, id: string, dto: UpdateLibraryDto) =>
+    updateLibrary({ id, updateLibraryDto: dto }, { headers: asBearerAuth(accessToken) }),
+
   createPartner: (accessToken: string, id: string) => createPartner({ id }, { headers: asBearerAuth(accessToken) }),
 
   updateMyPreferences: (accessToken: string, userPreferencesUpdateDto: UserPreferencesUpdateDto) =>
@@ -461,6 +479,9 @@ export const utils = {
   tagAssets: (accessToken: string, tagId: string, assetIds: string[]) =>
     tagAssets({ id: tagId, bulkIdsDto: { ids: assetIds } }, { headers: asBearerAuth(accessToken) }),
 
+  jobCommand: async (accessToken: string, jobName: JobName, jobCommandDto: JobCommandDto) =>
+    sendJobCommand({ id: jobName, jobCommandDto }, { headers: asBearerAuth(accessToken) }),
+
   setAuthCookies: async (context: BrowserContext, accessToken: string, domain = '127.0.0.1') =>
     await context.addCookies([
       {
@@ -533,6 +554,14 @@ export const utils = {
     await immichCli(['login', app, `${key.secret}`]);
     return key.secret;
   },
+
+  scan: async (accessToken: string, id: string) => {
+    await scanLibrary({ id }, { headers: asBearerAuth(accessToken) });
+
+    await utils.waitForQueueFinish(accessToken, 'library');
+    await utils.waitForQueueFinish(accessToken, 'sidecar');
+    await utils.waitForQueueFinish(accessToken, 'metadataExtraction');
+  },
 };
 
 utils.initSdk();

e2e/src/web/specs/shared-link.e2e-spec.ts

@@ -6,7 +6,7 @@ import {
   SharedLinkType,
   createAlbum,
 } from '@immich/sdk';
-import { test } from '@playwright/test';
+import { expect, test } from '@playwright/test';
 import { asBearerAuth, utils } from 'src/utils';
 
 test.describe('Shared Links', () => {
@@ -65,6 +65,38 @@ test.describe('Shared Links', () => {
     await page.getByRole('heading', { name: 'Test Album' }).waitFor();
   });
 
+  test('show-password button visible', async ({ page }) => {
+    await page.goto(`/share/${sharedLinkPassword.key}`);
+    await page.getByPlaceholder('Password').fill('test-password');
+    await page.getByRole('button', { name: 'Show password' }).waitFor();
+  });
+
+  test('view password for shared link', async ({ page }) => {
+    await page.goto(`/share/${sharedLinkPassword.key}`);
+    const input = page.getByPlaceholder('Password');
+    await input.fill('test-password');
+    await page.getByRole('button', { name: 'Show password' }).click();
+    // await page.getByText('test-password', { exact: true }).waitFor();
+    await expect(input).toHaveAttribute('type', 'text');
+  });
+
+  test('hide-password button visible', async ({ page }) => {
+    await page.goto(`/share/${sharedLinkPassword.key}`);
+    const input = page.getByPlaceholder('Password');
+    await input.fill('test-password');
+    await page.getByRole('button', { name: 'Show password' }).click();
+    await page.getByRole('button', { name: 'Hide password' }).waitFor();
+  });
+
+  test('hide password for shared link', async ({ page }) => {
+    await page.goto(`/share/${sharedLinkPassword.key}`);
+    const input = page.getByPlaceholder('Password');
+    await input.fill('test-password');
+    await page.getByRole('button', { name: 'Show password' }).click();
+    await page.getByRole('button', { name: 'Hide password' }).click();
+    await expect(input).toHaveAttribute('type', 'password');
+  });
+
   test('show error for invalid shared link', async ({ page }) => {
     await page.goto('/share/invalid');
     await page.getByRole('heading', { name: 'Invalid share key' }).waitFor();

i18n/af.json

@@ -20,9 +20,10 @@
   "add_partner": "Voeg vennoot by",
   "add_path": "Voeg pad by",
   "add_photos": "Voeg foto's by",
-  "add_to": "Voeg na...",
+  "add_to": "Voeg by…",
   "add_to_album": "Voeg na album",
   "add_to_shared_album": "Voeg na gedeelde album",
+  "add_url": "Voeg URL by",
   "added_to_archive": "By argief gevoeg",
   "added_to_favorites": "By gunstelinge gevoeg",
   "added_to_favorites_count": "Het {count, number} by gunstelinge gevoeg",
@@ -52,6 +53,27 @@
     "cron_expression_description": "Stel die skanderingsinterval in met die cron-formaat. Vir meer inligting verwys asseblief na bv. <link>Crontab Guru</link>",
     "cron_expression_presets": "Cron uitdrukking voorafinstellings",
     "disable_login": "Deaktiveer aanmelding",
-    "duplicate_detection_job_description": "Begin masjienleer op bates om soortgelyke beelde op te spoor. Maak staat op Smart Search"
-  }
+    "duplicate_detection_job_description": "Begin masjienleer op bates om soortgelyke beelde op te spoor. Maak staat op Smart Search",
+    "exclusion_pattern_description": "Met uitsluitingspatrone kan jy lêers en vouers ignoreer wanneer jy jou biblioteek skandeer. Dit is nuttig as jy vouers het wat lêers bevat wat jy nie wil invoer nie, soos RAW-lêers.",
+    "external_library_created_at": "Eksterne biblioteek (geskep op {date})",
+    "external_library_management": "Eksterne Biblioteek-opsies",
+    "face_detection": "Gesigsopsporing",
+    "failed_job_command": "Opdrag {command} het misluk vir werk: {job}",
+    "force_delete_user_warning": "WAARSKUWING: Dit sal onmiddellik die gebruiker en alle bates verwyder. Dit kan nie ontdoen word nie en die lêers kan nie herstel word nie.",
+    "forcing_refresh_library_files": "Forseer herlaai van alle biblioteeklêers",
+    "image_format": "Formaat",
+    "image_format_description": "WebP produseer kleiner lêers as JPEG, maar is stadiger om te enkodeer.",
+    "image_prefer_embedded_preview": "Verkies ingebedde voorskou",
+    "image_prefer_wide_gamut": "Verkies wye spektrum",
+    "image_preview_description": "Mediumgrootte prent met gestroopte metadata, wat gebruik word wanneer 'n enkele bate bekyk word en vir masjienleer",
+    "image_preview_quality_description": "Voorskou kwaliteit van 1-100. Hoër is beter, maar produseer groter lêers en kan app-reaksie verminder. Die stel van 'n lae waarde kan masjienleerkwaliteit beïnvloed.",
+    "image_preview_title": "Voorskou Instellings",
+    "image_quality": "Kwaliteit",
+    "image_resolution": "Resolusie",
+    "image_resolution_description": "Hoër resolusies kan meer detail bewaar, maar neem langer om te enkodeer, het groter lêergroottes en kan app-reaksie verminder.",
+    "image_settings": "Prent Instellings",
+    "image_settings_description": "Bestuur die kwaliteit en resolusie van gegenereerde beelde"
+  },
+  "search_by_description": "Soek by beskrywing",
+  "search_by_description_example": "Stapdag in Sapa"
 }

i18n/ar.json

@@ -1,5 +1,5 @@
 {
-  "about": "تحديث",
+  "about": "من نحن",
   "account": "الحساب",
   "account_settings": "إعدادات الحساب",
   "acknowledge": "أُدرك ذلك",
@@ -23,6 +23,7 @@
   "add_to": "إضافة إلى…",
   "add_to_album": "إضافة إلى ألبوم",
   "add_to_shared_album": "إضافة إلى ألبوم مشترك",
+  "add_url": "إضافة رابط",
   "added_to_archive": "أُضيفت للأرشيف",
   "added_to_favorites": "أُضيفت للمفضلات",
   "added_to_favorites_count": "تم إضافة {count, number} إلى المفضلات",
@@ -130,7 +131,7 @@
     "machine_learning_smart_search_description": "البحث عن الصور بشكل دلالي باستخدام تضمينات CLIP",
     "machine_learning_smart_search_enabled": "تفعيل البحث الذكي",
     "machine_learning_smart_search_enabled_description": "إذا تم تعطيله، فلن يتم ترميز الصور للبحث الذكي.",
-    "machine_learning_url_description": "عنوان URL لخادم التعلم الآلي",
+    "machine_learning_url_description": "عنوان URL لخادم التعلم الآلي. إذا تم توفير أكثر من عنوان URL، فسيتم محاولة الوصول إلى كل خادم على حدة حتى يستجيب أحد الخوادم بنجاح، بالترتيب من الأول إلى الأخير.",
     "manage_concurrency": "إدارة التزامن",
     "manage_log_settings": "إدارة إعدادات السجلات",
     "map_dark_style": "النمط الداكن",
@@ -218,7 +219,7 @@
     "reset_settings_to_default": "إعادة ضبط الإعدادات إلى الوضع الافتراضي",
     "reset_settings_to_recent_saved": "إعادة ضبط الإعدادات إلى الإعدادات المحفوظة مؤخرًا",
     "scanning_library": "مسح المكتبة",
-    "search_jobs": "البحث عن وظائف...",
+    "search_jobs": "البحث عن وظائف…",
     "send_welcome_email": "إرسال بريد ترحيبي",
     "server_external_domain_settings": "إسم النطاق الخارجي",
     "server_external_domain_settings_description": "إسم النطاق لروابط المشاركة العامة، بما في ذلك http(s)://",
@@ -249,6 +250,16 @@
     "storage_template_user_label": "<code>{label}</code> هو تسمية التخزين الخاصة بالمستخدم",
     "system_settings": "إعدادات النظام",
     "tag_cleanup_job": "تنظيف العلامة",
+    "template_email_available_tags": "يمكنك استخدام المتغيرات التالية في القالب الخاص بك: {tags}",
+    "template_email_if_empty": "إذا كان القالب فارغا، فسيتم استخدام البريد الإلكتروني الافتراضي.",
+    "template_email_invite_album": "قالب دعوة الألبوم",
+    "template_email_preview": "عرض مسبق",
+    "template_email_settings": "نماذج البريد الالكتروني",
+    "template_email_settings_description": "إدارة قوالب إشعارات البريد الإلكتروني المخصصة",
+    "template_email_update_album": "تحديث قالب الألبوم",
+    "template_email_welcome": "قالب البريد الإلكتروني الترحيبي",
+    "template_settings": "قوالب الإشعارات",
+    "template_settings_description": "إدارة القوالب المخصصة للإشعارات.",
     "theme_custom_css_settings": "CSS مخصص",
     "theme_custom_css_settings_description": "أوراق الأنماط المتتالية تسمح بتخصيص تصميم Immich.",
     "theme_settings": "إعدادات السمة",
@@ -278,6 +289,8 @@
     "transcoding_constant_rate_factor": "عامل معدل الجودة الثابت (-crf)",
     "transcoding_constant_rate_factor_description": "مستوى جودة الفيديو. القيم النموذجية هي 23 لـ H.264، 28 لـ HEVC، 31 لـ VP9، و 35 لـ AV1. كلما كانت القيمة أقل كان ذلك أفضل، ولكن يؤدي إلى ملفات أكبر.",
     "transcoding_disabled_description": "لا تقم بتحويل أي مقاطع فيديو، قد تؤدي إلى عدم تشغيلها على بعض العملاء",
+    "transcoding_encoding_options": "خيارات الترميز",
+    "transcoding_encoding_options_description": "اضبط برامج الترميز والدقة والجودة والخيارات الأخرى لمقاطع الفيديو المشفرة",
     "transcoding_hardware_acceleration": "التسريع العتادي",
     "transcoding_hardware_acceleration_description": "تجريبي؛ أسرع بكثير، ولكن ستكون جودتها أقل عند نفس معدل البت",
     "transcoding_hardware_decoding": "فك تشفير الأجهزة",
@@ -290,6 +303,8 @@
     "transcoding_max_keyframe_interval": "الحد الأقصى للفاصل الزمني للإطار الرئيسي",
     "transcoding_max_keyframe_interval_description": "يضبط الحد الأقصى لمسافة الإطار بين الإطارات الرئيسية. تؤدي القيم المنخفضة إلى زيادة سوء كفاءة الضغط، ولكنها تعمل على تحسين أوقات البحث وقد تعمل على تحسين الجودة في المشاهد ذات الحركة السريعة. 0 يضبط هذه القيمة تلقائيًا.",
     "transcoding_optimal_description": "مقاطع الفيديو ذات الدقة الأعلى من الدقة المستهدفة أو بتنسيق غير مقبول",
+    "transcoding_policy": "سياسة تحويل الترميز",
+    "transcoding_policy_description": "اضبط متى سيتم تحويل ترميز الفيديو",
     "transcoding_preferred_hardware_device": "الجهاز المفضل",
     "transcoding_preferred_hardware_device_description": "ينطبق فقط على VAAPI وQSV. يضبط عقدة dri المستخدمة لتحويل ترميز الأجهزة.",
     "transcoding_preset_preset": "الضبط المُسبق (-preset)",
@@ -298,7 +313,7 @@
     "transcoding_reference_frames_description": "عدد الإطارات التي يجب الرجوع إليها عند ضغط إطار معين. تعمل القيم الأعلى على تحسين كفاءة الضغط، ولكنها تبطئ عملية التشفير. 0 يضبط هذه القيمة تلقائيًا.",
     "transcoding_required_description": "فقط مقاطع الفيديو ذات التنسيق غير المقبول",
     "transcoding_settings": "إعدادات تحويل ترميز الفيديو",
-    "transcoding_settings_description": "إدارة معلومات الدقة والترميز لملفات الفيديو",
+    "transcoding_settings_description": "إدارة مقاطع الفيديو التي يجب تحويل ترميزها وكيفية معالجتها",
     "transcoding_target_resolution": "القرار المستهدف",
     "transcoding_target_resolution_description": "يمكن أن تحافظ الدقة الأعلى على المزيد من التفاصيل ولكنها تستغرق وقتًا أطول للتشفير، ولها أحجام ملفات أكبر، ويمكن أن تقلل من استجابة التطبيق.",
     "transcoding_temporal_aq": "التكميم التكيفي الزمني",
@@ -311,7 +326,7 @@
     "transcoding_transcode_policy_description": "سياسة تحديد متى يجب ترميز الفيديو. سيتم دائمًا ترميز مقاطع الفيديو HDR (ما لم يتم تعطيل الترميز).",
     "transcoding_two_pass_encoding": "الترميز بمرورين",
     "transcoding_two_pass_encoding_setting_description": "ترميز بمرورين لإنتاج مقاطع فيديو بترميز أفضل. عند تمكين الحد الأقصى لمعدل البت (مطلوب لكي يعمل مع H.264 و HEVC)، يستخدم هذا الوضع نطاق معدل البت استنادًا إلى الحد الأقصى لمعدل البت ويتجاهل CRF. بالنسبة لـ VP9، يمكن استخدام CRF إذا تم تعطيل الحد الأقصى لمعدل البت.",
-    "transcoding_video_codec": "كود الفيديو",
+    "transcoding_video_codec": "ترميز الفيديو",
     "transcoding_video_codec_description": "يتمتع VP9 بكفاءة عالية وتوافق مع الويب، ولكنه يستغرق وقتًا أطول في تحويل التعليمات البرمجية. يعمل HEVC بشكل مشابه، لكن توافقه مع الويب أقل. H.264 متوافق على نطاق واسع وسريع في تحويل التعليمات البرمجية، ولكنه ينتج ملفات أكبر بكثير. AV1 هو برنامج الترميز الأكثر كفاءة ولكنه يفتقر إلى الدعم على الأجهزة القديمة.",
     "trash_enabled_description": "تفعيل ميزات سلة المهملات",
     "trash_number_of_days": "عدد الأيام",
@@ -391,17 +406,17 @@
   "are_these_the_same_person": "هل هؤلاء هم نفس الشخص؟",
   "are_you_sure_to_do_this": "هل انت متأكد من أنك تريد أن تفعل هذا؟",
   "asset_added_to_album": "تمت إضافته إلى الألبوم",
-  "asset_adding_to_album": "جارٍ الإضافة إلى الألبوم...",
+  "asset_adding_to_album": "جارٍ الإضافة إلى الألبوم…",
   "asset_description_updated": "تم تحديث وصف المحتوى",
   "asset_filename_is_offline": "الأصل {filename} غير متصل",
   "asset_has_unassigned_faces": "يحتوي الأصل على وجوه غير مخصصة",
-  "asset_hashing": "التجزئة...",
+  "asset_hashing": "التجزئة…",
   "asset_offline": "المحتوى غير اتصال",
   "asset_offline_description": "لم يعد هذا الأصل الخارجي موجودًا على القرص. يرجى الاتصال بمسؤول Immich للحصول على المساعدة.",
   "asset_skipped": "تم تخطيه",
   "asset_skipped_in_trash": "في سلة المهملات",
   "asset_uploaded": "تم الرفع",
-  "asset_uploading": "جارٍ الرفع...",
+  "asset_uploading": "جارٍ الرفع…",
   "assets": "المحتويات",
   "assets_added_count": "تمت إضافة {count, plural, one {# محتوى} other {# محتويات}}",
   "assets_added_to_album_count": "تمت إضافة {count, plural, one {# الأصل} other {# الأصول}} إلى الألبوم",
@@ -508,6 +523,10 @@
   "date_range": "نطاق الموعد",
   "day": "يوم",
   "deduplicate_all": "إلغاء تكرار الكل",
+  "deduplication_criteria_1": "حجم الصورة بوحدات البايت",
+  "deduplication_criteria_2": "عدد بيانات EXIF",
+  "deduplication_info": "معلومات إلغاء البيانات المكررة",
+  "deduplication_info_description": "لتحديد الأصول مسبقا تلقائيا وإزالة التكرارات بكميات كبيرة، ننظر إلى:",
   "default_locale": "اللغة الافتراضية",
   "default_locale_description": "تنسيق التواريخ والأرقام بناءً على لغة المتصفح الخاص بك",
   "delete": "حذف",
@@ -723,6 +742,7 @@
   "external": "خارجي",
   "external_libraries": "المكتبات الخارجية",
   "face_unassigned": "غير معين",
+  "failed_to_load_assets": "فشل تحميل الأصول",
   "favorite": "مفضل",
   "favorite_or_unfavorite_photo": "تفضيل أو إلغاء تفضيل الصورة",
   "favorites": "المفضلة",
@@ -743,10 +763,13 @@
   "get_help": "الحصول على المساعدة",
   "getting_started": "البدء",
   "go_back": "الرجوع للخلف",
+  "go_to_folder": "اذهب إلى المجلد",
   "go_to_search": "اذهب إلى البحث",
   "group_albums_by": "تجميع الألبومات حسب...",
+  "group_country": "مجموعة البلد",
   "group_no": "بدون تجميع",
   "group_owner": "تجميع حسب المالك",
+  "group_places_by": "تجميع الأماكن حسب",
   "group_year": "تجميع حسب السنة",
   "has_quota": "محدد بحصة",
   "hi_user": "مرحبا {name} ({email})",
@@ -779,6 +802,7 @@
   "include_shared_albums": "تضمين الألبومات المشتركة",
   "include_shared_partner_assets": "تضمين محتويات الشريك المشتركة",
   "individual_share": "حصة فردية",
+  "individual_shares": "المشاركات الفردية",
   "info": "معلومات",
   "interval": {
     "day_at_onepm": "كل يوم الساعة الواحدة ظهرا",
@@ -801,6 +825,7 @@
   "latest_version": "احدث اصدار",
   "latitude": "خط العرض",
   "leave": "مغادرة",
+  "lens_model": "نموذج العدسات",
   "let_others_respond": "دع الآخرين يستجيبون",
   "level": "المستوى",
   "library": "مكتبة",
@@ -963,6 +988,7 @@
   "pick_a_location": "اختر موقعًا",
   "place": "مكان",
   "places": "الأماكن",
+  "places_count": "{count, plural, one {{count, number} مكان} other {{count, number} أماكن}}",
   "play": "تشغيل",
   "play_memories": "تشغيل الذكريات",
   "play_motion_photo": "تشغيل الصور المتحركة",
@@ -1022,6 +1048,7 @@
   "reassigned_assets_to_new_person": "تمت إعادة تعيين {count, plural, one {# المحتوى} other {# المحتويات}} إلى شخص جديد",
   "reassing_hint": "تعيين المحتويات المحددة لشخص موجود",
   "recent": "حديث",
+  "recent-albums": "ألبومات الحديثة",
   "recent_searches": "عمليات البحث الأخيرة",
   "refresh": "تحديث",
   "refresh_encoded_videos": "تحديث مقاطع الفيديو المشفرة",
@@ -1043,6 +1070,7 @@
   "remove_from_album": "إزالة من الألبوم",
   "remove_from_favorites": "إزالة من المفضلة",
   "remove_from_shared_link": "إزالة من الرابط المشترك",
+  "remove_url": "إزالة عنوان URL",
   "remove_user": "إزالة المستخدم",
   "removed_api_key": "تم إزالة مفتاح API: {name}",
   "removed_from_archive": "تمت إزالتها من الأرشيف",
@@ -1081,15 +1109,18 @@
   "scan_library": "مسح",
   "scan_settings": "إعدادات الفحص",
   "scanning_for_album": "جارٍ الفحص عن ألبوم...",
-  "search": "بحث",
-  "search_albums": "بحث في الألبومات",
+  "search": "البحث",
+  "search_albums": "البحث في الألبومات",
   "search_by_context": "البحث حسب السياق",
-  "search_by_filename": "إبحث بإسم الملف أو نوعه",
+  "search_by_description": "البحث حسب الوصف",
+  "search_by_description_example": "يوم المشي لمسافات طويلة في سابا",
+  "search_by_filename": "البحث بإسم الملف أو نوعه",
   "search_by_filename_example": "كـ IMG_1234.JPG أو PNG",
   "search_camera_make": "البحث حسب الشركة المصنعة للكاميرا...",
   "search_camera_model": "البحث حسب موديل الكاميرا...",
   "search_city": "البحث حسب المدينة...",
   "search_country": "البحث حسب الدولة...",
+  "search_for": "البحث عن",
   "search_for_existing_person": "البحث عن شخص موجود",
   "search_no_people": "لا يوجد أشخاص",
   "search_no_people_named": "لا يوجد أشخاص بالاسم \"{name}\"",
@@ -1101,36 +1132,37 @@
   "search_tags": "البحث عن العلامات...",
   "search_timezone": "البحث حسب المنطقة الزمنية...",
   "search_type": "نوع البحث",
-  "search_your_photos": "ابحث عن صورك",
+  "search_your_photos": "البحث عن صورك",
   "searching_locales": "جارٍ البحث في اللغات...",
   "second": "ثانية",
   "see_all_people": "عرض جميع الأشخاص",
-  "select_album_cover": "حدد غلاف الألبوم",
+  "select_album_cover": "تحديد غلاف الألبوم",
   "select_all": "تحديد الكل",
   "select_all_duplicates": "تحديد جميع النسخ المكررة",
-  "select_avatar_color": "حدد لون الصورة الشخصية",
-  "select_face": "اختيار وجه",
-  "select_featured_photo": "حدد الصورة المميزة",
-  "select_from_computer": "اختر من الجهاز",
-  "select_keep_all": "حدد الاحتفاظ بالكل",
-  "select_library_owner": "اختر مالِك المكتبة",
-  "select_new_face": "اختيار وجه جديد",
-  "select_photos": "حدد الصور",
-  "select_trash_all": "حدّد حذف الكلِ",
-  "selected": "المُحدّد",
+  "select_avatar_color": "تحديد لون الصورة الشخصية",
+  "select_face": "تحديد وجه",
+  "select_featured_photo": "تحديد الصورة المميزة",
+  "select_from_computer": "تحديد من الحاسب الآلي",
+  "select_keep_all": "تحديد الأحتفاظ بالكل",
+  "select_library_owner": "تحديد مالِك المكتبة",
+  "select_new_face": "تحديد وجه جديد",
+  "select_photos": "تحديد الصور",
+  "select_trash_all": "تحديد حذف الكلِ",
+  "selected": "التحديد",
   "selected_count": "{count, plural, other {# محددة }}",
-  "send_message": "أرسل رسالة",
-  "send_welcome_email": "أرسل بريدًا إلكترونيًا ترحيبيًا",
+  "send_message": "‏إرسال رسالة",
+  "send_welcome_email": "إرسال بريدًا إلكترونيًا ترحيبيًا",
   "server_offline": "الخادم غير متصل",
   "server_online": "الخادم متصل",
   "server_stats": "إحصائيات الخادم",
   "server_version": "إصدار الخادم",
-  "set": "تعيين",
-  "set_as_album_cover": "تعيين كغلاف للألبوم",
-  "set_as_profile_picture": "تعيين كصورة الملف الشخصي",
+  "set": "‏تحديد",
+  "set_as_album_cover": "تحديد كغلاف للألبوم",
+  "set_as_featured_photo": "تحديد كصورة مميزة",
+  "set_as_profile_picture": "تحديد كصورة الملف الشخصي",
   "set_date_of_birth": "تحديد تاريخ الميلاد",
-  "set_profile_picture": "تعيين صورة الملف الشخصي",
-  "set_slideshow_to_fullscreen": "اضبط عرض الشرائح على وضع ملء الشاشة",
+  "set_profile_picture": "تحديد صورة الملف الشخصي",
+  "set_slideshow_to_fullscreen": "تحديد عرض الشرائح على وضع ملء الشاشة",
   "settings": "الإعدادات",
   "settings_saved": "تم حفظ الإعدادات",
   "share": "مشاركة",
@@ -1141,6 +1173,7 @@
   "shared_from_partner": "صور من {partner}",
   "shared_link_options": "خيارات الرابط المشترك",
   "shared_links": "روابط مشتركة",
+  "shared_links_description": "وصف الروابط المشتركة",
   "shared_photos_and_videos_count": "{assetCount, plural, other {# الصور ومقاطع الفيديو المُشارَكة.}}",
   "shared_with_partner": "تمت المشاركة مع {partner}",
   "sharing": "مشاركة",
@@ -1152,17 +1185,18 @@
   "show_all_people": "إظهار جميع الأشخاص",
   "show_and_hide_people": "إظهار وإخفاء الأشخاص",
   "show_file_location": "إظهار موقع الملف",
-  "show_gallery": "عرض المعرض",
+  "show_gallery": "إظهار المعرض",
   "show_hidden_people": "إظهار الأشخاص المخفيين",
-  "show_in_timeline": "عرض في المخطط الزمني",
-  "show_in_timeline_setting_description": "عرض الصور ومقاطع الفيديو من هذا المستخدم في المخطط الزمني الخاص بك",
+  "show_in_timeline": "إظهار في المخطط الزمني",
+  "show_in_timeline_setting_description": "إظهار الصور ومقاطع الفيديو من هذا المستخدم في المخطط الزمني الخاص بك",
   "show_keyboard_shortcuts": "إظهار اختصارات لوحة المفاتيح",
-  "show_metadata": "عرض البيانات الوصفية",
+  "show_metadata": "إظهار البيانات الوصفية",
   "show_or_hide_info": "إظهار أو إخفاء المعلومات",
-  "show_password": "عرض كلمة المرور",
+  "show_password": "إظهار كلمة المرور",
   "show_person_options": "إظهار خيارات الشخص",
   "show_progress_bar": "إظهار شريط التقدم",
   "show_search_options": "إظهار خيارات البحث",
+  "show_shared_links": "عرض الروابط المشتركة",
   "show_slideshow_transition": "إظهار انتقال عرض الشرائح",
   "show_supporter_badge": "شارة المؤيد",
   "show_supporter_badge_description": "إظهار شارة المؤيد",
@@ -1170,7 +1204,7 @@
   "sidebar": "الشريط الجانبي",
   "sidebar_display_description": "عرض رابط للعرض في الشريط الجانبي",
   "sign_out": "خروج",
-  "sign_up": "تسجيل",
+  "sign_up": "التسجيل",
   "size": "الحجم",
   "skip_to_content": "تخطي إلى المحتوى",
   "skip_to_folders": "تخطي إلى المجلدات",
@@ -1182,6 +1216,7 @@
   "sort_items": "عدد العناصر",
   "sort_modified": "تم تعديل التاريخ",
   "sort_oldest": "أقدم صورة",
+  "sort_people_by_similarity": "رتب الأشخاص حسب التشابه",
   "sort_recent": "أحدث صورة",
   "sort_title": "العنوان",
   "source": "المصدر",
@@ -1249,6 +1284,7 @@
   "unfavorite": "أزل التفضيل",
   "unhide_person": "أظهر الشخص",
   "unknown": "غير معروف",
+  "unknown_country": "بلد غير معروف",
   "unknown_year": "سنة غير معروفة",
   "unlimited": "غير محدود",
   "unlink_motion_video": "إلغاء ربط فيديو الحركة",

i18n/az.json

@@ -1,5 +1,5 @@
 {
-  "about": "Yenilə",
+  "about": "Haqqinda",
   "account": "Hesab",
   "account_settings": "Hesab parametrləri",
   "acknowledge": "Təsdiq et",

i18n/ca.json

@@ -1,8 +1,8 @@
 {
-  "about": "Sobre",
+  "about": "Quant a",
   "account": "Compte",
   "account_settings": "Configuració del compte",
-  "acknowledge": "Confirmar",
+  "acknowledge": "D'acord",
   "action": "Acció",
   "actions": "Accions",
   "active": "Actiu",
@@ -20,7 +20,7 @@
   "add_partner": "Afegir company/a",
   "add_path": "Afegir una ruta",
   "add_photos": "Afegir fotografies",
-  "add_to": "Afegir a...",
+  "add_to": "Afegir a…",
   "add_to_album": "Afegir a un l'àlbum",
   "add_to_shared_album": "Afegir a un àlbum compartit",
   "add_url": "Afegir URL",
@@ -131,7 +131,7 @@
     "machine_learning_smart_search_description": "Cerca imatges semànticament emprant incrustacions CLIP",
     "machine_learning_smart_search_enabled": "Activa la cerca intel·ligent",
     "machine_learning_smart_search_enabled_description": "Si està deshabilitat les imatges no es codificaran per la cerca intel·ligent.",
-    "machine_learning_url_description": "URL del servidor d'aprenentatge automàtic",
+    "machine_learning_url_description": "La URL del servidor d'aprenentatge automàtic. Si es proporciona més d'una URL, s'intentarà accedir a cada servidor en ordre fins que un d'ells respongui correctament.",
     "manage_concurrency": "Gestiona la concurrència",
     "manage_log_settings": "Gestiona la configuració del registre",
     "map_dark_style": "Tema fosc",
@@ -219,10 +219,12 @@
     "reset_settings_to_default": "Restablir configuracions per defecte",
     "reset_settings_to_recent_saved": "Restablir la configuració guardada més recent",
     "scanning_library": "Escanejant biblioteca",
-    "search_jobs": "Tasques de cerca...",
+    "search_jobs": "Cercar treballs…",
     "send_welcome_email": "Enviar correu electrònic de benvinguda",
     "server_external_domain_settings": "Domini extern",
     "server_external_domain_settings_description": "Domini per enllaços públics compartits, incloent http(s)://",
+    "server_public_users": "Usuaris públics",
+    "server_public_users_description": "Tots els usuaris (nom i correu electrònic) apareixen a la llista a l'afegir un usuari als àlbums compartits. Si es desactiva, la llista només serà disponible pels usuaris administradors.",
     "server_settings": "Configuració del servidor",
     "server_settings_description": "Gestiona la configuració del servidor",
     "server_welcome_message": "Missatge de benvinguda",
@@ -248,6 +250,16 @@
     "storage_template_user_label": "<code>{label}</code> és l'etiqueta d'emmagatzematge de l'usuari",
     "system_settings": "Configuració del sistema",
     "tag_cleanup_job": "Neteja d'etiqueta",
+    "template_email_available_tags": "Pots fer servir les següents variables a la teva plantilla: {tags}",
+    "template_email_if_empty": "Si la plantilla està buida, es farà servir el correu electrònic predeterminat.",
+    "template_email_invite_album": "Plantilla per l'àlbum d'invitacions",
+    "template_email_preview": "Vista prèvia",
+    "template_email_settings": "Plantilles de correu electrònic",
+    "template_email_settings_description": "Gestionar les plantilles de notificació per correu electrònic personalitzades",
+    "template_email_update_album": "Actualitzar la plantilla de l'àlbum",
+    "template_email_welcome": "Plantilla del correu de benvinguda",
+    "template_settings": "Plantilles de notificació",
+    "template_settings_description": "Gestiona les plantilles personalitzades per les notificacions.",
     "theme_custom_css_settings": "CSS personalitzat",
     "theme_custom_css_settings_description": "Els Fulls d'Estil en Cascada permeten personalitzar el disseny d'Immich.",
     "theme_settings": "Configuració del tema",
@@ -277,6 +289,8 @@
     "transcoding_constant_rate_factor": "Factor de taxa constant (-crf)",
     "transcoding_constant_rate_factor_description": "Nivell de qualitat del vídeo. Els valors típics són 23 per a H.264, 28 per a HEVC, 31 per a VP9 i 35 per a AV1. Més baix és millor, però produeix fitxers més grans.",
     "transcoding_disabled_description": "No transcodifiqueu cap vídeo, pot interrompre la reproducció en alguns clients",
+    "transcoding_encoding_options": "Opcions de codificació",
+    "transcoding_encoding_options_description": "Establiu còdecs, resolució, qualitat i altres opcions per als vídeos codificats",
     "transcoding_hardware_acceleration": "Acceleració de maquinari",
     "transcoding_hardware_acceleration_description": "Experimental. Molt més ràpid, però tindrà una qualitat més baixa amb la mateixa taxa de bits",
     "transcoding_hardware_decoding": "Descodificació de maquinari",
@@ -289,6 +303,8 @@
     "transcoding_max_keyframe_interval": "Interval màxim de fotogrames clau",
     "transcoding_max_keyframe_interval_description": "Estableix la distància màxima entre fotogrames clau. Els valors més baixos empitjoren l'eficiència de la compressió, però milloren els temps de cerca i poden millorar la qualitat en escenes amb moviment ràpid. 0 estableix aquest valor automàticament.",
     "transcoding_optimal_description": "Vídeos superiors a la resolució objectiu o que no tenen un format acceptat",
+    "transcoding_policy": "Política de transcodificació",
+    "transcoding_policy_description": "Estableix quan es transcodificarà un vídeo",
     "transcoding_preferred_hardware_device": "Dispositiu de maquinari preferit",
     "transcoding_preferred_hardware_device_description": "S'aplica només a VAAPI i QSV. Estableix el node dri utilitzat per a la transcodificació de maquinari.",
     "transcoding_preset_preset": "Preestablert (-preset)",
@@ -297,7 +313,7 @@
     "transcoding_reference_frames_description": "El nombre de fotogrames a fer referència en comprimir un fotograma determinat. Els valors més alts milloren l'eficiència de la compressió, però alenteixen la codificació. 0 estableix aquest valor automàticament.",
     "transcoding_required_description": "Només vídeos que no tenen un format acceptat",
     "transcoding_settings": "Configuració de transcodificació de vídeo",
-    "transcoding_settings_description": "Gestiona la resolució i codificació dels fitxers de vídeo",
+    "transcoding_settings_description": "Gestionar quins vídeos transcodificar i com processar-los",
     "transcoding_target_resolution": "Resolució objectiu",
     "transcoding_target_resolution_description": "Les resolucions més altes poden conservar més detalls, però triguen més temps a codificar-se, tenen mides de fitxer més grans i poden reduir la capacitat de resposta de l'aplicació.",
     "transcoding_temporal_aq": "AQ temporal",
@@ -390,17 +406,17 @@
   "are_these_the_same_person": "Són la mateixa persona?",
   "are_you_sure_to_do_this": "Esteu segurs que voleu fer-ho?",
   "asset_added_to_album": "Afegit a l'àlbum",
-  "asset_adding_to_album": "Afegint a l'àlbum...",
+  "asset_adding_to_album": "Afegint a l'àlbum…",
   "asset_description_updated": "La descripció del recurs s'ha actualitzat",
   "asset_filename_is_offline": "L'element {filename} està fora de línia",
   "asset_has_unassigned_faces": "L'element té cares no assignades",
-  "asset_hashing": "Hashing...",
+  "asset_hashing": "Hashing…",
   "asset_offline": "Element fora de línia",
   "asset_offline_description": "Aquest recurs extern ja no es troba al disc. Poseu-vos en contacte amb el vostre administrador d'Immich per obtenir ajuda.",
   "asset_skipped": "Saltat",
   "asset_skipped_in_trash": "A la paperera",
   "asset_uploaded": "Carregat",
-  "asset_uploading": "S'està carregant...",
+  "asset_uploading": "S'està carregant…",
   "assets": "Elements",
   "assets_added_count": "{count, plural, one {Afegit un element} other {Afegits # elements}}",
   "assets_added_to_album_count": "{count, plural, one {Afegit un element} other {Afegits # elements}} a l'àlbum",
@@ -507,6 +523,10 @@
   "date_range": "Interval de dates",
   "day": "Dia",
   "deduplicate_all": "Desduplica-ho tot",
+  "deduplication_criteria_1": "Mida d'imatge en bytes",
+  "deduplication_criteria_2": "Quantitat de dades EXIF",
+  "deduplication_info": "Informació de deduplicació",
+  "deduplication_info_description": "Per preseleccionar recursos automàticament i eliminar els duplicats de manera massiva, ens fixem en:",
   "default_locale": "Localització predeterminada",
   "default_locale_description": "Format de dates i números segons la configuració del navegador",
   "delete": "Esborra",
@@ -722,6 +742,7 @@
   "external": "Extern",
   "external_libraries": "Llibreries externes",
   "face_unassigned": "Sense assignar",
+  "failed_to_load_assets": "Error carregant recursos",
   "favorite": "Preferit",
   "favorite_or_unfavorite_photo": "Foto preferida o no preferida",
   "favorites": "Preferits",
@@ -742,6 +763,7 @@
   "get_help": "Aconseguir ajuda",
   "getting_started": "Començant",
   "go_back": "Torna",
+  "go_to_folder": "Anar al directori",
   "go_to_search": "Vés a cercar",
   "group_albums_by": "Agrupa àlbums per...",
   "group_no": "Cap agrupació",
@@ -800,6 +822,7 @@
   "latest_version": "Última versió",
   "latitude": "Latitud",
   "leave": "Marxar",
+  "lens_model": "Model de lents",
   "let_others_respond": "Deixa que els altres responguin",
   "level": "Nivell",
   "library": "Bibilioteca",
@@ -1021,6 +1044,7 @@
   "reassigned_assets_to_new_person": "{count, plural, one {S'ha reassignat # recurs} other {S'han reassignat # recursos}} a una persona nova",
   "reassing_hint": "Assignar els elements seleccionats a una persona existent",
   "recent": "Recent",
+  "recent-albums": "Àlbums recents",
   "recent_searches": "Cerques recents",
   "refresh": "Actualitzar",
   "refresh_encoded_videos": "Actualitza vídeos codificats",
@@ -1042,6 +1066,7 @@
   "remove_from_album": "Treu de l'àlbum",
   "remove_from_favorites": "Eliminar dels preferits",
   "remove_from_shared_link": "Eliminar de l'enllaç compartit",
+  "remove_url": "Eliminar URL",
   "remove_user": "Eliminar l'usuari",
   "removed_api_key": "Eliminada la clau d'API: {name}",
   "removed_from_archive": "Eliminat de l'arxiu",
@@ -1070,7 +1095,7 @@
   "review_duplicates": "Revisar duplicats",
   "role": "Rol",
   "role_editor": "Editor",
-  "role_viewer": "Visor",
+  "role_viewer": "Visualitzador",
   "save": "Desa",
   "saved_api_key": "Clau d'API guardada",
   "saved_profile": "Perfil guardat",
@@ -1089,6 +1114,7 @@
   "search_camera_model": "Buscar per model de càmera...",
   "search_city": "Buscar per ciutat...",
   "search_country": "Buscar per país...",
+  "search_for": "Cercar",
   "search_for_existing_person": "Busca una persona existent",
   "search_no_people": "Cap persona",
   "search_no_people_named": "Cap persona anomenada \"{name}\"",
@@ -1126,6 +1152,7 @@
   "server_version": "Versió del servidor",
   "set": "Establir",
   "set_as_album_cover": "Establir com a portada de l'àlbum",
+  "set_as_featured_photo": "Estableix com a foto destacada",
   "set_as_profile_picture": "Establir com a imatge de perfil",
   "set_date_of_birth": "Establir data de naixement",
   "set_profile_picture": "Establir imatge de perfil",
@@ -1181,11 +1208,12 @@
   "sort_items": "Nombre d'elements",
   "sort_modified": "Data de modificació",
   "sort_oldest": "Foto més antiga",
+  "sort_people_by_similarity": "Ordenar personar per semblança",
   "sort_recent": "Foto més recent",
   "sort_title": "Títol",
   "source": "Font",
   "stack": "Apila",
-  "stack_duplicates": "Aplicar duplicats",
+  "stack_duplicates": "Aplica duplicats",
   "stack_select_one_photo": "Selecciona una imatge principal per la pila",
   "stack_selected_photos": "Apila les fotos seleccionades",
   "stacked_assets_count": "Apilats {count, plural, one {# element} other {# elements}}",
@@ -1224,6 +1252,7 @@
   "they_will_be_merged_together": "Es combinaran",
   "third_party_resources": "Recursos de tercers",
   "time_based_memories": "Records basats en el temps",
+  "timeline": "Cronologia",
   "timezone": "Fus horari",
   "to_archive": "Arxivar",
   "to_change_password": "Canviar la contrasenya",
@@ -1233,6 +1262,7 @@
   "to_trash": "Paperera",
   "toggle_settings": "Canvia configuració",
   "toggle_theme": "Alternar tema",
+  "total": "Total",
   "total_usage": "Ús total",
   "trash": "Paperera",
   "trash_all": "Envia-ho tot a la paperera",
@@ -1305,6 +1335,7 @@
   "view_all_users": "Mostra tot els usuaris",
   "view_in_timeline": "Mostrar a la línia de temps",
   "view_links": "Mostra enllaços",
+  "view_name": "Veure",
   "view_next_asset": "Mostra el següent element",
   "view_previous_asset": "Mostra l'element anterior",
   "view_stack": "Veure la pila",