Remaining

* change dto from integer to double

* feat(mobile): edit location action

* patch openapi

* refactor in provider

* fix lint

* chore: not showing success prompt if dimissed

* i18n

---------

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

.devcontainer/server/container-common.sh

@@ -73,10 +73,8 @@ install_dependencies() {
     log "Installing dependencies"
     (
         cd "${IMMICH_WORKSPACE}" || exit 1
-        run_cmd make ci-server
-        run_cmd make ci-sdk
-        run_cmd make build-sdk
-        run_cmd make ci-web
+        export CI=1 FROZEN=1 OFFLINE=1
+        run_cmd make setup-dev
     )
     log ""
 }

.devcontainer/server/container-compose-overrides.yml

@@ -22,7 +22,7 @@ services:
 
   immich-machine-learning:
     env_file: !reset []
-    
+
   database:
     env_file: !reset []
     environment: !override
@@ -31,7 +31,7 @@ services:
       POSTGRES_DB: ${DB_DATABASE_NAME-immich}
       POSTGRES_INITDB_ARGS: '--data-checksums'
       POSTGRES_HOST_AUTH_METHOD: md5
-    volumes: 
+    volumes:
       - ${UPLOAD_LOCATION:-postgres-devcontainer-volume}${UPLOAD_LOCATION:+/postgres}:/var/lib/postgresql/data
 
   redis:

.devcontainer/server/container-start-backend.sh

@@ -10,8 +10,9 @@ cd "${IMMICH_WORKSPACE}/server" || (
     exit 1
 )
 
+CI=1 pnpm install
 while true; do
-    run_cmd node ./node_modules/.bin/nest start --debug "0.0.0.0:9230" --watch
+    run_cmd pnpm exec nest start --debug "0.0.0.0:9230" --watch
     log "Nest API Server crashed with exit code $?.  Respawning in 3s ..."
     sleep 3
 done

.devcontainer/server/container-start-frontend.sh

@@ -16,7 +16,7 @@ until curl --output /dev/null --silent --head --fail "http://127.0.0.1:${IMMICH_
 done
 
 while true; do
-    run_cmd node ./node_modules/.bin/vite dev --host 0.0.0.0 --port "${DEV_PORT}"
+    run_cmd pnpm exec vite dev --host 0.0.0.0 --port "${DEV_PORT}"
     log "Web crashed with exit code $?.  Respawning in 3s ..."
     sleep 3
 done

.dockerignore

@@ -4,6 +4,7 @@
 
 design/
 docker/
+Dockerfile
 !docker/scripts
 docs/
 !docs/package.json
@@ -19,6 +20,7 @@ mobile/
 cli/coverage/
 cli/dist/
 cli/node_modules/
+cli/Dockerfile
 
 open-api/typescript-sdk/build/
 open-api/typescript-sdk/node_modules/
@@ -29,9 +31,11 @@ server/upload/
 server/src/queries
 server/dist/
 server/www/
+server/Dockerfile
 
 web/node_modules/
 web/coverage/
 web/.svelte-kit
 web/build/
 web/.env
+web/Dockerfile

.github/.nvmrc

@@ -1 +1 @@
-22.16.0
+22.17.0

.github/.prettierignore

@@ -0,0 +1,4 @@
+# Ignore files for PNPM, NPM and YARN
+pnpm-lock.yaml
+package-lock.json
+yarn.lock

.github/package-lock.json

@@ -1,28 +0,0 @@
-{
-  "name": ".github",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "devDependencies": {
-        "prettier": "^3.5.3"
-      }
-    },
-    "node_modules/prettier": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz",
-      "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "prettier": "bin/prettier.cjs"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/prettier/prettier?sponsor=1"
-      }
-    }
-  }
-}

.github/workflows/build-mobile.yml

@@ -66,12 +66,6 @@ jobs:
           ref: ${{ inputs.ref || github.sha }}
           persist-credentials: false
 
-      - name: Install missing deps
-        run: |
-          sudo add-apt-repository ppa:rmescandon/yq
-          sudo apt-get update
-          sudo apt-get install -y yq xz-utils ninja-build zstd
-
       - name: Create the Keystore
         env:
           KEY_JKS: ${{ secrets.KEY_JKS }}
@@ -96,7 +90,7 @@ jobs:
           key: build-mobile-gradle-${{ runner.os }}-main
 
       - name: Setup Flutter SDK
-        uses: subosito/flutter-action@395322a6cded4e9ed503aebd4cc1965625f8e59a # v2.20.0
+        uses: subosito/flutter-action@fd55f4c5af5b953cc57a2be44cb082c8f6635e8e # v2.21.0
         with:
           channel: 'stable'
           flutter-version-file: ./mobile/pubspec.yaml

.github/workflows/cli.yml

@@ -33,21 +33,24 @@ jobs:
         with:
           persist-credentials: false
 
-      # Setup .npmrc file to publish to npm
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
-        with:
-          node-version-file: './cli/.nvmrc'
-          registry-url: 'https://registry.npmjs.org'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+      - name: Setup pnpm
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
 
-      - name: Prepare SDK
-        run: npm ci --prefix ../open-api/typescript-sdk/
-      - name: Build SDK
-        run: npm run build --prefix ../open-api/typescript-sdk/
-      - run: npm ci
-      - run: npm run build
-      - run: npm publish
+      - name: Setup Node
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+        with:
+          node-version-file: './server/.nvmrc'
+          registry-url: 'https://registry.npmjs.org'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
+
+      - name: Setup typescript-sdk
+        run: pnpm install && pnpm run build
+        working-directory: ./open-api/typescript-sdk
+
+      - run: pnpm install --frozen-lockfile
+      - run: pnpm build
+      - run: pnpm publish
         if: ${{ github.event_name == 'release' }}
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/docs-build.yml

@@ -53,21 +53,24 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+
       - name: Setup Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
-          node-version-file: './docs/.nvmrc'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          node-version-file: './cli/.nvmrc'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
-      - name: Run npm install
-        run: npm ci
+      - name: Run install
+        run: pnpm install
 
       - name: Check formatting
-        run: npm run format
+        run: pnpm format
 
       - name: Run build
-        run: npm run build
+        run: pnpm build
 
       - name: Upload build output
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2

.github/workflows/fix-format.yml

@@ -33,7 +33,7 @@ jobs:
         with:
           node-version-file: './server/.nvmrc'
           cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Fix formatting
         run: make install-all && make format-all

.github/workflows/pr-label-validation.yml

@@ -14,7 +14,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Require PR to have a changelog label
-        uses: mheap/github-action-required-labels@fb29a14a076b0f74099f6198f77750e8fc236016 # v5.5.0
+        uses: mheap/github-action-required-labels@8afbe8ae6ab7647d0c9f0cfa7c2f939650d22509 # v5.5.1
         with:
           mode: exactly
           count: 1

.github/workflows/sdk.yml

@@ -20,18 +20,21 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+
       # Setup .npmrc file to publish to npm
       - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './open-api/typescript-sdk/.nvmrc'
           registry-url: 'https://registry.npmjs.org'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
       - name: Install deps
-        run: npm ci
+        run: pnpm install --frozen-lockfile
       - name: Build
-        run: npm run build
+        run: pnpm build
       - name: Publish
-        run: npm publish
+        run: pnpm publish
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/static_analysis.yml

@@ -49,7 +49,7 @@ jobs:
           persist-credentials: false
 
       - name: Setup Flutter SDK
-        uses: subosito/flutter-action@395322a6cded4e9ed503aebd4cc1965625f8e59a # v2.20.0
+        uses: subosito/flutter-action@fd55f4c5af5b953cc57a2be44cb082c8f6635e8e # v2.21.0
         with:
           channel: 'stable'
           flutter-version-file: ./mobile/pubspec.yaml

.github/workflows/test.yml

@@ -80,30 +80,33 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+
       - name: Setup Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './server/.nvmrc'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
-      - name: Run npm install
-        run: npm ci
+      - name: Run package manager install
+        run: pnpm install
 
       - name: Run linter
-        run: npm run lint
+        run: pnpm lint
         if: ${{ !cancelled() }}
 
       - name: Run formatter
-        run: npm run format
+        run: pnpm format
         if: ${{ !cancelled() }}
 
       - name: Run tsc
-        run: npm run check
+        run: pnpm check
         if: ${{ !cancelled() }}
 
       - name: Run small tests & coverage
-        run: npm test
+        run: pnpm test
         if: ${{ !cancelled() }}
 
   cli-unit-tests:
@@ -123,34 +126,37 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+
       - name: Setup Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
-          node-version-file: './cli/.nvmrc'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          node-version-file: './server/.nvmrc'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Setup typescript-sdk
-        run: npm ci && npm run build
+        run: pnpm install && pnpm run build
         working-directory: ./open-api/typescript-sdk
 
       - name: Install deps
-        run: npm ci
+        run: pnpm install
 
       - name: Run linter
-        run: npm run lint
+        run: pnpm lint
         if: ${{ !cancelled() }}
 
       - name: Run formatter
-        run: npm run format
+        run: pnpm format
         if: ${{ !cancelled() }}
 
       - name: Run tsc
-        run: npm run check
+        run: pnpm check
         if: ${{ !cancelled() }}
 
       - name: Run unit tests & coverage
-        run: npm run test
+        run: pnpm test
         if: ${{ !cancelled() }}
 
   cli-unit-tests-win:
@@ -170,27 +176,30 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+
       - name: Setup Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
-          node-version-file: './cli/.nvmrc'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          node-version-file: './server/.nvmrc'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Setup typescript-sdk
-        run: npm ci && npm run build
+        run: pnpm install --frozen-lockfile && pnpm build
         working-directory: ./open-api/typescript-sdk
 
       - name: Install deps
-        run: npm ci
+        run: pnpm install --frozen-lockfile
 
       # Skip linter & formatter in Windows test.
       - name: Run tsc
-        run: npm run check
+        run: pnpm check
         if: ${{ !cancelled() }}
 
       - name: Run unit tests & coverage
-        run: npm run test
+        run: pnpm test
         if: ${{ !cancelled() }}
 
   web-lint:
@@ -210,30 +219,33 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+
       - name: Setup Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
-          node-version-file: './web/.nvmrc'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          node-version-file: './server/.nvmrc'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Run setup typescript-sdk
-        run: npm ci && npm run build
+        run: pnpm install --frozen-lockfile && pnpm build
         working-directory: ./open-api/typescript-sdk
 
       - name: Run npm install
-        run: npm ci
+        run: pnpm rebuild && pnpm install --frozen-lockfile
 
       - name: Run linter
-        run: npm run lint:p
+        run: pnpm lint:p
         if: ${{ !cancelled() }}
 
       - name: Run formatter
-        run: npm run format
+        run: pnpm format
         if: ${{ !cancelled() }}
 
       - name: Run svelte checks
-        run: npm run check:svelte
+        run: pnpm check:svelte
         if: ${{ !cancelled() }}
 
   web-unit-tests:
@@ -253,26 +265,29 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+
       - name: Setup Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
-          node-version-file: './web/.nvmrc'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          node-version-file: './server/.nvmrc'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Run setup typescript-sdk
-        run: npm ci && npm run build
+        run: pnpm install --frozen-lockfile && pnpm build
         working-directory: ./open-api/typescript-sdk
 
       - name: Run npm install
-        run: npm ci
+        run: pnpm install --frozen-lockfile
 
       - name: Run tsc
-        run: npm run check:typescript
+        run: pnpm check:typescript
         if: ${{ !cancelled() }}
 
       - name: Run unit tests & coverage
-        run: npm run test
+        run: pnpm test
         if: ${{ !cancelled() }}
 
   i18n-tests:
@@ -288,18 +303,21 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+
       - name: Setup Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
-          node-version-file: './web/.nvmrc'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          node-version-file: './server/.nvmrc'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Install dependencies
-        run: npm --prefix=web ci
+        run: pnpm --filter=immich-web install --frozen-lockfile
 
       - name: Format
-        run: npm --prefix=web run format:i18n
+        run: pnpm --filter=immich-web format:i18n
 
       - name: Find file changes
         uses: tj-actions/verify-changed-files@a1c6acee9df209257a246f2cc6ae8cb6581c1edf # v20.0.4
@@ -334,32 +352,35 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+
       - name: Setup Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
-          node-version-file: './e2e/.nvmrc'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          node-version-file: './server/.nvmrc'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Run setup typescript-sdk
-        run: npm ci && npm run build
+        run: pnpm install --frozen-lockfile && pnpm build
         working-directory: ./open-api/typescript-sdk
         if: ${{ !cancelled() }}
 
       - name: Install dependencies
-        run: npm ci
+        run: pnpm install --frozen-lockfile
         if: ${{ !cancelled() }}
 
       - name: Run linter
-        run: npm run lint
+        run: pnpm lint
         if: ${{ !cancelled() }}
 
       - name: Run formatter
-        run: npm run format
+        run: pnpm format
         if: ${{ !cancelled() }}
 
       - name: Run tsc
-        run: npm run check
+        run: pnpm check
         if: ${{ !cancelled() }}
 
   server-medium-tests:
@@ -379,18 +400,21 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+
       - name: Setup Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './server/.nvmrc'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Run npm install
-        run: npm ci
+        run: pnpm install --frozen-lockfile
 
       - name: Run medium tests
-        run: npm run test:medium
+        run: pnpm test:medium
         if: ${{ !cancelled() }}
 
   e2e-tests-server-cli:
@@ -414,25 +438,33 @@ jobs:
           persist-credentials: false
           submodules: 'recursive'
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+
       - name: Setup Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
-          node-version-file: './e2e/.nvmrc'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          node-version-file: './server/.nvmrc'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Run setup typescript-sdk
-        run: npm ci && npm run build
+        run: pnpm install --frozen-lockfile && pnpm build
         working-directory: ./open-api/typescript-sdk
         if: ${{ !cancelled() }}
 
+      - name: Run setup web
+        run: pnpm install --frozen-lockfile && pnpm exec svelte-kit sync
+        working-directory: ./web
+        if: ${{ !cancelled() }}
+
       - name: Run setup cli
-        run: npm ci && npm run build
+        run: pnpm install --frozen-lockfile && pnpm build
         working-directory: ./cli
         if: ${{ !cancelled() }}
 
       - name: Install dependencies
-        run: npm ci
+        run: pnpm install --frozen-lockfile
         if: ${{ !cancelled() }}
 
       - name: Docker build
@@ -440,7 +472,7 @@ jobs:
         if: ${{ !cancelled() }}
 
       - name: Run e2e tests (api & cli)
-        run: npm run test
+        run: pnpm test
         if: ${{ !cancelled() }}
 
   e2e-tests-web:
@@ -464,20 +496,23 @@ jobs:
           persist-credentials: false
           submodules: 'recursive'
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+
       - name: Setup Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
-          node-version-file: './e2e/.nvmrc'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          node-version-file: './server/.nvmrc'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Run setup typescript-sdk
-        run: npm ci && npm run build
+        run: pnpm install --frozen-lockfile && pnpm build
         working-directory: ./open-api/typescript-sdk
         if: ${{ !cancelled() }}
 
       - name: Install dependencies
-        run: npm ci
+        run: pnpm install --frozen-lockfile
         if: ${{ !cancelled() }}
 
       - name: Install Playwright Browsers
@@ -516,7 +551,7 @@ jobs:
           persist-credentials: false
 
       - name: Setup Flutter SDK
-        uses: subosito/flutter-action@395322a6cded4e9ed503aebd4cc1965625f8e59a # v2.20.0
+        uses: subosito/flutter-action@fd55f4c5af5b953cc57a2be44cb082c8f6635e8e # v2.21.0
         with:
           channel: 'stable'
           flutter-version-file: ./mobile/pubspec.yaml
@@ -584,18 +619,21 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+
       - name: Setup Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
-          node-version-file: './.github/.nvmrc'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          node-version-file: './server/.nvmrc'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Run npm install
-        run: npm ci
+        run: pnpm install --frozen-lockfile
 
       - name: Run formatter
-        run: npm run format
+        run: pnpm format
         if: ${{ !cancelled() }}
 
   shellcheck:
@@ -627,18 +665,21 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+
       - name: Setup Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './server/.nvmrc'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Install server dependencies
-        run: npm --prefix=server ci
+        run: pnpm --filter immich install --frozen-lockfile
 
       - name: Build the app
-        run: npm --prefix=server run build
+        run: pnpm --filter immich build
 
       - name: Run API generation
         run: make open-api
@@ -690,28 +731,31 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+
       - name: Setup Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './server/.nvmrc'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Install server dependencies
-        run: npm ci
+        run: pnpm install --frozen-lockfile
 
       - name: Build the app
-        run: npm run build
+        run: pnpm build
 
       - name: Run existing migrations
-        run: npm run migrations:run
+        run: pnpm migrations:run
 
       - name: Test npm run schema:reset command works
-        run: npm run schema:reset
+        run: pnpm schema:reset
 
       - name: Generate new migrations
         continue-on-error: true
-        run: npm run migrations:generate src/TestMigration
+        run: pnpm migrations:generate src/TestMigration
 
       - name: Find file changes
         uses: tj-actions/verify-changed-files@a1c6acee9df209257a246f2cc6ae8cb6581c1edf # v20.0.4
@@ -730,7 +774,7 @@ jobs:
           exit 1
 
       - name: Run SQL generation
-        run: npm run sync:sql
+        run: pnpm sync:sql
         env:
           DB_URL: postgres://postgres:postgres@localhost:5432/immich
 

Makefile

@@ -1,27 +1,33 @@
 dev:
-	docker compose -f ./docker/docker-compose.dev.yml up --remove-orphans || make dev-down
+	@trap 'make dev-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.dev.yml up --remove-orphans
 
 dev-down:
 	docker compose -f ./docker/docker-compose.dev.yml down --remove-orphans
 
 dev-update:
-	docker compose -f ./docker/docker-compose.dev.yml up --build -V --remove-orphans
+	@trap 'make dev-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.dev.yml up --build -V --remove-orphans
 
 dev-scale:
-	docker compose -f ./docker/docker-compose.dev.yml up --build -V  --scale immich-server=3 --remove-orphans
+	@trap 'make dev-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.dev.yml up --build -V  --scale immich-server=3 --remove-orphans
 
 .PHONY: e2e
 e2e:
-	docker compose -f ./e2e/docker-compose.yml up --build -V --remove-orphans
+	@trap 'make e2e-down' EXIT; COMPOSE_BAKE=true docker compose -f ./e2e/docker-compose.yml up --build -V --remove-orphans
+
+e2e-update:
+	@trap 'make e2e-down' EXIT; COMPOSE_BAKE=true docker compose -f ./e2e/docker-compose.yml up --build -V --remove-orphans
+
+e2e-down:
+	docker compose -f ./e2e/docker-compose.yml down --remove-orphans
 
 prod:
-	docker compose -f ./docker/docker-compose.prod.yml up --build -V --remove-orphans
+	@trap 'make prod-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.prod.yml up --build -V --remove-orphans
 
 prod-down:
 	docker compose -f ./docker/docker-compose.prod.yml down --remove-orphans
 
 prod-scale:
-	docker compose -f ./docker/docker-compose.prod.yml up --build -V --scale immich-server=3 --scale immich-microservices=3 --remove-orphans
+	@trap 'make prod-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.prod.yml up --build -V --scale immich-server=3 --scale immich-microservices=3 --remove-orphans
 
 .PHONY: open-api
 open-api:
@@ -34,7 +40,7 @@ open-api-typescript:
 	cd ./open-api && bash ./bin/generate-open-api.sh typescript
 
 sql:
-	npm --prefix server run sync:sql
+	pnpm --filter immich run sync:sql
 
 attach-server:
 	docker exec -it docker_immich-server_1 sh
@@ -44,31 +50,40 @@ renovate:
 
 MODULES = e2e server web cli sdk docs .github
 
+# directory to package name mapping function
+#   cli     = @immich/cli
+#   docs    = documentation
+#   e2e     = immich-e2e
+#   open-api/typescript-sdk = @immich/sdk
+#   server  = immich
+#   web     = immich-web
+map-package = $(subst sdk,@immich/sdk,$(subst cli,@immich/cli,$(subst docs,documentation,$(subst e2e,immich-e2e,$(subst server,immich,$(subst web,immich-web,$1))))))
+
 audit-%:
-	npm --prefix $(subst sdk,open-api/typescript-sdk,$*) audit fix
+	pnpm --filter $(call map-package,$*) audit fix
 install-%:
-	npm --prefix $(subst sdk,open-api/typescript-sdk,$*) i
-ci-%:
-	npm --prefix $(subst sdk,open-api/typescript-sdk,$*) ci
+	pnpm --filter $(call map-package,$*) install $(if $(FROZEN),--frozen-lockfile) $(if $(OFFLINE),--offline)
 build-cli: build-sdk
 build-web: build-sdk
 build-%: install-%
-	npm --prefix $(subst sdk,open-api/typescript-sdk,$*) run build
+	pnpm --filter $(call map-package,$*) run build
 format-%:
-	npm --prefix $* run format:fix
+	pnpm --filter $(call map-package,$*) run format:fix
 lint-%:
-	npm --prefix $* run lint:fix
+	pnpm --filter $(call map-package,$*) run lint:fix
+lint-web:
+	pnpm --filter $(call map-package,$*) run lint:p
 check-%:
-	npm --prefix $* run check
+	pnpm --filter $(call map-package,$*) run check
 check-web:
-	npm --prefix web run check:typescript
-	npm --prefix web run check:svelte
+	pnpm --filter immich-web run check:typescript
+	pnpm --filter immich-web run check:svelte
 test-%:
-	npm --prefix $* run test
+	pnpm --filter $(call map-package,$*) run test
 test-e2e:
 	docker compose -f ./e2e/docker-compose.yml build
-	npm --prefix e2e run test
-	npm --prefix e2e run test:web
+	pnpm --filter immich-e2e run test
+	pnpm --filter immich-e2e run test:web
 test-medium:
 	docker run \
     --rm \
@@ -78,24 +93,34 @@ test-medium:
     -v ./server/tsconfig.json:/usr/src/app/tsconfig.json \
     -e NODE_ENV=development \
     immich-server:latest \
-    -c "npm ci && npm run test:medium -- --run"
+    -c "pnpm test:medium -- --run"
 test-medium-dev:
-	docker exec -it immich_server /bin/sh -c "npm run test:medium"
+	docker exec -it immich_server /bin/sh -c "pnpm run test:medium"
 
-build-all: $(foreach M,$(filter-out e2e .github,$(MODULES)),build-$M) ;
-install-all: $(foreach M,$(MODULES),install-$M) ;  
-ci-all: $(foreach M,$(filter-out .github,$(MODULES)),ci-$M) ;
-check-all: $(foreach M,$(filter-out sdk cli docs .github,$(MODULES)),check-$M) ;
-lint-all: $(foreach M,$(filter-out sdk docs .github,$(MODULES)),lint-$M) ;
-format-all: $(foreach M,$(filter-out sdk,$(MODULES)),format-$M) ;
-audit-all:  $(foreach M,$(MODULES),audit-$M) ;
-hygiene-all: lint-all format-all check-all sql audit-all;
-test-all: $(foreach M,$(filter-out sdk docs .github,$(MODULES)),test-$M) ;
+install-all:
+	pnpm -r --filter '!documentation' install
+
+build-all: $(foreach M,$(filter-out e2e docs .github,$(MODULES)),build-$M) ;
+
+check-all:
+	pnpm -r --filter '!documentation' run "/^(check|check\:svelte|check\:typescript)$/"
+lint-all:
+	pnpm -r --filter '!documentation' run lint:fix
+format-all:
+	pnpm -r --filter '!documentation' run format:fix
+audit-all:
+	pnpm -r --filter '!documentation' audit fix
+hygiene-all: audit-all
+	pnpm -r --filter '!documentation' run "/(format:fix|check|check:svelte|check:typescript|sql)/"
+
+test-all:
+	pnpm -r --filter '!documentation' run "/^test/"
 
 clean:
-	find . -name "node_modules" -type d -prune -exec rm -rf '{}' +
+	find . -name "node_modules" -type d -prune -exec rm -rf {} +
 	find . -name "dist" -type d -prune -exec rm -rf '{}' +
 	find . -name "build" -type d -prune -exec rm -rf '{}' +
 	find . -name "svelte-kit" -type d -prune -exec rm -rf '{}' +
-	docker compose -f ./docker/docker-compose.dev.yml rm -v -f || true
-	docker compose -f ./e2e/docker-compose.yml rm -v -f || true
+	command -v docker >/dev/null 2>&1 && docker compose -f ./docker/docker-compose.dev.yml rm -v -f || true
+	command -v docker >/dev/null 2>&1 && docker compose -f ./e2e/docker-compose.yml rm -v -f || true
+setup-dev: install-server install-sdk build-sdk install-web

cli/.nvmrc

@@ -1 +1 @@
-22.16.0
+22.17.0

cli/Dockerfile

@@ -1,19 +1,41 @@
 FROM node:22.16.0-alpine3.20@sha256:2289fb1fba0f4633b08ec47b94a89c7e20b829fc5679f9b7b298eaa2f1ed8b7e AS core
 
-WORKDIR /usr/src/open-api/typescript-sdk
-COPY open-api/typescript-sdk/package*.json open-api/typescript-sdk/tsconfig*.json ./
-RUN npm ci
-COPY open-api/typescript-sdk/ ./
-RUN npm run build
+ENV COREPACK_ENABLE_AUTO_PIN=0 \
+    COREPACK_ENABLE_DOWNLOAD_PROMPT=0 
+
+RUN corepack enable && \
+    corepack install -g pnpm 
 
 WORKDIR /usr/src/app
+COPY --chown=node:node . .
 
-COPY cli/package.json cli/package-lock.json ./
-RUN npm ci
+WORKDIR /usr/src/app/web
+RUN --mount=type=cache,id=pnpm,target=/buildcache,uid=1000,gid=1000 \
+    pnpm install --frozen-lockfile && \
+    pnpm exec svelte-kit sync
 
-COPY cli .
-RUN npm run build
+WORKDIR /usr/src/app/open-api/typescript-sdk
+RUN --mount=type=cache,id=pnpm,target=/buildcache,uid=1000,gid=1000 \
+    pnpm install --frozen-lockfile && \
+    pnpm build
+
+WORKDIR /usr/src/app/cli
+RUN --mount=type=cache,id=pnpm,target=/buildcache,uid=1000,gid=1000 \
+    pnpm install --frozen-lockfile --prod --no-optional && \
+    pnpm build
+
+RUN rm -rf /usr/src/app/web && \
+    rm -rf /usr/src/app/open-api && \
+    rm -rf /usr/src/app/cli/src && \
+    rm -rf /usr/src/app/cli/src && \
+    rm -rf /usr/src/app/server && \
+    rm -rf /usr/src/app/i18n && \
+    rm -rf /usr/src/app/e2e && \
+    rm -rf /usr/src/app/docs && \
+    rm -rf /usr/src/app/readme_i18n && \
+    rm -rf /usr/src/app/deployment && \
+    rm -rf /usr/src/app/docker 
 
 WORKDIR /import
 
-ENTRYPOINT ["node", "/usr/src/app/dist"]
+ENTRYPOINT ["node", "/usr/src/app/cli/dist"]

cli/README.md

@@ -6,8 +6,10 @@ Please see the [Immich CLI documentation](https://immich.app/docs/features/comma
 
 Before building the CLI, you must build the immich server and the open-api client. To build the server run the following in the server folder:
 
-    $ npm install
-    $ npm run build
+    # if you don't have node installed
+    $ npm install -g pnpm 
+    $ pnpm install
+    $ pnpm build
 
 Then, to build the open-api client run the following in the open-api folder:
 
@@ -15,8 +17,10 @@ Then, to build the open-api client run the following in the open-api folder:
 
 To run the Immich CLI from source, run the following in the cli folder:
 
-    $ npm install
-    $ npm run build
+    # if you don't have node installed
+    $ npm install -g pnpm 
+    $ pnpm install
+    $ pnpm build
     $ ts-node .
 
 You'll need ts-node, the easiest way to install it is to use npm:

cli/bin/immich

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+import '../dist/index.js';

cli/package.json

@@ -5,7 +5,7 @@
   "type": "module",
   "exports": "./dist/index.js",
   "bin": {
-    "immich": "dist/index.js"
+    "immich": "./bin/immich"
   },
   "license": "GNU Affero General Public License version 3",
   "keywords": [
@@ -21,7 +21,7 @@
     "@types/lodash-es": "^4.17.12",
     "@types/micromatch": "^4.0.9",
     "@types/mock-fs": "^4.13.1",
-    "@types/node": "^22.15.32",
+    "@types/node": "^22.15.33",
     "@vitest/coverage-v8": "^3.0.0",
     "byte-size": "^9.0.0",
     "cli-progress": "^3.12.0",
@@ -69,6 +69,6 @@
     "micromatch": "^4.0.8"
   },
   "volta": {
-    "node": "22.16.0"
+    "node": "22.17.0"
   }
 }

docker/docker-compose.dev.yml

@@ -16,7 +16,7 @@ name: immich-dev
 services:
   immich-server:
     container_name: immich_server
-    command: ['/usr/src/app/bin/immich-dev']
+    command: ['/usr/src/app/server/bin/immich-dev']
     image: immich-server-dev:latest
     # extends:
     #   file: hwaccel.transcoding.yml
@@ -24,13 +24,12 @@ services:
     build:
       context: ../
       dockerfile: server/Dockerfile
-      target: dev
+      target: dev-docker
     restart: unless-stopped
     volumes:
-      - ../server:/usr/src/app
-      - ../open-api:/usr/src/open-api
-      - ${UPLOAD_LOCATION}/photos:/usr/src/app/upload
-      - ${UPLOAD_LOCATION}/photos/upload:/usr/src/app/upload/upload
+      - ..:/usr/src/app
+      - ${UPLOAD_LOCATION}/photos:/usr/src/app/server/upload
+      - ${UPLOAD_LOCATION}/photos/upload:/usr/src/app/server/upload/upload
       - /usr/src/app/node_modules
       - /etc/localtime:/etc/localtime:ro
     env_file:
@@ -69,17 +68,16 @@ services:
     # Needed for rootless docker setup, see https://github.com/moby/moby/issues/45919
     # user: 0:0
     build:
-      context: ../web
-    command: ['/usr/src/app/bin/immich-web']
+      context: ../
+      dockerfile: web/Dockerfile
+    command: ['/usr/src/app/web/bin/immich-web']
     env_file:
       - .env
     ports:
       - 3000:3000
       - 24678:24678
     volumes:
-      - ../web:/usr/src/app
-      - ../i18n:/usr/src/i18n
-      - ../open-api/:/usr/src/open-api/
+      - ..:/usr/src/app
       # - ../../ui:/usr/ui
       - /usr/src/app/node_modules
     ulimits:

docker/docker-compose.prod.yml

@@ -83,7 +83,7 @@ services:
     container_name: immich_prometheus
     ports:
       - 9090:9090
-    image: prom/prometheus@sha256:9abc6cf6aea7710d163dbb28d8eeb7dc5baef01e38fa4cd146a406dd9f07f70d
+    image: prom/prometheus@sha256:7a34573f0b9c952286b33d537f233cd5b708e12263733aa646e50c33f598f16c
     volumes:
       - ./prometheus.yml:/etc/prometheus/prometheus.yml
       - prometheus-data:/prometheus

docs/.nvmrc

@@ -1 +1 @@
-22.16.0
+22.17.0

docs/.prettierignore

@@ -1,2 +1,7 @@
 build/
 .docusaurus/
+
+# Ignore files for PNPM, NPM and YARN
+pnpm-lock.yaml
+package-lock.json
+yarn.lock

docs/README.md

@@ -5,7 +5,7 @@ This website is built using [Docusaurus](https://docusaurus.io/), a modern stati
 ### Installation
 
 ```
-$ npm install
+$ pnpm install
 ```
 
 ### Local Development

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

@@ -150,12 +150,10 @@ for more info read the [release notes](https://github.com/immich-app/immich/rele
   - Preview images (small thumbnails and large previews) for each asset and thumbnails for recognized faces.
   - Stored in `UPLOAD_LOCATION/thumbs/<userID>`.
 - **Encoded Assets:**
-
   - Videos that have been re-encoded from the original for wider compatibility. The original is not removed.
   - Stored in `UPLOAD_LOCATION/encoded-video/<userID>`.
 
 - **Postgres**
-
   - The Immich database containing all the information to allow the system to function properly.  
     **Note:** This folder will only appear to users who have made the changes mentioned in [v1.102.0](https://github.com/immich-app/immich/discussions/8930) (an optional, non-mandatory change) or who started with this version.
   - Stored in `DB_DATA_LOCATION`.
@@ -201,7 +199,6 @@ When you turn off the storage template engine, it will leave the assets in `UPLO
   - Temporarily located in `UPLOAD_LOCATION/upload/<userID>`.
   - Transferred to `UPLOAD_LOCATION/library/<userID>` upon successful upload.
 - **Postgres**
-
   - The Immich database containing all the information to allow the system to function properly.  
     **Note:** This folder will only appear to users who have made the changes mentioned in [v1.102.0](https://github.com/immich-app/immich/discussions/8930) (an optional, non-mandatory change) or who started with this version.
   - Stored in `DB_DATA_LOCATION`.

docs/docs/administration/oauth.md

@@ -20,7 +20,6 @@ Immich supports 3rd party authentication via [OpenID Connect][oidc] (OIDC), an i
 Before enabling OAuth in Immich, a new client application needs to be configured in the 3rd-party authentication server. While the specifics of this setup vary from provider to provider, the general approach should be the same.
 
 1. Create a new (Client) Application
-
    1. The **Provider** type should be `OpenID Connect` or `OAuth2`
    2. The **Client type** should be `Confidential`
    3. The **Application** type should be `Web`
@@ -29,7 +28,6 @@ Before enabling OAuth in Immich, a new client application needs to be configured
 2. Configure Redirect URIs/Origins
 
    The **Sign-in redirect URIs** should include:
-
    - `app.immich:///oauth-callback` - for logging in with OAuth from the [Mobile App](/docs/features/mobile-app.mdx)
    - `http://DOMAIN:PORT/auth/login` - for logging in with OAuth from the Web Client
    - `http://DOMAIN:PORT/user-settings` - for manually linking OAuth in the Web Client
@@ -37,21 +35,17 @@ Before enabling OAuth in Immich, a new client application needs to be configured
    Redirect URIs should contain all the domains you will be using to access Immich. Some examples include:
 
    Mobile
-
    - `app.immich:///oauth-callback` (You **MUST** include this for iOS and Android mobile apps to work properly)
 
    Localhost
-
    - `http://localhost:2283/auth/login`
    - `http://localhost:2283/user-settings`
 
    Local IP
-
    - `http://192.168.0.200:2283/auth/login`
    - `http://192.168.0.200:2283/user-settings`
 
    Hostname
-
    - `https://immich.example.com/auth/login`
    - `https://immich.example.com/user-settings`
 

docs/docs/developer/devcontainers.md

@@ -199,13 +199,11 @@ To use your SSH key for commit signing, see the [GitHub guide on SSH commit sign
 When the Dev Container starts, it automatically:
 
 1. **Runs post-create script** (`container-server-post-create.sh`):
-
    - Adjusts file permissions for the `node` user
-   - Installs dependencies: `npm install` in all packages
+   - Installs dependencies: `pnpm install` in all packages
    - Builds TypeScript SDK: `npm run build` in `open-api/typescript-sdk`
 
 2. **Starts development servers** via VS Code tasks:
-
    - `Immich API Server (Nest)` - API server with hot-reloading on port 2283
    - `Immich Web Server (Vite)` - Web frontend with hot-reloading on port 3000
    - Both servers watch for file changes and recompile automatically
@@ -335,14 +333,12 @@ make install-all      # Install all dependencies
 The Dev Container is pre-configured for debugging:
 
 1. **API Server Debugging**:
-
    - Set breakpoints in VS Code
    - Press `F5` or use "Run and Debug" panel
    - Select "Attach to Server" configuration
    - Debug port: 9231
 
 2. **Worker Debugging**:
-
    - Use "Attach to Workers" configuration
    - Debug port: 9230
 
@@ -428,7 +424,6 @@ While the Dev Container focuses on server and web development, you can connect m
    ```
 
 2. **Configure mobile app**:
-
    - Server URL: `http://YOUR_IP:2283/api`
    - Ensure firewall allows port 2283
 

docs/docs/developer/setup.md

@@ -56,7 +56,7 @@ If you only want to do web development connected to an existing, remote backend,
 
 1. Build the Immich SDK - `cd open-api/typescript-sdk && npm i && npm run build && cd -`
 2. Enter the web directory - `cd web/`
-3. Install web dependencies - `npm i`
+3. Install web dependencies - `pnpm i`
 4. Start the web development server
 
 ```bash

docs/docs/developer/testing.md

@@ -5,7 +5,7 @@
 ### Unit tests
 
 Unit are run by calling `npm run test` from the `server/` directory.
-You need to run `npm install` (in `server/`) before _once_.
+You need to run `pnpm install` (in `server/`) before _once_.
 
 ### End to end tests
 

docs/docs/install/environment-variables.md

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

docs/docs/install/unraid.md

@@ -75,7 +75,6 @@ alt="Select Plugins > Compose.Manager > Add New Stack > Label it Immich"
 5.  Click "**Save Changes**", you will be prompted to edit stack UI labels, just leave this blank and click "**Ok**"
 6.  Select the cog ⚙️ next to Immich, click "**Edit Stack**", then click "**Env File**"
 7.  Paste the entire contents of the [Immich example.env](https://github.com/immich-app/immich/releases/latest/download/example.env) file into the Unraid editor, then **before saving** edit the following:
-
     - `UPLOAD_LOCATION`: Create a folder in your Images Unraid share and place the **absolute** location here > For example my _"images"_ share has a folder within it called _"immich"_. If I browse to this directory in the terminal and type `pwd` the output is `/mnt/user/images/immich`. This is the exact value I need to enter as my `UPLOAD_LOCATION`
     - `DB_DATA_LOCATION`: Change this to use an Unraid share (preferably a cache pool, e.g. `/mnt/user/appdata/postgresql/data`). This uses the `appdata` share. Do also create the `postgresql` folder, by running `mkdir /mnt/user/{share_location}/postgresql/data`. If left at default it will try to use Unraid's `/boot/config/plugins/compose.manager/projects/[stack_name]/postgres` folder which it doesn't have permissions to, resulting in this container continuously restarting.
 

docs/package.json

@@ -16,8 +16,9 @@
     "write-heading-ids": "docusaurus write-heading-ids"
   },
   "dependencies": {
-    "@docusaurus/core": "~3.7.0",
-    "@docusaurus/preset-classic": "~3.7.0",
+    "@docusaurus/core": "~3.8.0",
+    "@docusaurus/preset-classic": "~3.8.0",
+    "@docusaurus/theme-common": "~3.8.0",
     "@mdi/js": "^7.3.67",
     "@mdi/react": "^1.6.1",
     "@mdx-js/react": "^3.0.0",
@@ -26,6 +27,7 @@
     "clsx": "^2.0.0",
     "docusaurus-lunr-search": "^3.3.2",
     "docusaurus-preset-openapi": "^0.7.5",
+    "lunr": "^2.3.9",
     "postcss": "^8.4.25",
     "prism-react-renderer": "^2.3.1",
     "raw-loader": "^4.0.2",
@@ -35,7 +37,7 @@
     "url": "^0.11.0"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "~3.7.0",
+    "@docusaurus/module-type-aliases": "~3.8.0",
     "@docusaurus/tsconfig": "^3.7.0",
     "@docusaurus/types": "^3.7.0",
     "prettier": "^3.2.4",
@@ -57,6 +59,6 @@
     "node": ">=20"
   },
   "volta": {
-    "node": "22.16.0"
+    "node": "22.17.0"
   }
 }

docs/src/components/community-guides.tsx

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

e2e/.nvmrc

@@ -1 +1 @@
-22.16.0
+22.17.0

e2e/package.json

@@ -25,7 +25,7 @@
     "@immich/sdk": "file:../open-api/typescript-sdk",
     "@playwright/test": "^1.44.1",
     "@types/luxon": "^3.4.2",
-    "@types/node": "^22.15.32",
+    "@types/node": "^22.15.33",
     "@types/oidc-provider": "^9.0.0",
     "@types/pg": "^8.15.1",
     "@types/pngjs": "^6.0.4",
@@ -44,7 +44,7 @@
     "pngjs": "^7.0.0",
     "prettier": "^3.2.5",
     "prettier-plugin-organize-imports": "^4.0.0",
-    "sharp": "^0.33.5",
+    "sharp": "^0.34.0",
     "socket.io-client": "^4.7.4",
     "supertest": "^7.0.0",
     "typescript": "^5.3.3",
@@ -53,6 +53,6 @@
     "vitest": "^3.0.0"
   },
   "volta": {
-    "node": "22.16.0"
+    "node": "22.17.0"
   }
 }

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

@@ -1,146 +0,0 @@
-import { LoginResponseDto, login, signUpAdmin } from '@immich/sdk';
-import { loginDto, signupDto } from 'src/fixtures';
-import { errorDto, loginResponseDto, signupResponseDto } from 'src/responses';
-import { app, utils } from 'src/utils';
-import request from 'supertest';
-import { beforeEach, describe, expect, it } from 'vitest';
-
-const { email, password } = signupDto.admin;
-
-describe(`/auth/admin-sign-up`, () => {
-  beforeEach(async () => {
-    await utils.resetDatabase();
-  });
-
-  describe('POST /auth/admin-sign-up', () => {
-    it(`should sign up the admin`, async () => {
-      const { status, body } = await request(app).post('/auth/admin-sign-up').send(signupDto.admin);
-      expect(status).toBe(201);
-      expect(body).toEqual(signupResponseDto.admin);
-    });
-
-    it('should not allow a second admin to sign up', async () => {
-      await signUpAdmin({ signUpDto: signupDto.admin });
-
-      const { status, body } = await request(app).post('/auth/admin-sign-up').send(signupDto.admin);
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.alreadyHasAdmin);
-    });
-  });
-});
-
-describe('/auth/*', () => {
-  let admin: LoginResponseDto;
-
-  beforeEach(async () => {
-    await utils.resetDatabase();
-    await signUpAdmin({ signUpDto: signupDto.admin });
-    admin = await login({ loginCredentialDto: loginDto.admin });
-  });
-
-  describe(`POST /auth/login`, () => {
-    it('should reject an incorrect password', async () => {
-      const { status, body } = await request(app).post('/auth/login').send({ email, password: 'incorrect' });
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.incorrectLogin);
-    });
-
-    it('should accept a correct password', async () => {
-      const { status, body, headers } = await request(app).post('/auth/login').send({ email, password });
-      expect(status).toBe(201);
-      expect(body).toEqual(loginResponseDto.admin);
-
-      const token = body.accessToken;
-      expect(token).toBeDefined();
-
-      const cookies = headers['set-cookie'];
-      expect(cookies).toHaveLength(3);
-      expect(cookies[0].split(';').map((item) => item.trim())).toEqual([
-        `immich_access_token=${token}`,
-        'Max-Age=34560000',
-        'Path=/',
-        expect.stringContaining('Expires='),
-        'HttpOnly',
-        'SameSite=Lax',
-      ]);
-      expect(cookies[1].split(';').map((item) => item.trim())).toEqual([
-        'immich_auth_type=password',
-        'Max-Age=34560000',
-        'Path=/',
-        expect.stringContaining('Expires='),
-        'HttpOnly',
-        'SameSite=Lax',
-      ]);
-      expect(cookies[2].split(';').map((item) => item.trim())).toEqual([
-        'immich_is_authenticated=true',
-        'Max-Age=34560000',
-        'Path=/',
-        expect.stringContaining('Expires='),
-        'SameSite=Lax',
-      ]);
-    });
-  });
-
-  describe('POST /auth/validateToken', () => {
-    it('should reject an invalid token', async () => {
-      const { status, body } = await request(app).post(`/auth/validateToken`).set('Authorization', 'Bearer 123');
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.invalidToken);
-    });
-
-    it('should accept a valid token', async () => {
-      const { status, body } = await request(app)
-        .post(`/auth/validateToken`)
-        .send({})
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(status).toBe(200);
-      expect(body).toEqual({ authStatus: true });
-    });
-  });
-
-  describe('POST /auth/change-password', () => {
-    it('should require the current password', async () => {
-      const { status, body } = await request(app)
-        .post(`/auth/change-password`)
-        .send({ password: 'wrong-password', newPassword: 'Password1234' })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.wrongPassword);
-    });
-
-    it('should change the password', async () => {
-      const { status } = await request(app)
-        .post(`/auth/change-password`)
-        .send({ password, newPassword: 'Password1234' })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(status).toBe(200);
-
-      await login({
-        loginCredentialDto: {
-          email: 'admin@immich.cloud',
-          password: 'Password1234',
-        },
-      });
-    });
-  });
-
-  describe('POST /auth/logout', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).post(`/auth/logout`);
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should logout the user', async () => {
-      const { status, body } = await request(app)
-        .post(`/auth/logout`)
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(status).toBe(200);
-      expect(body).toEqual({
-        successful: true,
-        redirectUri: '/auth/login?autoLaunch=0',
-      });
-    });
-  });
-});

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

@@ -117,6 +117,13 @@ describe('/shared-links', () => {
       const resp = await request(shareUrl).get(`/${linkWithAssets.key}`);
       expect(resp.status).toBe(200);
       expect(resp.header['content-type']).toContain('text/html');
+      expect(resp.text).toContain(`<meta property="og:image" content="http://127.0.0.1:2285`);
+    });
+
+    it('should fall back to my.immich.app og:image meta tag for shared asset if Host header is not present', async () => {
+      const resp = await request(shareUrl).get(`/${linkWithAssets.key}`).set('Host', '');
+      expect(resp.status).toBe(200);
+      expect(resp.header['content-type']).toContain('text/html');
       expect(resp.text).toContain(`<meta property="og:image" content="https://my.immich.app`);
     });
 

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

@@ -1,230 +0,0 @@
-import {
-  AssetMediaResponseDto,
-  AssetVisibility,
-  LoginResponseDto,
-  SharedLinkType,
-  TimeBucketAssetResponseDto,
-} from '@immich/sdk';
-import { DateTime } from 'luxon';
-import { createUserDto } from 'src/fixtures';
-import { errorDto } from 'src/responses';
-import { app, utils } from 'src/utils';
-import request from 'supertest';
-import { beforeAll, describe, expect, it } from 'vitest';
-
-// TODO this should probably be a test util function
-const today = DateTime.fromObject({
-  year: 2023,
-  month: 11,
-  day: 3,
-}) as DateTime<true>;
-const yesterday = today.minus({ days: 1 });
-
-describe('/timeline', () => {
-  let admin: LoginResponseDto;
-  let user: LoginResponseDto;
-  let timeBucketUser: LoginResponseDto;
-
-  let user1Assets: AssetMediaResponseDto[];
-  let user2Assets: AssetMediaResponseDto[];
-
-  beforeAll(async () => {
-    await utils.resetDatabase();
-    admin = await utils.adminSetup({ onboarding: false });
-    [user, timeBucketUser] = await Promise.all([
-      utils.userSetup(admin.accessToken, createUserDto.create('1')),
-      utils.userSetup(admin.accessToken, createUserDto.create('time-bucket')),
-    ]);
-
-    user1Assets = await Promise.all([
-      utils.createAsset(user.accessToken),
-      utils.createAsset(user.accessToken),
-      utils.createAsset(user.accessToken, {
-        isFavorite: true,
-        fileCreatedAt: yesterday.toISO(),
-        fileModifiedAt: yesterday.toISO(),
-        assetData: { filename: 'example.mp4' },
-      }),
-      utils.createAsset(user.accessToken),
-      utils.createAsset(user.accessToken),
-    ]);
-
-    user2Assets = await Promise.all([
-      utils.createAsset(timeBucketUser.accessToken, { fileCreatedAt: new Date('1970-01-01').toISOString() }),
-      utils.createAsset(timeBucketUser.accessToken, { fileCreatedAt: new Date('1970-02-10').toISOString() }),
-      utils.createAsset(timeBucketUser.accessToken, { fileCreatedAt: new Date('1970-02-11').toISOString() }),
-      utils.createAsset(timeBucketUser.accessToken, { fileCreatedAt: new Date('1970-02-11').toISOString() }),
-      utils.createAsset(timeBucketUser.accessToken, { fileCreatedAt: new Date('1970-02-12').toISOString() }),
-    ]);
-
-    await utils.deleteAssets(timeBucketUser.accessToken, [user2Assets[4].id]);
-  });
-
-  describe('GET /timeline/buckets', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).get('/timeline/buckets');
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should get time buckets by month', async () => {
-      const { status, body } = await request(app)
-        .get('/timeline/buckets')
-        .set('Authorization', `Bearer ${timeBucketUser.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toEqual(
-        expect.arrayContaining([
-          { count: 3, timeBucket: '1970-02-01' },
-          { count: 1, timeBucket: '1970-01-01' },
-        ]),
-      );
-    });
-
-    it('should not allow access for unrelated shared links', async () => {
-      const sharedLink = await utils.createSharedLink(user.accessToken, {
-        type: SharedLinkType.Individual,
-        assetIds: user1Assets.map(({ id }) => id),
-      });
-
-      const { status, body } = await request(app).get('/timeline/buckets').query({ key: sharedLink.key });
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.noPermission);
-    });
-
-    it('should return error if time bucket is requested with partners asset and archived', async () => {
-      const req1 = await request(app)
-        .get('/timeline/buckets')
-        .set('Authorization', `Bearer ${timeBucketUser.accessToken}`)
-        .query({ withPartners: true, visibility: AssetVisibility.Archive });
-
-      expect(req1.status).toBe(400);
-      expect(req1.body).toEqual(errorDto.badRequest());
-
-      const req2 = await request(app)
-        .get('/timeline/buckets')
-        .set('Authorization', `Bearer ${user.accessToken}`)
-        .query({ withPartners: true, visibility: undefined });
-
-      expect(req2.status).toBe(400);
-      expect(req2.body).toEqual(errorDto.badRequest());
-    });
-
-    it('should return error if time bucket is requested with partners asset and favorite', async () => {
-      const req1 = await request(app)
-        .get('/timeline/buckets')
-        .set('Authorization', `Bearer ${timeBucketUser.accessToken}`)
-        .query({ withPartners: true, isFavorite: true });
-
-      expect(req1.status).toBe(400);
-      expect(req1.body).toEqual(errorDto.badRequest());
-
-      const req2 = await request(app)
-        .get('/timeline/buckets')
-        .set('Authorization', `Bearer ${timeBucketUser.accessToken}`)
-        .query({ withPartners: true, isFavorite: false });
-
-      expect(req2.status).toBe(400);
-      expect(req2.body).toEqual(errorDto.badRequest());
-    });
-
-    it('should return error if time bucket is requested with partners asset and trash', async () => {
-      const req = await request(app)
-        .get('/timeline/buckets')
-        .set('Authorization', `Bearer ${user.accessToken}`)
-        .query({ withPartners: true, isTrashed: true });
-
-      expect(req.status).toBe(400);
-      expect(req.body).toEqual(errorDto.badRequest());
-    });
-  });
-
-  describe('GET /timeline/bucket', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).get('/timeline/bucket').query({
-        timeBucket: '1900-01-01',
-      });
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should handle 5 digit years', async () => {
-      const { status, body } = await request(app)
-        .get('/timeline/bucket')
-        .query({ timeBucket: '012345-01-01' })
-        .set('Authorization', `Bearer ${timeBucketUser.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toEqual({
-        city: [],
-        country: [],
-        duration: [],
-        id: [],
-        visibility: [],
-        isFavorite: [],
-        isImage: [],
-        isTrashed: [],
-        livePhotoVideoId: [],
-        fileCreatedAt: [],
-        localOffsetHours: [],
-        ownerId: [],
-        projectionType: [],
-        ratio: [],
-        status: [],
-        thumbhash: [],
-      });
-    });
-
-    // TODO enable date string validation while still accepting 5 digit years
-    // it('should fail if time bucket is invalid', async () => {
-    //   const { status, body } = await request(app)
-    //     .get('/timeline/bucket')
-    //     .set('Authorization', `Bearer ${user.accessToken}`)
-    //     .query({  timeBucket: 'foo' });
-
-    //   expect(status).toBe(400);
-    //   expect(body).toEqual(errorDto.badRequest);
-    // });
-
-    it('should return time bucket', async () => {
-      const { status, body } = await request(app)
-        .get('/timeline/bucket')
-        .set('Authorization', `Bearer ${timeBucketUser.accessToken}`)
-        .query({ timeBucket: '1970-02-10' });
-
-      expect(status).toBe(200);
-      expect(body).toEqual({
-        city: [],
-        country: [],
-        duration: [],
-        id: [],
-        visibility: [],
-        isFavorite: [],
-        isImage: [],
-        isTrashed: [],
-        livePhotoVideoId: [],
-        fileCreatedAt: [],
-        localOffsetHours: [],
-        ownerId: [],
-        projectionType: [],
-        ratio: [],
-        status: [],
-        thumbhash: [],
-      });
-    });
-
-    it('should return time bucket in trash', async () => {
-      const { status, body } = await request(app)
-        .get('/timeline/bucket')
-        .set('Authorization', `Bearer ${timeBucketUser.accessToken}`)
-        .query({ timeBucket: '1970-02-01T00:00:00.000Z', isTrashed: true });
-
-      expect(status).toBe(200);
-
-      const timeBucket: TimeBucketAssetResponseDto = body;
-      expect(timeBucket.isTrashed).toEqual([true]);
-    });
-  });
-});

e2e/src/utils.ts

@@ -60,6 +60,7 @@ import { io, type Socket } from 'socket.io-client';
 import { loginDto, signupDto } from 'src/fixtures';
 import { makeRandomImage } from 'src/generators';
 import request from 'supertest';
+export type { Emitter } from '@socket.io/component-emitter';
 
 type CommandResponse = { stdout: string; stderr: string; exitCode: number | null };
 type EventType = 'assetUpload' | 'assetUpdate' | 'assetDelete' | 'userDelete' | 'assetHidden';
@@ -78,16 +79,16 @@ export const tempDir = tmpdir();
 export const asBearerAuth = (accessToken: string) => ({ Authorization: `Bearer ${accessToken}` });
 export const asKeyAuth = (key: string) => ({ 'x-api-key': key });
 export const immichCli = (args: string[]) =>
-  executeCommand('node', ['node_modules/.bin/immich', '-d', `/${tempDir}/immich/`, ...args]).promise;
+  executeCommand('pnpm', ['exec', 'immich', '-d', `/${tempDir}/immich/`, ...args], { cwd: '../cli' }).promise;
 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[]) => {
+const executeCommand = (command: string, args: string[], options?: { cwd?: string }) => {
   let _resolve: (value: CommandResponse) => void;
   const promise = new Promise<CommandResponse>((resolve) => (_resolve = resolve));
-  const child = spawn(command, args, { stdio: 'pipe' });
+  const child = spawn(command, args, { stdio: 'pipe', cwd: options?.cwd });
 
   let stdout = '';
   let stderr = '';

i18n/en.json

@@ -427,6 +427,7 @@
   "app_settings": "App Settings",
   "appears_in": "Appears in",
   "archive": "Archive",
+  "archive_action_prompt": "{count} added to Archive",
   "archive_or_unarchive_photo": "Archive or unarchive photo",
   "archive_page_no_archived_assets": "No archived assets found",
   "archive_page_title": "Archive ({count})",
@@ -702,7 +703,7 @@
   "daily_title_text_date": "E, MMM dd",
   "daily_title_text_date_year": "E, MMM dd, yyyy",
   "dark": "Dark",
-  "darkTheme": "Toggle dark theme",
+  "dark_theme": "Toggle dark theme",
   "date_after": "Date after",
   "date_and_time": "Date and Time",
   "date_before": "Date before",
@@ -798,6 +799,7 @@
   "edit_key": "Edit key",
   "edit_link": "Edit link",
   "edit_location": "Edit location",
+  "edit_location_action_prompt": "{count} location edited",
   "edit_location_dialog_title": "Location",
   "edit_name": "Edit name",
   "edit_people": "Edit people",
@@ -983,6 +985,7 @@
   "failed_to_load_assets": "Failed to load assets",
   "failed_to_load_folder": "Failed to load folder",
   "favorite": "Favorite",
+  "favorite_action_prompt": "{count} added to Favorites",
   "favorite_or_unfavorite_photo": "Favorite or unfavorite photo",
   "favorites": "Favorites",
   "favorites_page_no_favorites": "No favorite assets found",
@@ -1245,6 +1248,7 @@
   "more": "More",
   "move": "Move",
   "move_off_locked_folder": "Move out of locked folder",
+  "move_to_lock_folder_action_prompt": "{count} added to the locked folder",
   "move_to_locked_folder": "Move to locked folder",
   "move_to_locked_folder_confirmation": "These photos and video will be removed from all albums, and only viewable from the locked folder",
   "moved_to_archive": "Moved {count, plural, one {# asset} other {# assets}} to archive",
@@ -1495,6 +1499,7 @@
   "remove_deleted_assets": "Remove Deleted Assets",
   "remove_from_album": "Remove from album",
   "remove_from_favorites": "Remove from favorites",
+  "remove_from_lock_folder_action_prompt": "{count} removed from the locked folder",
   "remove_from_locked_folder": "Remove from locked folder",
   "remove_from_locked_folder_confirmation": "Are you sure you want to move these photos and videos out of the locked folder? They will be visible in your library.",
   "remove_from_shared_link": "Remove from shared link",

mobile/lib/constants/enums.dart

@@ -12,3 +12,5 @@ enum TextSearchType {
 enum AssetVisibilityEnum { timeline, hidden, archive, locked }
 
 enum SortUserBy { id }
+
+enum ActionSource { timeline, viewer }

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

@@ -21,6 +21,8 @@ class Album {
   final String? thumbnailAssetId;
   final bool isActivityEnabled;
   final AlbumAssetOrder order;
+  final int assetCount;
+  final String ownerName;
 
   const Album({
     required this.id,
@@ -32,20 +34,24 @@ class Album {
     this.thumbnailAssetId,
     required this.isActivityEnabled,
     required this.order,
+    required this.assetCount,
+    required this.ownerName,
   });
 
   @override
   String toString() {
     return '''Album {
-   id: $id,
-   name: $name,
-   ownerId: $ownerId,
-   description: $description,
-   createdAt: $createdAt,
-   updatedAt: $updatedAt,
-   isActivityEnabled: $isActivityEnabled,
-   order: $order,
-   thumbnailAssetId: ${thumbnailAssetId ?? "<NA>"}
+    id: $id,
+    name: $name,
+    ownerId: $ownerId,
+    description: $description,
+    createdAt: $createdAt,
+    updatedAt: $updatedAt,
+    isActivityEnabled: $isActivityEnabled,
+    order: $order,
+    thumbnailAssetId: ${thumbnailAssetId ?? "<NA>"}
+    assetCount: $assetCount
+    ownerName: $ownerName
  }''';
   }
 
@@ -61,7 +67,9 @@ class Album {
         updatedAt == other.updatedAt &&
         thumbnailAssetId == other.thumbnailAssetId &&
         isActivityEnabled == other.isActivityEnabled &&
-        order == other.order;
+        order == other.order &&
+        assetCount == other.assetCount &&
+        ownerName == other.ownerName;
   }
 
   @override
@@ -74,6 +82,8 @@ class Album {
         updatedAt.hashCode ^
         thumbnailAssetId.hashCode ^
         isActivityEnabled.hashCode ^
-        order.hashCode;
+        order.hashCode ^
+        assetCount.hashCode ^
+        ownerName.hashCode;
   }
 }

mobile/lib/domain/models/asset/base_asset.model.dart

@@ -1,4 +1,4 @@
-part 'asset.model.dart';
+part 'remote_asset.model.dart';
 part 'local_asset.model.dart';
 
 enum AssetType {

mobile/lib/domain/models/asset/remote_asset.model.dart

@@ -8,16 +8,18 @@ enum AssetVisibility {
 }
 
 // Model for an asset stored in the server
-class Asset extends BaseAsset {
+class RemoteAsset extends BaseAsset {
   final String id;
   final String? localId;
   final String? thumbHash;
   final AssetVisibility visibility;
+  final String ownerId;
 
-  const Asset({
+  const RemoteAsset({
     required this.id,
     this.localId,
     required super.name,
+    required this.ownerId,
     required super.checksum,
     required super.type,
     required super.createdAt,
@@ -37,16 +39,17 @@ class Asset extends BaseAsset {
   @override
   String toString() {
     return '''Asset {
-   id: $id,
-   name: $name,
-   type: $type,
-   createdAt: $createdAt,
-   updatedAt: $updatedAt,
-   width: ${width ?? "<NA>"},
-   height: ${height ?? "<NA>"},
-   durationInSeconds: ${durationInSeconds ?? "<NA>"},
-   localId: ${localId ?? "<NA>"},
-   isFavorite: $isFavorite,
+    id: $id,
+    name: $name,
+    ownerId: $ownerId,
+    type: $type,
+    createdAt: $createdAt,
+    updatedAt: $updatedAt,
+    width: ${width ?? "<NA>"},
+    height: ${height ?? "<NA>"},
+    durationInSeconds: ${durationInSeconds ?? "<NA>"},
+    localId: ${localId ?? "<NA>"},
+    isFavorite: $isFavorite,
     thumbHash: ${thumbHash ?? "<NA>"},
     visibility: $visibility,
  }''';
@@ -54,10 +57,11 @@ class Asset extends BaseAsset {
 
   @override
   bool operator ==(Object other) {
-    if (other is! Asset) return false;
+    if (other is! RemoteAsset) return false;
     if (identical(this, other)) return true;
     return super == other &&
         id == other.id &&
+        ownerId == other.ownerId &&
         localId == other.localId &&
         thumbHash == other.thumbHash &&
         visibility == other.visibility;
@@ -67,6 +71,7 @@ class Asset extends BaseAsset {
   int get hashCode =>
       super.hashCode ^
       id.hashCode ^
+      ownerId.hashCode ^
       localId.hashCode ^
       thumbHash.hashCode ^
       visibility.hashCode;

mobile/lib/domain/services/log.service.dart

@@ -5,7 +5,7 @@ import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/infrastructure/repositories/log.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/drift_store.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
 import 'package:logging/logging.dart';
 
 /// Service responsible for handling application logging.
@@ -14,8 +14,8 @@ import 'package:logging/logging.dart';
 /// writes them to a persistent [ILogRepository], and manages log levels
 /// via [IStoreRepository]
 class LogService {
-  final LogRepository _logRepository;
-  final IStoreRepository _storeRepository;
+  final IsarLogRepository _logRepository;
+  final IsarStoreRepository _storeRepository;
 
   final List<LogMessage> _msgBuffer = [];
 
@@ -37,8 +37,8 @@ class LogService {
   }
 
   static Future<LogService> init({
-    required LogRepository logRepository,
-    required IStoreRepository storeRepository,
+    required IsarLogRepository logRepository,
+    required IsarStoreRepository storeRepository,
     bool shouldBuffer = true,
   }) async {
     _instance ??= await create(
@@ -50,8 +50,8 @@ class LogService {
   }
 
   static Future<LogService> create({
-    required LogRepository logRepository,
-    required IStoreRepository storeRepository,
+    required IsarLogRepository logRepository,
+    required IsarStoreRepository storeRepository,
     bool shouldBuffer = true,
   }) async {
     final instance = LogService._(logRepository, storeRepository, shouldBuffer);

mobile/lib/domain/services/remote_album.service.dart

@@ -0,0 +1,60 @@
+import 'package:immich_mobile/domain/models/album/album.model.dart';
+import 'package:immich_mobile/infrastructure/repositories/remote_album.repository.dart';
+import 'package:immich_mobile/models/albums/album_search.model.dart';
+import 'package:immich_mobile/utils/remote_album.utils.dart';
+
+class RemoteAlbumService {
+  final DriftRemoteAlbumRepository _repository;
+
+  const RemoteAlbumService(this._repository);
+
+  Future<List<Album>> getAll() {
+    return _repository.getAll();
+  }
+
+  List<Album> sortAlbums(
+    List<Album> albums,
+    RemoteAlbumSortMode sortMode, {
+    bool isReverse = false,
+  }) {
+    return sortMode.sortFn(albums, isReverse);
+  }
+
+  List<Album> searchAlbums(
+    List<Album> albums,
+    String query,
+    String? userId, [
+    QuickFilterMode filterMode = QuickFilterMode.all,
+  ]) {
+    final lowerQuery = query.toLowerCase();
+    List<Album> filtered = albums;
+
+    // Apply text search filter
+    if (query.isNotEmpty) {
+      filtered = filtered
+          .where(
+            (album) =>
+                album.name.toLowerCase().contains(lowerQuery) ||
+                album.description.toLowerCase().contains(lowerQuery),
+          )
+          .toList();
+    }
+
+    if (userId != null) {
+      switch (filterMode) {
+        case QuickFilterMode.myAlbums:
+          filtered =
+              filtered.where((album) => album.ownerId == userId).toList();
+          break;
+        case QuickFilterMode.sharedWithMe:
+          filtered =
+              filtered.where((album) => album.ownerId != userId).toList();
+          break;
+        case QuickFilterMode.all:
+          break;
+      }
+    }
+
+    return filtered;
+  }
+}

mobile/lib/domain/services/store.service.dart

@@ -1,18 +1,18 @@
 import 'dart:async';
 
 import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/infrastructure/repositories/drift_store.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
 
 /// Provides access to a persistent key-value store with an in-memory cache.
 /// Listens for repository changes to keep the cache updated.
 class StoreService {
-  final IStoreRepository _storeRepository;
+  final IsarStoreRepository _storeRepository;
 
   /// In-memory cache. Keys are [StoreKey.id]
   final Map<int, Object?> _cache = {};
   late final StreamSubscription<StoreDto> _storeUpdateSubscription;
 
-  StoreService._({required IStoreRepository storeRepository})
+  StoreService._({required IsarStoreRepository storeRepository})
       : _storeRepository = storeRepository;
 
   // TODO: Temporary typedef to make minimal changes. Remove this and make the presentation layer access store through a provider
@@ -26,14 +26,14 @@ class StoreService {
 
   // TODO: Replace the implementation with the one from create after removing the typedef
   static Future<StoreService> init({
-    required IStoreRepository storeRepository,
+    required IsarStoreRepository storeRepository,
   }) async {
     _instance ??= await create(storeRepository: storeRepository);
     return _instance!;
   }
 
   static Future<StoreService> create({
-    required IStoreRepository storeRepository,
+    required IsarStoreRepository storeRepository,
   }) async {
     final instance = StoreService._(storeRepository: storeRepository);
     await instance._populateCache();

mobile/lib/domain/services/timeline.service.dart

@@ -64,7 +64,7 @@ class TimelineService {
   })  : _assetSource = assetSource,
         _bucketSource = bucketSource {
     _bucketSubscription =
-        _bucketSource().listen((_) => unawaited(_reloadBucket()));
+        _bucketSource().listen((_) => unawaited(reloadBucket()));
   }
 
   final AsyncMutex _mutex = AsyncMutex();
@@ -74,7 +74,7 @@ class TimelineService {
 
   Stream<List<Bucket>> Function() get watchBuckets => _bucketSource;
 
-  Future<void> _reloadBucket() => _mutex.run(() async {
+  Future<void> reloadBucket() => _mutex.run(() async {
         _buffer = await _assetSource(_bufferOffset, _buffer.length);
       });
 

mobile/lib/infrastructure/entities/exif.entity.dart

@@ -116,15 +116,15 @@ class RemoteExifEntity extends Table with DriftDefaultsMixin {
 
   TextColumn get exposureTime => text().nullable()();
 
-  IntColumn get fNumber => integer().nullable()();
+  RealColumn get fNumber => real().nullable()();
 
   IntColumn get fileSize => integer().nullable()();
 
-  IntColumn get focalLength => integer().nullable()();
+  RealColumn get focalLength => real().nullable()();
 
-  IntColumn get latitude => integer().nullable()();
+  RealColumn get latitude => real().nullable()();
 
-  IntColumn get longitude => integer().nullable()();
+  RealColumn get longitude => real().nullable()();
 
   IntColumn get iso => integer().nullable()();
 

mobile/lib/infrastructure/entities/exif.entity.drift.dart

@@ -19,11 +19,11 @@ typedef $$RemoteExifEntityTableCreateCompanionBuilder
   i0.Value<int?> height,
   i0.Value<int?> width,
   i0.Value<String?> exposureTime,
-  i0.Value<int?> fNumber,
+  i0.Value<double?> fNumber,
   i0.Value<int?> fileSize,
-  i0.Value<int?> focalLength,
-  i0.Value<int?> latitude,
-  i0.Value<int?> longitude,
+  i0.Value<double?> focalLength,
+  i0.Value<double?> latitude,
+  i0.Value<double?> longitude,
   i0.Value<int?> iso,
   i0.Value<String?> make,
   i0.Value<String?> model,
@@ -43,11 +43,11 @@ typedef $$RemoteExifEntityTableUpdateCompanionBuilder
   i0.Value<int?> height,
   i0.Value<int?> width,
   i0.Value<String?> exposureTime,
-  i0.Value<int?> fNumber,
+  i0.Value<double?> fNumber,
   i0.Value<int?> fileSize,
-  i0.Value<int?> focalLength,
-  i0.Value<int?> latitude,
-  i0.Value<int?> longitude,
+  i0.Value<double?> focalLength,
+  i0.Value<double?> latitude,
+  i0.Value<double?> longitude,
   i0.Value<int?> iso,
   i0.Value<String?> make,
   i0.Value<String?> model,
@@ -125,20 +125,20 @@ class $$RemoteExifEntityTableFilterComposer
       column: $table.exposureTime,
       builder: (column) => i0.ColumnFilters(column));
 
-  i0.ColumnFilters<int> get fNumber => $composableBuilder(
+  i0.ColumnFilters<double> get fNumber => $composableBuilder(
       column: $table.fNumber, builder: (column) => i0.ColumnFilters(column));
 
   i0.ColumnFilters<int> get fileSize => $composableBuilder(
       column: $table.fileSize, builder: (column) => i0.ColumnFilters(column));
 
-  i0.ColumnFilters<int> get focalLength => $composableBuilder(
+  i0.ColumnFilters<double> get focalLength => $composableBuilder(
       column: $table.focalLength,
       builder: (column) => i0.ColumnFilters(column));
 
-  i0.ColumnFilters<int> get latitude => $composableBuilder(
+  i0.ColumnFilters<double> get latitude => $composableBuilder(
       column: $table.latitude, builder: (column) => i0.ColumnFilters(column));
 
-  i0.ColumnFilters<int> get longitude => $composableBuilder(
+  i0.ColumnFilters<double> get longitude => $composableBuilder(
       column: $table.longitude, builder: (column) => i0.ColumnFilters(column));
 
   i0.ColumnFilters<int> get iso => $composableBuilder(
@@ -223,20 +223,20 @@ class $$RemoteExifEntityTableOrderingComposer
       column: $table.exposureTime,
       builder: (column) => i0.ColumnOrderings(column));
 
-  i0.ColumnOrderings<int> get fNumber => $composableBuilder(
+  i0.ColumnOrderings<double> get fNumber => $composableBuilder(
       column: $table.fNumber, builder: (column) => i0.ColumnOrderings(column));
 
   i0.ColumnOrderings<int> get fileSize => $composableBuilder(
       column: $table.fileSize, builder: (column) => i0.ColumnOrderings(column));
 
-  i0.ColumnOrderings<int> get focalLength => $composableBuilder(
+  i0.ColumnOrderings<double> get focalLength => $composableBuilder(
       column: $table.focalLength,
       builder: (column) => i0.ColumnOrderings(column));
 
-  i0.ColumnOrderings<int> get latitude => $composableBuilder(
+  i0.ColumnOrderings<double> get latitude => $composableBuilder(
       column: $table.latitude, builder: (column) => i0.ColumnOrderings(column));
 
-  i0.ColumnOrderings<int> get longitude => $composableBuilder(
+  i0.ColumnOrderings<double> get longitude => $composableBuilder(
       column: $table.longitude,
       builder: (column) => i0.ColumnOrderings(column));
 
@@ -321,19 +321,19 @@ class $$RemoteExifEntityTableAnnotationComposer
   i0.GeneratedColumn<String> get exposureTime => $composableBuilder(
       column: $table.exposureTime, builder: (column) => column);
 
-  i0.GeneratedColumn<int> get fNumber =>
+  i0.GeneratedColumn<double> get fNumber =>
       $composableBuilder(column: $table.fNumber, builder: (column) => column);
 
   i0.GeneratedColumn<int> get fileSize =>
       $composableBuilder(column: $table.fileSize, builder: (column) => column);
 
-  i0.GeneratedColumn<int> get focalLength => $composableBuilder(
+  i0.GeneratedColumn<double> get focalLength => $composableBuilder(
       column: $table.focalLength, builder: (column) => column);
 
-  i0.GeneratedColumn<int> get latitude =>
+  i0.GeneratedColumn<double> get latitude =>
       $composableBuilder(column: $table.latitude, builder: (column) => column);
 
-  i0.GeneratedColumn<int> get longitude =>
+  i0.GeneratedColumn<double> get longitude =>
       $composableBuilder(column: $table.longitude, builder: (column) => column);
 
   i0.GeneratedColumn<int> get iso =>
@@ -416,11 +416,11 @@ class $$RemoteExifEntityTableTableManager extends i0.RootTableManager<
             i0.Value<int?> height = const i0.Value.absent(),
             i0.Value<int?> width = const i0.Value.absent(),
             i0.Value<String?> exposureTime = const i0.Value.absent(),
-            i0.Value<int?> fNumber = const i0.Value.absent(),
+            i0.Value<double?> fNumber = const i0.Value.absent(),
             i0.Value<int?> fileSize = const i0.Value.absent(),
-            i0.Value<int?> focalLength = const i0.Value.absent(),
-            i0.Value<int?> latitude = const i0.Value.absent(),
-            i0.Value<int?> longitude = const i0.Value.absent(),
+            i0.Value<double?> focalLength = const i0.Value.absent(),
+            i0.Value<double?> latitude = const i0.Value.absent(),
+            i0.Value<double?> longitude = const i0.Value.absent(),
             i0.Value<int?> iso = const i0.Value.absent(),
             i0.Value<String?> make = const i0.Value.absent(),
             i0.Value<String?> model = const i0.Value.absent(),
@@ -462,11 +462,11 @@ class $$RemoteExifEntityTableTableManager extends i0.RootTableManager<
             i0.Value<int?> height = const i0.Value.absent(),
             i0.Value<int?> width = const i0.Value.absent(),
             i0.Value<String?> exposureTime = const i0.Value.absent(),
-            i0.Value<int?> fNumber = const i0.Value.absent(),
+            i0.Value<double?> fNumber = const i0.Value.absent(),
             i0.Value<int?> fileSize = const i0.Value.absent(),
-            i0.Value<int?> focalLength = const i0.Value.absent(),
-            i0.Value<int?> latitude = const i0.Value.absent(),
-            i0.Value<int?> longitude = const i0.Value.absent(),
+            i0.Value<double?> focalLength = const i0.Value.absent(),
+            i0.Value<double?> latitude = const i0.Value.absent(),
+            i0.Value<double?> longitude = const i0.Value.absent(),
             i0.Value<int?> iso = const i0.Value.absent(),
             i0.Value<String?> make = const i0.Value.absent(),
             i0.Value<String?> model = const i0.Value.absent(),
@@ -622,9 +622,9 @@ class $RemoteExifEntityTable extends i2.RemoteExifEntity
   static const i0.VerificationMeta _fNumberMeta =
       const i0.VerificationMeta('fNumber');
   @override
-  late final i0.GeneratedColumn<int> fNumber = i0.GeneratedColumn<int>(
+  late final i0.GeneratedColumn<double> fNumber = i0.GeneratedColumn<double>(
       'f_number', aliasedName, true,
-      type: i0.DriftSqlType.int, requiredDuringInsert: false);
+      type: i0.DriftSqlType.double, requiredDuringInsert: false);
   static const i0.VerificationMeta _fileSizeMeta =
       const i0.VerificationMeta('fileSize');
   @override
@@ -634,21 +634,21 @@ class $RemoteExifEntityTable extends i2.RemoteExifEntity
   static const i0.VerificationMeta _focalLengthMeta =
       const i0.VerificationMeta('focalLength');
   @override
-  late final i0.GeneratedColumn<int> focalLength = i0.GeneratedColumn<int>(
-      'focal_length', aliasedName, true,
-      type: i0.DriftSqlType.int, requiredDuringInsert: false);
+  late final i0.GeneratedColumn<double> focalLength =
+      i0.GeneratedColumn<double>('focal_length', aliasedName, true,
+          type: i0.DriftSqlType.double, requiredDuringInsert: false);
   static const i0.VerificationMeta _latitudeMeta =
       const i0.VerificationMeta('latitude');
   @override
-  late final i0.GeneratedColumn<int> latitude = i0.GeneratedColumn<int>(
+  late final i0.GeneratedColumn<double> latitude = i0.GeneratedColumn<double>(
       'latitude', aliasedName, true,
-      type: i0.DriftSqlType.int, requiredDuringInsert: false);
+      type: i0.DriftSqlType.double, requiredDuringInsert: false);
   static const i0.VerificationMeta _longitudeMeta =
       const i0.VerificationMeta('longitude');
   @override
-  late final i0.GeneratedColumn<int> longitude = i0.GeneratedColumn<int>(
+  late final i0.GeneratedColumn<double> longitude = i0.GeneratedColumn<double>(
       'longitude', aliasedName, true,
-      type: i0.DriftSqlType.int, requiredDuringInsert: false);
+      type: i0.DriftSqlType.double, requiredDuringInsert: false);
   static const i0.VerificationMeta _isoMeta = const i0.VerificationMeta('iso');
   @override
   late final i0.GeneratedColumn<int> iso = i0.GeneratedColumn<int>(
@@ -853,15 +853,15 @@ class $RemoteExifEntityTable extends i2.RemoteExifEntity
       exposureTime: attachedDatabase.typeMapping.read(
           i0.DriftSqlType.string, data['${effectivePrefix}exposure_time']),
       fNumber: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.int, data['${effectivePrefix}f_number']),
+          .read(i0.DriftSqlType.double, data['${effectivePrefix}f_number']),
       fileSize: attachedDatabase.typeMapping
           .read(i0.DriftSqlType.int, data['${effectivePrefix}file_size']),
       focalLength: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.int, data['${effectivePrefix}focal_length']),
+          .read(i0.DriftSqlType.double, data['${effectivePrefix}focal_length']),
       latitude: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.int, data['${effectivePrefix}latitude']),
+          .read(i0.DriftSqlType.double, data['${effectivePrefix}latitude']),
       longitude: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.int, data['${effectivePrefix}longitude']),
+          .read(i0.DriftSqlType.double, data['${effectivePrefix}longitude']),
       iso: attachedDatabase.typeMapping
           .read(i0.DriftSqlType.int, data['${effectivePrefix}iso']),
       make: attachedDatabase.typeMapping
@@ -901,11 +901,11 @@ class RemoteExifEntityData extends i0.DataClass
   final int? height;
   final int? width;
   final String? exposureTime;
-  final int? fNumber;
+  final double? fNumber;
   final int? fileSize;
-  final int? focalLength;
-  final int? latitude;
-  final int? longitude;
+  final double? focalLength;
+  final double? latitude;
+  final double? longitude;
   final int? iso;
   final String? make;
   final String? model;
@@ -964,19 +964,19 @@ class RemoteExifEntityData extends i0.DataClass
       map['exposure_time'] = i0.Variable<String>(exposureTime);
     }
     if (!nullToAbsent || fNumber != null) {
-      map['f_number'] = i0.Variable<int>(fNumber);
+      map['f_number'] = i0.Variable<double>(fNumber);
     }
     if (!nullToAbsent || fileSize != null) {
       map['file_size'] = i0.Variable<int>(fileSize);
     }
     if (!nullToAbsent || focalLength != null) {
-      map['focal_length'] = i0.Variable<int>(focalLength);
+      map['focal_length'] = i0.Variable<double>(focalLength);
     }
     if (!nullToAbsent || latitude != null) {
-      map['latitude'] = i0.Variable<int>(latitude);
+      map['latitude'] = i0.Variable<double>(latitude);
     }
     if (!nullToAbsent || longitude != null) {
-      map['longitude'] = i0.Variable<int>(longitude);
+      map['longitude'] = i0.Variable<double>(longitude);
     }
     if (!nullToAbsent || iso != null) {
       map['iso'] = i0.Variable<int>(iso);
@@ -1016,11 +1016,11 @@ class RemoteExifEntityData extends i0.DataClass
       height: serializer.fromJson<int?>(json['height']),
       width: serializer.fromJson<int?>(json['width']),
       exposureTime: serializer.fromJson<String?>(json['exposureTime']),
-      fNumber: serializer.fromJson<int?>(json['fNumber']),
+      fNumber: serializer.fromJson<double?>(json['fNumber']),
       fileSize: serializer.fromJson<int?>(json['fileSize']),
-      focalLength: serializer.fromJson<int?>(json['focalLength']),
-      latitude: serializer.fromJson<int?>(json['latitude']),
-      longitude: serializer.fromJson<int?>(json['longitude']),
+      focalLength: serializer.fromJson<double?>(json['focalLength']),
+      latitude: serializer.fromJson<double?>(json['latitude']),
+      longitude: serializer.fromJson<double?>(json['longitude']),
       iso: serializer.fromJson<int?>(json['iso']),
       make: serializer.fromJson<String?>(json['make']),
       model: serializer.fromJson<String?>(json['model']),
@@ -1043,11 +1043,11 @@ class RemoteExifEntityData extends i0.DataClass
       'height': serializer.toJson<int?>(height),
       'width': serializer.toJson<int?>(width),
       'exposureTime': serializer.toJson<String?>(exposureTime),
-      'fNumber': serializer.toJson<int?>(fNumber),
+      'fNumber': serializer.toJson<double?>(fNumber),
       'fileSize': serializer.toJson<int?>(fileSize),
-      'focalLength': serializer.toJson<int?>(focalLength),
-      'latitude': serializer.toJson<int?>(latitude),
-      'longitude': serializer.toJson<int?>(longitude),
+      'focalLength': serializer.toJson<double?>(focalLength),
+      'latitude': serializer.toJson<double?>(latitude),
+      'longitude': serializer.toJson<double?>(longitude),
       'iso': serializer.toJson<int?>(iso),
       'make': serializer.toJson<String?>(make),
       'model': serializer.toJson<String?>(model),
@@ -1068,11 +1068,11 @@ class RemoteExifEntityData extends i0.DataClass
           i0.Value<int?> height = const i0.Value.absent(),
           i0.Value<int?> width = const i0.Value.absent(),
           i0.Value<String?> exposureTime = const i0.Value.absent(),
-          i0.Value<int?> fNumber = const i0.Value.absent(),
+          i0.Value<double?> fNumber = const i0.Value.absent(),
           i0.Value<int?> fileSize = const i0.Value.absent(),
-          i0.Value<int?> focalLength = const i0.Value.absent(),
-          i0.Value<int?> latitude = const i0.Value.absent(),
-          i0.Value<int?> longitude = const i0.Value.absent(),
+          i0.Value<double?> focalLength = const i0.Value.absent(),
+          i0.Value<double?> latitude = const i0.Value.absent(),
+          i0.Value<double?> longitude = const i0.Value.absent(),
           i0.Value<int?> iso = const i0.Value.absent(),
           i0.Value<String?> make = const i0.Value.absent(),
           i0.Value<String?> model = const i0.Value.absent(),
@@ -1232,11 +1232,11 @@ class RemoteExifEntityCompanion
   final i0.Value<int?> height;
   final i0.Value<int?> width;
   final i0.Value<String?> exposureTime;
-  final i0.Value<int?> fNumber;
+  final i0.Value<double?> fNumber;
   final i0.Value<int?> fileSize;
-  final i0.Value<int?> focalLength;
-  final i0.Value<int?> latitude;
-  final i0.Value<int?> longitude;
+  final i0.Value<double?> focalLength;
+  final i0.Value<double?> latitude;
+  final i0.Value<double?> longitude;
   final i0.Value<int?> iso;
   final i0.Value<String?> make;
   final i0.Value<String?> model;
@@ -1300,11 +1300,11 @@ class RemoteExifEntityCompanion
     i0.Expression<int>? height,
     i0.Expression<int>? width,
     i0.Expression<String>? exposureTime,
-    i0.Expression<int>? fNumber,
+    i0.Expression<double>? fNumber,
     i0.Expression<int>? fileSize,
-    i0.Expression<int>? focalLength,
-    i0.Expression<int>? latitude,
-    i0.Expression<int>? longitude,
+    i0.Expression<double>? focalLength,
+    i0.Expression<double>? latitude,
+    i0.Expression<double>? longitude,
     i0.Expression<int>? iso,
     i0.Expression<String>? make,
     i0.Expression<String>? model,
@@ -1348,11 +1348,11 @@ class RemoteExifEntityCompanion
       i0.Value<int?>? height,
       i0.Value<int?>? width,
       i0.Value<String?>? exposureTime,
-      i0.Value<int?>? fNumber,
+      i0.Value<double?>? fNumber,
       i0.Value<int?>? fileSize,
-      i0.Value<int?>? focalLength,
-      i0.Value<int?>? latitude,
-      i0.Value<int?>? longitude,
+      i0.Value<double?>? focalLength,
+      i0.Value<double?>? latitude,
+      i0.Value<double?>? longitude,
       i0.Value<int?>? iso,
       i0.Value<String?>? make,
       i0.Value<String?>? model,
@@ -1416,19 +1416,19 @@ class RemoteExifEntityCompanion
       map['exposure_time'] = i0.Variable<String>(exposureTime.value);
     }
     if (fNumber.present) {
-      map['f_number'] = i0.Variable<int>(fNumber.value);
+      map['f_number'] = i0.Variable<double>(fNumber.value);
     }
     if (fileSize.present) {
       map['file_size'] = i0.Variable<int>(fileSize.value);
     }
     if (focalLength.present) {
-      map['focal_length'] = i0.Variable<int>(focalLength.value);
+      map['focal_length'] = i0.Variable<double>(focalLength.value);
     }
     if (latitude.present) {
-      map['latitude'] = i0.Variable<int>(latitude.value);
+      map['latitude'] = i0.Variable<double>(latitude.value);
     }
     if (longitude.present) {
-      map['longitude'] = i0.Variable<int>(longitude.value);
+      map['longitude'] = i0.Variable<double>(longitude.value);
     }
     if (iso.present) {
       map['iso'] = i0.Variable<int>(iso.value);

mobile/lib/infrastructure/entities/isar_store.entity.dart

@@ -1,13 +0,0 @@
-import 'package:isar/isar.dart';
-
-part 'isar_store.entity.g.dart';
-
-/// Internal class for `Store`, do not use elsewhere.
-@Collection(inheritance: false)
-class StoreValue {
-  final Id id;
-  final int? intValue;
-  final String? strValue;
-
-  const StoreValue(this.id, {this.intValue, this.strValue});
-}

mobile/lib/infrastructure/entities/log.entity.dart

@@ -1,7 +1,5 @@
 import 'package:immich_mobile/domain/models/log.model.dart';
-import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
 import 'package:isar/isar.dart';
-import 'package:drift/drift.dart';
 
 part 'log.entity.g.dart';
 
@@ -47,21 +45,3 @@ class LoggerMessage {
     );
   }
 }
-
-class LoggerMessageEntity extends Table with DriftDefaultsMixin {
-  const LoggerMessageEntity();
-
-  IntColumn get id => integer().autoIncrement()();
-
-  TextColumn get message => text()();
-
-  TextColumn get details => text().nullable()();
-
-  IntColumn get level => intEnum<LogLevel>()();
-
-  DateTimeColumn get createdAt => dateTime()();
-
-  TextColumn get context1 => text().nullable()();
-
-  TextColumn get context2 => text().nullable()();
-}

mobile/lib/infrastructure/entities/log.entity.drift.dart

@@ -1,589 +0,0 @@
-// dart format width=80
-// ignore_for_file: type=lint
-import 'package:drift/drift.dart' as i0;
-import 'package:immich_mobile/infrastructure/entities/log.entity.drift.dart'
-    as i1;
-import 'package:immich_mobile/domain/models/log.model.dart' as i2;
-import 'package:immich_mobile/infrastructure/entities/log.entity.dart' as i3;
-
-typedef $$LoggerMessageEntityTableCreateCompanionBuilder
-    = i1.LoggerMessageEntityCompanion Function({
-  required int id,
-  required String message,
-  i0.Value<String?> details,
-  required i2.LogLevel level,
-  required DateTime createdAt,
-  i0.Value<String?> context1,
-  i0.Value<String?> context2,
-});
-typedef $$LoggerMessageEntityTableUpdateCompanionBuilder
-    = i1.LoggerMessageEntityCompanion Function({
-  i0.Value<int> id,
-  i0.Value<String> message,
-  i0.Value<String?> details,
-  i0.Value<i2.LogLevel> level,
-  i0.Value<DateTime> createdAt,
-  i0.Value<String?> context1,
-  i0.Value<String?> context2,
-});
-
-class $$LoggerMessageEntityTableFilterComposer
-    extends i0.Composer<i0.GeneratedDatabase, i1.$LoggerMessageEntityTable> {
-  $$LoggerMessageEntityTableFilterComposer({
-    required super.$db,
-    required super.$table,
-    super.joinBuilder,
-    super.$addJoinBuilderToRootComposer,
-    super.$removeJoinBuilderFromRootComposer,
-  });
-  i0.ColumnFilters<int> get id => $composableBuilder(
-      column: $table.id, builder: (column) => i0.ColumnFilters(column));
-
-  i0.ColumnFilters<String> get message => $composableBuilder(
-      column: $table.message, builder: (column) => i0.ColumnFilters(column));
-
-  i0.ColumnFilters<String> get details => $composableBuilder(
-      column: $table.details, builder: (column) => i0.ColumnFilters(column));
-
-  i0.ColumnWithTypeConverterFilters<i2.LogLevel, i2.LogLevel, int> get level =>
-      $composableBuilder(
-          column: $table.level,
-          builder: (column) => i0.ColumnWithTypeConverterFilters(column));
-
-  i0.ColumnFilters<DateTime> get createdAt => $composableBuilder(
-      column: $table.createdAt, builder: (column) => i0.ColumnFilters(column));
-
-  i0.ColumnFilters<String> get context1 => $composableBuilder(
-      column: $table.context1, builder: (column) => i0.ColumnFilters(column));
-
-  i0.ColumnFilters<String> get context2 => $composableBuilder(
-      column: $table.context2, builder: (column) => i0.ColumnFilters(column));
-}
-
-class $$LoggerMessageEntityTableOrderingComposer
-    extends i0.Composer<i0.GeneratedDatabase, i1.$LoggerMessageEntityTable> {
-  $$LoggerMessageEntityTableOrderingComposer({
-    required super.$db,
-    required super.$table,
-    super.joinBuilder,
-    super.$addJoinBuilderToRootComposer,
-    super.$removeJoinBuilderFromRootComposer,
-  });
-  i0.ColumnOrderings<int> get id => $composableBuilder(
-      column: $table.id, builder: (column) => i0.ColumnOrderings(column));
-
-  i0.ColumnOrderings<String> get message => $composableBuilder(
-      column: $table.message, builder: (column) => i0.ColumnOrderings(column));
-
-  i0.ColumnOrderings<String> get details => $composableBuilder(
-      column: $table.details, builder: (column) => i0.ColumnOrderings(column));
-
-  i0.ColumnOrderings<int> get level => $composableBuilder(
-      column: $table.level, builder: (column) => i0.ColumnOrderings(column));
-
-  i0.ColumnOrderings<DateTime> get createdAt => $composableBuilder(
-      column: $table.createdAt,
-      builder: (column) => i0.ColumnOrderings(column));
-
-  i0.ColumnOrderings<String> get context1 => $composableBuilder(
-      column: $table.context1, builder: (column) => i0.ColumnOrderings(column));
-
-  i0.ColumnOrderings<String> get context2 => $composableBuilder(
-      column: $table.context2, builder: (column) => i0.ColumnOrderings(column));
-}
-
-class $$LoggerMessageEntityTableAnnotationComposer
-    extends i0.Composer<i0.GeneratedDatabase, i1.$LoggerMessageEntityTable> {
-  $$LoggerMessageEntityTableAnnotationComposer({
-    required super.$db,
-    required super.$table,
-    super.joinBuilder,
-    super.$addJoinBuilderToRootComposer,
-    super.$removeJoinBuilderFromRootComposer,
-  });
-  i0.GeneratedColumn<int> get id =>
-      $composableBuilder(column: $table.id, builder: (column) => column);
-
-  i0.GeneratedColumn<String> get message =>
-      $composableBuilder(column: $table.message, builder: (column) => column);
-
-  i0.GeneratedColumn<String> get details =>
-      $composableBuilder(column: $table.details, builder: (column) => column);
-
-  i0.GeneratedColumnWithTypeConverter<i2.LogLevel, int> get level =>
-      $composableBuilder(column: $table.level, builder: (column) => column);
-
-  i0.GeneratedColumn<DateTime> get createdAt =>
-      $composableBuilder(column: $table.createdAt, builder: (column) => column);
-
-  i0.GeneratedColumn<String> get context1 =>
-      $composableBuilder(column: $table.context1, builder: (column) => column);
-
-  i0.GeneratedColumn<String> get context2 =>
-      $composableBuilder(column: $table.context2, builder: (column) => column);
-}
-
-class $$LoggerMessageEntityTableTableManager extends i0.RootTableManager<
-    i0.GeneratedDatabase,
-    i1.$LoggerMessageEntityTable,
-    i1.LoggerMessageEntityData,
-    i1.$$LoggerMessageEntityTableFilterComposer,
-    i1.$$LoggerMessageEntityTableOrderingComposer,
-    i1.$$LoggerMessageEntityTableAnnotationComposer,
-    $$LoggerMessageEntityTableCreateCompanionBuilder,
-    $$LoggerMessageEntityTableUpdateCompanionBuilder,
-    (
-      i1.LoggerMessageEntityData,
-      i0.BaseReferences<i0.GeneratedDatabase, i1.$LoggerMessageEntityTable,
-          i1.LoggerMessageEntityData>
-    ),
-    i1.LoggerMessageEntityData,
-    i0.PrefetchHooks Function()> {
-  $$LoggerMessageEntityTableTableManager(
-      i0.GeneratedDatabase db, i1.$LoggerMessageEntityTable table)
-      : super(i0.TableManagerState(
-          db: db,
-          table: table,
-          createFilteringComposer: () => i1
-              .$$LoggerMessageEntityTableFilterComposer($db: db, $table: table),
-          createOrderingComposer: () =>
-              i1.$$LoggerMessageEntityTableOrderingComposer(
-                  $db: db, $table: table),
-          createComputedFieldComposer: () =>
-              i1.$$LoggerMessageEntityTableAnnotationComposer(
-                  $db: db, $table: table),
-          updateCompanionCallback: ({
-            i0.Value<int> id = const i0.Value.absent(),
-            i0.Value<String> message = const i0.Value.absent(),
-            i0.Value<String?> details = const i0.Value.absent(),
-            i0.Value<i2.LogLevel> level = const i0.Value.absent(),
-            i0.Value<DateTime> createdAt = const i0.Value.absent(),
-            i0.Value<String?> context1 = const i0.Value.absent(),
-            i0.Value<String?> context2 = const i0.Value.absent(),
-          }) =>
-              i1.LoggerMessageEntityCompanion(
-            id: id,
-            message: message,
-            details: details,
-            level: level,
-            createdAt: createdAt,
-            context1: context1,
-            context2: context2,
-          ),
-          createCompanionCallback: ({
-            required int id,
-            required String message,
-            i0.Value<String?> details = const i0.Value.absent(),
-            required i2.LogLevel level,
-            required DateTime createdAt,
-            i0.Value<String?> context1 = const i0.Value.absent(),
-            i0.Value<String?> context2 = const i0.Value.absent(),
-          }) =>
-              i1.LoggerMessageEntityCompanion.insert(
-            id: id,
-            message: message,
-            details: details,
-            level: level,
-            createdAt: createdAt,
-            context1: context1,
-            context2: context2,
-          ),
-          withReferenceMapper: (p0) => p0
-              .map((e) => (e.readTable(table), i0.BaseReferences(db, table, e)))
-              .toList(),
-          prefetchHooksCallback: null,
-        ));
-}
-
-typedef $$LoggerMessageEntityTableProcessedTableManager
-    = i0.ProcessedTableManager<
-        i0.GeneratedDatabase,
-        i1.$LoggerMessageEntityTable,
-        i1.LoggerMessageEntityData,
-        i1.$$LoggerMessageEntityTableFilterComposer,
-        i1.$$LoggerMessageEntityTableOrderingComposer,
-        i1.$$LoggerMessageEntityTableAnnotationComposer,
-        $$LoggerMessageEntityTableCreateCompanionBuilder,
-        $$LoggerMessageEntityTableUpdateCompanionBuilder,
-        (
-          i1.LoggerMessageEntityData,
-          i0.BaseReferences<i0.GeneratedDatabase, i1.$LoggerMessageEntityTable,
-              i1.LoggerMessageEntityData>
-        ),
-        i1.LoggerMessageEntityData,
-        i0.PrefetchHooks Function()>;
-
-class $LoggerMessageEntityTable extends i3.LoggerMessageEntity
-    with i0.TableInfo<$LoggerMessageEntityTable, i1.LoggerMessageEntityData> {
-  @override
-  final i0.GeneratedDatabase attachedDatabase;
-  final String? _alias;
-  $LoggerMessageEntityTable(this.attachedDatabase, [this._alias]);
-  static const i0.VerificationMeta _idMeta = const i0.VerificationMeta('id');
-  @override
-  late final i0.GeneratedColumn<int> id = i0.GeneratedColumn<int>(
-      'id', aliasedName, false,
-      hasAutoIncrement: true,
-      type: i0.DriftSqlType.int,
-      requiredDuringInsert: true,
-      defaultConstraints:
-          i0.GeneratedColumn.constraintIsAlways('PRIMARY KEY AUTOINCREMENT'));
-  static const i0.VerificationMeta _messageMeta =
-      const i0.VerificationMeta('message');
-  @override
-  late final i0.GeneratedColumn<String> message = i0.GeneratedColumn<String>(
-      'message', aliasedName, false,
-      type: i0.DriftSqlType.string, requiredDuringInsert: true);
-  static const i0.VerificationMeta _detailsMeta =
-      const i0.VerificationMeta('details');
-  @override
-  late final i0.GeneratedColumn<String> details = i0.GeneratedColumn<String>(
-      'details', aliasedName, true,
-      type: i0.DriftSqlType.string, requiredDuringInsert: false);
-  @override
-  late final i0.GeneratedColumnWithTypeConverter<i2.LogLevel, int> level =
-      i0.GeneratedColumn<int>('level', aliasedName, false,
-              type: i0.DriftSqlType.int, requiredDuringInsert: true)
-          .withConverter<i2.LogLevel>(
-              i1.$LoggerMessageEntityTable.$converterlevel);
-  static const i0.VerificationMeta _createdAtMeta =
-      const i0.VerificationMeta('createdAt');
-  @override
-  late final i0.GeneratedColumn<DateTime> createdAt =
-      i0.GeneratedColumn<DateTime>('created_at', aliasedName, false,
-          type: i0.DriftSqlType.dateTime, requiredDuringInsert: true);
-  static const i0.VerificationMeta _context1Meta =
-      const i0.VerificationMeta('context1');
-  @override
-  late final i0.GeneratedColumn<String> context1 = i0.GeneratedColumn<String>(
-      'context1', aliasedName, true,
-      type: i0.DriftSqlType.string, requiredDuringInsert: false);
-  static const i0.VerificationMeta _context2Meta =
-      const i0.VerificationMeta('context2');
-  @override
-  late final i0.GeneratedColumn<String> context2 = i0.GeneratedColumn<String>(
-      'context2', aliasedName, true,
-      type: i0.DriftSqlType.string, requiredDuringInsert: false);
-  @override
-  List<i0.GeneratedColumn> get $columns =>
-      [id, message, details, level, createdAt, context1, context2];
-  @override
-  String get aliasedName => _alias ?? actualTableName;
-  @override
-  String get actualTableName => $name;
-  static const String $name = 'logger_message_entity';
-  @override
-  i0.VerificationContext validateIntegrity(
-      i0.Insertable<i1.LoggerMessageEntityData> instance,
-      {bool isInserting = false}) {
-    final context = i0.VerificationContext();
-    final data = instance.toColumns(true);
-    if (data.containsKey('id')) {
-      context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta));
-    } else if (isInserting) {
-      context.missing(_idMeta);
-    }
-    if (data.containsKey('message')) {
-      context.handle(_messageMeta,
-          message.isAcceptableOrUnknown(data['message']!, _messageMeta));
-    } else if (isInserting) {
-      context.missing(_messageMeta);
-    }
-    if (data.containsKey('details')) {
-      context.handle(_detailsMeta,
-          details.isAcceptableOrUnknown(data['details']!, _detailsMeta));
-    }
-    if (data.containsKey('created_at')) {
-      context.handle(_createdAtMeta,
-          createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta));
-    } else if (isInserting) {
-      context.missing(_createdAtMeta);
-    }
-    if (data.containsKey('context1')) {
-      context.handle(_context1Meta,
-          context1.isAcceptableOrUnknown(data['context1']!, _context1Meta));
-    }
-    if (data.containsKey('context2')) {
-      context.handle(_context2Meta,
-          context2.isAcceptableOrUnknown(data['context2']!, _context2Meta));
-    }
-    return context;
-  }
-
-  @override
-  Set<i0.GeneratedColumn> get $primaryKey => {id};
-  @override
-  i1.LoggerMessageEntityData map(Map<String, dynamic> data,
-      {String? tablePrefix}) {
-    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
-    return i1.LoggerMessageEntityData(
-      id: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.int, data['${effectivePrefix}id'])!,
-      message: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.string, data['${effectivePrefix}message'])!,
-      details: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.string, data['${effectivePrefix}details']),
-      level: i1.$LoggerMessageEntityTable.$converterlevel.fromSql(
-          attachedDatabase.typeMapping
-              .read(i0.DriftSqlType.int, data['${effectivePrefix}level'])!),
-      createdAt: attachedDatabase.typeMapping.read(
-          i0.DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!,
-      context1: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.string, data['${effectivePrefix}context1']),
-      context2: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.string, data['${effectivePrefix}context2']),
-    );
-  }
-
-  @override
-  $LoggerMessageEntityTable createAlias(String alias) {
-    return $LoggerMessageEntityTable(attachedDatabase, alias);
-  }
-
-  static i0.JsonTypeConverter2<i2.LogLevel, int, int> $converterlevel =
-      const i0.EnumIndexConverter<i2.LogLevel>(i2.LogLevel.values);
-  @override
-  bool get withoutRowId => true;
-  @override
-  bool get isStrict => true;
-}
-
-class LoggerMessageEntityData extends i0.DataClass
-    implements i0.Insertable<i1.LoggerMessageEntityData> {
-  final int id;
-  final String message;
-  final String? details;
-  final i2.LogLevel level;
-  final DateTime createdAt;
-  final String? context1;
-  final String? context2;
-  const LoggerMessageEntityData(
-      {required this.id,
-      required this.message,
-      this.details,
-      required this.level,
-      required this.createdAt,
-      this.context1,
-      this.context2});
-  @override
-  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
-    final map = <String, i0.Expression>{};
-    map['id'] = i0.Variable<int>(id);
-    map['message'] = i0.Variable<String>(message);
-    if (!nullToAbsent || details != null) {
-      map['details'] = i0.Variable<String>(details);
-    }
-    {
-      map['level'] = i0.Variable<int>(
-          i1.$LoggerMessageEntityTable.$converterlevel.toSql(level));
-    }
-    map['created_at'] = i0.Variable<DateTime>(createdAt);
-    if (!nullToAbsent || context1 != null) {
-      map['context1'] = i0.Variable<String>(context1);
-    }
-    if (!nullToAbsent || context2 != null) {
-      map['context2'] = i0.Variable<String>(context2);
-    }
-    return map;
-  }
-
-  factory LoggerMessageEntityData.fromJson(Map<String, dynamic> json,
-      {i0.ValueSerializer? serializer}) {
-    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
-    return LoggerMessageEntityData(
-      id: serializer.fromJson<int>(json['id']),
-      message: serializer.fromJson<String>(json['message']),
-      details: serializer.fromJson<String?>(json['details']),
-      level: i1.$LoggerMessageEntityTable.$converterlevel
-          .fromJson(serializer.fromJson<int>(json['level'])),
-      createdAt: serializer.fromJson<DateTime>(json['createdAt']),
-      context1: serializer.fromJson<String?>(json['context1']),
-      context2: serializer.fromJson<String?>(json['context2']),
-    );
-  }
-  @override
-  Map<String, dynamic> toJson({i0.ValueSerializer? serializer}) {
-    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
-    return <String, dynamic>{
-      'id': serializer.toJson<int>(id),
-      'message': serializer.toJson<String>(message),
-      'details': serializer.toJson<String?>(details),
-      'level': serializer.toJson<int>(
-          i1.$LoggerMessageEntityTable.$converterlevel.toJson(level)),
-      'createdAt': serializer.toJson<DateTime>(createdAt),
-      'context1': serializer.toJson<String?>(context1),
-      'context2': serializer.toJson<String?>(context2),
-    };
-  }
-
-  i1.LoggerMessageEntityData copyWith(
-          {int? id,
-          String? message,
-          i0.Value<String?> details = const i0.Value.absent(),
-          i2.LogLevel? level,
-          DateTime? createdAt,
-          i0.Value<String?> context1 = const i0.Value.absent(),
-          i0.Value<String?> context2 = const i0.Value.absent()}) =>
-      i1.LoggerMessageEntityData(
-        id: id ?? this.id,
-        message: message ?? this.message,
-        details: details.present ? details.value : this.details,
-        level: level ?? this.level,
-        createdAt: createdAt ?? this.createdAt,
-        context1: context1.present ? context1.value : this.context1,
-        context2: context2.present ? context2.value : this.context2,
-      );
-  LoggerMessageEntityData copyWithCompanion(
-      i1.LoggerMessageEntityCompanion data) {
-    return LoggerMessageEntityData(
-      id: data.id.present ? data.id.value : this.id,
-      message: data.message.present ? data.message.value : this.message,
-      details: data.details.present ? data.details.value : this.details,
-      level: data.level.present ? data.level.value : this.level,
-      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
-      context1: data.context1.present ? data.context1.value : this.context1,
-      context2: data.context2.present ? data.context2.value : this.context2,
-    );
-  }
-
-  @override
-  String toString() {
-    return (StringBuffer('LoggerMessageEntityData(')
-          ..write('id: $id, ')
-          ..write('message: $message, ')
-          ..write('details: $details, ')
-          ..write('level: $level, ')
-          ..write('createdAt: $createdAt, ')
-          ..write('context1: $context1, ')
-          ..write('context2: $context2')
-          ..write(')'))
-        .toString();
-  }
-
-  @override
-  int get hashCode =>
-      Object.hash(id, message, details, level, createdAt, context1, context2);
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      (other is i1.LoggerMessageEntityData &&
-          other.id == this.id &&
-          other.message == this.message &&
-          other.details == this.details &&
-          other.level == this.level &&
-          other.createdAt == this.createdAt &&
-          other.context1 == this.context1 &&
-          other.context2 == this.context2);
-}
-
-class LoggerMessageEntityCompanion
-    extends i0.UpdateCompanion<i1.LoggerMessageEntityData> {
-  final i0.Value<int> id;
-  final i0.Value<String> message;
-  final i0.Value<String?> details;
-  final i0.Value<i2.LogLevel> level;
-  final i0.Value<DateTime> createdAt;
-  final i0.Value<String?> context1;
-  final i0.Value<String?> context2;
-  const LoggerMessageEntityCompanion({
-    this.id = const i0.Value.absent(),
-    this.message = const i0.Value.absent(),
-    this.details = const i0.Value.absent(),
-    this.level = const i0.Value.absent(),
-    this.createdAt = const i0.Value.absent(),
-    this.context1 = const i0.Value.absent(),
-    this.context2 = const i0.Value.absent(),
-  });
-  LoggerMessageEntityCompanion.insert({
-    required int id,
-    required String message,
-    this.details = const i0.Value.absent(),
-    required i2.LogLevel level,
-    required DateTime createdAt,
-    this.context1 = const i0.Value.absent(),
-    this.context2 = const i0.Value.absent(),
-  })  : id = i0.Value(id),
-        message = i0.Value(message),
-        level = i0.Value(level),
-        createdAt = i0.Value(createdAt);
-  static i0.Insertable<i1.LoggerMessageEntityData> custom({
-    i0.Expression<int>? id,
-    i0.Expression<String>? message,
-    i0.Expression<String>? details,
-    i0.Expression<int>? level,
-    i0.Expression<DateTime>? createdAt,
-    i0.Expression<String>? context1,
-    i0.Expression<String>? context2,
-  }) {
-    return i0.RawValuesInsertable({
-      if (id != null) 'id': id,
-      if (message != null) 'message': message,
-      if (details != null) 'details': details,
-      if (level != null) 'level': level,
-      if (createdAt != null) 'created_at': createdAt,
-      if (context1 != null) 'context1': context1,
-      if (context2 != null) 'context2': context2,
-    });
-  }
-
-  i1.LoggerMessageEntityCompanion copyWith(
-      {i0.Value<int>? id,
-      i0.Value<String>? message,
-      i0.Value<String?>? details,
-      i0.Value<i2.LogLevel>? level,
-      i0.Value<DateTime>? createdAt,
-      i0.Value<String?>? context1,
-      i0.Value<String?>? context2}) {
-    return i1.LoggerMessageEntityCompanion(
-      id: id ?? this.id,
-      message: message ?? this.message,
-      details: details ?? this.details,
-      level: level ?? this.level,
-      createdAt: createdAt ?? this.createdAt,
-      context1: context1 ?? this.context1,
-      context2: context2 ?? this.context2,
-    );
-  }
-
-  @override
-  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
-    final map = <String, i0.Expression>{};
-    if (id.present) {
-      map['id'] = i0.Variable<int>(id.value);
-    }
-    if (message.present) {
-      map['message'] = i0.Variable<String>(message.value);
-    }
-    if (details.present) {
-      map['details'] = i0.Variable<String>(details.value);
-    }
-    if (level.present) {
-      map['level'] = i0.Variable<int>(
-          i1.$LoggerMessageEntityTable.$converterlevel.toSql(level.value));
-    }
-    if (createdAt.present) {
-      map['created_at'] = i0.Variable<DateTime>(createdAt.value);
-    }
-    if (context1.present) {
-      map['context1'] = i0.Variable<String>(context1.value);
-    }
-    if (context2.present) {
-      map['context2'] = i0.Variable<String>(context2.value);
-    }
-    return map;
-  }
-
-  @override
-  String toString() {
-    return (StringBuffer('LoggerMessageEntityCompanion(')
-          ..write('id: $id, ')
-          ..write('message: $message, ')
-          ..write('details: $details, ')
-          ..write('level: $level, ')
-          ..write('createdAt: $createdAt, ')
-          ..write('context1: $context1, ')
-          ..write('context2: $context2')
-          ..write(')'))
-        .toString();
-  }
-}

mobile/lib/infrastructure/entities/remote_asset.entity.dart

@@ -37,9 +37,10 @@ class RemoteAssetEntity extends Table
 }
 
 extension RemoteAssetEntityDataDomainEx on RemoteAssetEntityData {
-  Asset toDto() => Asset(
+  RemoteAsset toDto() => RemoteAsset(
         id: id,
         name: name,
+        ownerId: ownerId,
         checksum: checksum,
         type: type,
         createdAt: createdAt,

mobile/lib/infrastructure/entities/store.entity.dart

@@ -1,13 +1,13 @@
-import 'package:drift/drift.dart';
-import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
+import 'package:isar/isar.dart';
 
-class StoreEntity extends Table with DriftDefaultsMixin {
-  const StoreEntity();
+part 'store.entity.g.dart';
 
-  IntColumn get id => integer()();
-  IntColumn get intValue => integer().nullable()();
-  TextColumn get strValue => text().nullable()();
+/// Internal class for `Store`, do not use elsewhere.
+@Collection(inheritance: false)
+class StoreValue {
+  final Id id;
+  final int? intValue;
+  final String? strValue;
 
-  @override
-  Set<Column> get primaryKey => {id};
+  const StoreValue(this.id, {this.intValue, this.strValue});
 }

mobile/lib/infrastructure/entities/store.entity.drift.dart

@@ -1,364 +0,0 @@
-// dart format width=80
-// ignore_for_file: type=lint
-import 'package:drift/drift.dart' as i0;
-import 'package:immich_mobile/infrastructure/entities/store.entity.drift.dart'
-    as i1;
-import 'package:immich_mobile/infrastructure/entities/store.entity.dart' as i2;
-
-typedef $$StoreEntityTableCreateCompanionBuilder = i1.StoreEntityCompanion
-    Function({
-  required int id,
-  i0.Value<int?> intValue,
-  i0.Value<String?> strValue,
-});
-typedef $$StoreEntityTableUpdateCompanionBuilder = i1.StoreEntityCompanion
-    Function({
-  i0.Value<int> id,
-  i0.Value<int?> intValue,
-  i0.Value<String?> strValue,
-});
-
-class $$StoreEntityTableFilterComposer
-    extends i0.Composer<i0.GeneratedDatabase, i1.$StoreEntityTable> {
-  $$StoreEntityTableFilterComposer({
-    required super.$db,
-    required super.$table,
-    super.joinBuilder,
-    super.$addJoinBuilderToRootComposer,
-    super.$removeJoinBuilderFromRootComposer,
-  });
-  i0.ColumnFilters<int> get id => $composableBuilder(
-      column: $table.id, builder: (column) => i0.ColumnFilters(column));
-
-  i0.ColumnFilters<int> get intValue => $composableBuilder(
-      column: $table.intValue, builder: (column) => i0.ColumnFilters(column));
-
-  i0.ColumnFilters<String> get strValue => $composableBuilder(
-      column: $table.strValue, builder: (column) => i0.ColumnFilters(column));
-}
-
-class $$StoreEntityTableOrderingComposer
-    extends i0.Composer<i0.GeneratedDatabase, i1.$StoreEntityTable> {
-  $$StoreEntityTableOrderingComposer({
-    required super.$db,
-    required super.$table,
-    super.joinBuilder,
-    super.$addJoinBuilderToRootComposer,
-    super.$removeJoinBuilderFromRootComposer,
-  });
-  i0.ColumnOrderings<int> get id => $composableBuilder(
-      column: $table.id, builder: (column) => i0.ColumnOrderings(column));
-
-  i0.ColumnOrderings<int> get intValue => $composableBuilder(
-      column: $table.intValue, builder: (column) => i0.ColumnOrderings(column));
-
-  i0.ColumnOrderings<String> get strValue => $composableBuilder(
-      column: $table.strValue, builder: (column) => i0.ColumnOrderings(column));
-}
-
-class $$StoreEntityTableAnnotationComposer
-    extends i0.Composer<i0.GeneratedDatabase, i1.$StoreEntityTable> {
-  $$StoreEntityTableAnnotationComposer({
-    required super.$db,
-    required super.$table,
-    super.joinBuilder,
-    super.$addJoinBuilderToRootComposer,
-    super.$removeJoinBuilderFromRootComposer,
-  });
-  i0.GeneratedColumn<int> get id =>
-      $composableBuilder(column: $table.id, builder: (column) => column);
-
-  i0.GeneratedColumn<int> get intValue =>
-      $composableBuilder(column: $table.intValue, builder: (column) => column);
-
-  i0.GeneratedColumn<String> get strValue =>
-      $composableBuilder(column: $table.strValue, builder: (column) => column);
-}
-
-class $$StoreEntityTableTableManager extends i0.RootTableManager<
-    i0.GeneratedDatabase,
-    i1.$StoreEntityTable,
-    i1.StoreEntityData,
-    i1.$$StoreEntityTableFilterComposer,
-    i1.$$StoreEntityTableOrderingComposer,
-    i1.$$StoreEntityTableAnnotationComposer,
-    $$StoreEntityTableCreateCompanionBuilder,
-    $$StoreEntityTableUpdateCompanionBuilder,
-    (
-      i1.StoreEntityData,
-      i0.BaseReferences<i0.GeneratedDatabase, i1.$StoreEntityTable,
-          i1.StoreEntityData>
-    ),
-    i1.StoreEntityData,
-    i0.PrefetchHooks Function()> {
-  $$StoreEntityTableTableManager(
-      i0.GeneratedDatabase db, i1.$StoreEntityTable table)
-      : super(i0.TableManagerState(
-          db: db,
-          table: table,
-          createFilteringComposer: () =>
-              i1.$$StoreEntityTableFilterComposer($db: db, $table: table),
-          createOrderingComposer: () =>
-              i1.$$StoreEntityTableOrderingComposer($db: db, $table: table),
-          createComputedFieldComposer: () =>
-              i1.$$StoreEntityTableAnnotationComposer($db: db, $table: table),
-          updateCompanionCallback: ({
-            i0.Value<int> id = const i0.Value.absent(),
-            i0.Value<int?> intValue = const i0.Value.absent(),
-            i0.Value<String?> strValue = const i0.Value.absent(),
-          }) =>
-              i1.StoreEntityCompanion(
-            id: id,
-            intValue: intValue,
-            strValue: strValue,
-          ),
-          createCompanionCallback: ({
-            required int id,
-            i0.Value<int?> intValue = const i0.Value.absent(),
-            i0.Value<String?> strValue = const i0.Value.absent(),
-          }) =>
-              i1.StoreEntityCompanion.insert(
-            id: id,
-            intValue: intValue,
-            strValue: strValue,
-          ),
-          withReferenceMapper: (p0) => p0
-              .map((e) => (e.readTable(table), i0.BaseReferences(db, table, e)))
-              .toList(),
-          prefetchHooksCallback: null,
-        ));
-}
-
-typedef $$StoreEntityTableProcessedTableManager = i0.ProcessedTableManager<
-    i0.GeneratedDatabase,
-    i1.$StoreEntityTable,
-    i1.StoreEntityData,
-    i1.$$StoreEntityTableFilterComposer,
-    i1.$$StoreEntityTableOrderingComposer,
-    i1.$$StoreEntityTableAnnotationComposer,
-    $$StoreEntityTableCreateCompanionBuilder,
-    $$StoreEntityTableUpdateCompanionBuilder,
-    (
-      i1.StoreEntityData,
-      i0.BaseReferences<i0.GeneratedDatabase, i1.$StoreEntityTable,
-          i1.StoreEntityData>
-    ),
-    i1.StoreEntityData,
-    i0.PrefetchHooks Function()>;
-
-class $StoreEntityTable extends i2.StoreEntity
-    with i0.TableInfo<$StoreEntityTable, i1.StoreEntityData> {
-  @override
-  final i0.GeneratedDatabase attachedDatabase;
-  final String? _alias;
-  $StoreEntityTable(this.attachedDatabase, [this._alias]);
-  static const i0.VerificationMeta _idMeta = const i0.VerificationMeta('id');
-  @override
-  late final i0.GeneratedColumn<int> id = i0.GeneratedColumn<int>(
-      'id', aliasedName, false,
-      type: i0.DriftSqlType.int, requiredDuringInsert: true);
-  static const i0.VerificationMeta _intValueMeta =
-      const i0.VerificationMeta('intValue');
-  @override
-  late final i0.GeneratedColumn<int> intValue = i0.GeneratedColumn<int>(
-      'int_value', aliasedName, true,
-      type: i0.DriftSqlType.int, requiredDuringInsert: false);
-  static const i0.VerificationMeta _strValueMeta =
-      const i0.VerificationMeta('strValue');
-  @override
-  late final i0.GeneratedColumn<String> strValue = i0.GeneratedColumn<String>(
-      'str_value', aliasedName, true,
-      type: i0.DriftSqlType.string, requiredDuringInsert: false);
-  @override
-  List<i0.GeneratedColumn> get $columns => [id, intValue, strValue];
-  @override
-  String get aliasedName => _alias ?? actualTableName;
-  @override
-  String get actualTableName => $name;
-  static const String $name = 'store_entity';
-  @override
-  i0.VerificationContext validateIntegrity(
-      i0.Insertable<i1.StoreEntityData> instance,
-      {bool isInserting = false}) {
-    final context = i0.VerificationContext();
-    final data = instance.toColumns(true);
-    if (data.containsKey('id')) {
-      context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta));
-    } else if (isInserting) {
-      context.missing(_idMeta);
-    }
-    if (data.containsKey('int_value')) {
-      context.handle(_intValueMeta,
-          intValue.isAcceptableOrUnknown(data['int_value']!, _intValueMeta));
-    }
-    if (data.containsKey('str_value')) {
-      context.handle(_strValueMeta,
-          strValue.isAcceptableOrUnknown(data['str_value']!, _strValueMeta));
-    }
-    return context;
-  }
-
-  @override
-  Set<i0.GeneratedColumn> get $primaryKey => {id};
-  @override
-  i1.StoreEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
-    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
-    return i1.StoreEntityData(
-      id: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.int, data['${effectivePrefix}id'])!,
-      intValue: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.int, data['${effectivePrefix}int_value']),
-      strValue: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.string, data['${effectivePrefix}str_value']),
-    );
-  }
-
-  @override
-  $StoreEntityTable createAlias(String alias) {
-    return $StoreEntityTable(attachedDatabase, alias);
-  }
-
-  @override
-  bool get withoutRowId => true;
-  @override
-  bool get isStrict => true;
-}
-
-class StoreEntityData extends i0.DataClass
-    implements i0.Insertable<i1.StoreEntityData> {
-  final int id;
-  final int? intValue;
-  final String? strValue;
-  const StoreEntityData({required this.id, this.intValue, this.strValue});
-  @override
-  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
-    final map = <String, i0.Expression>{};
-    map['id'] = i0.Variable<int>(id);
-    if (!nullToAbsent || intValue != null) {
-      map['int_value'] = i0.Variable<int>(intValue);
-    }
-    if (!nullToAbsent || strValue != null) {
-      map['str_value'] = i0.Variable<String>(strValue);
-    }
-    return map;
-  }
-
-  factory StoreEntityData.fromJson(Map<String, dynamic> json,
-      {i0.ValueSerializer? serializer}) {
-    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
-    return StoreEntityData(
-      id: serializer.fromJson<int>(json['id']),
-      intValue: serializer.fromJson<int?>(json['intValue']),
-      strValue: serializer.fromJson<String?>(json['strValue']),
-    );
-  }
-  @override
-  Map<String, dynamic> toJson({i0.ValueSerializer? serializer}) {
-    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
-    return <String, dynamic>{
-      'id': serializer.toJson<int>(id),
-      'intValue': serializer.toJson<int?>(intValue),
-      'strValue': serializer.toJson<String?>(strValue),
-    };
-  }
-
-  i1.StoreEntityData copyWith(
-          {int? id,
-          i0.Value<int?> intValue = const i0.Value.absent(),
-          i0.Value<String?> strValue = const i0.Value.absent()}) =>
-      i1.StoreEntityData(
-        id: id ?? this.id,
-        intValue: intValue.present ? intValue.value : this.intValue,
-        strValue: strValue.present ? strValue.value : this.strValue,
-      );
-  StoreEntityData copyWithCompanion(i1.StoreEntityCompanion data) {
-    return StoreEntityData(
-      id: data.id.present ? data.id.value : this.id,
-      intValue: data.intValue.present ? data.intValue.value : this.intValue,
-      strValue: data.strValue.present ? data.strValue.value : this.strValue,
-    );
-  }
-
-  @override
-  String toString() {
-    return (StringBuffer('StoreEntityData(')
-          ..write('id: $id, ')
-          ..write('intValue: $intValue, ')
-          ..write('strValue: $strValue')
-          ..write(')'))
-        .toString();
-  }
-
-  @override
-  int get hashCode => Object.hash(id, intValue, strValue);
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      (other is i1.StoreEntityData &&
-          other.id == this.id &&
-          other.intValue == this.intValue &&
-          other.strValue == this.strValue);
-}
-
-class StoreEntityCompanion extends i0.UpdateCompanion<i1.StoreEntityData> {
-  final i0.Value<int> id;
-  final i0.Value<int?> intValue;
-  final i0.Value<String?> strValue;
-  const StoreEntityCompanion({
-    this.id = const i0.Value.absent(),
-    this.intValue = const i0.Value.absent(),
-    this.strValue = const i0.Value.absent(),
-  });
-  StoreEntityCompanion.insert({
-    required int id,
-    this.intValue = const i0.Value.absent(),
-    this.strValue = const i0.Value.absent(),
-  }) : id = i0.Value(id);
-  static i0.Insertable<i1.StoreEntityData> custom({
-    i0.Expression<int>? id,
-    i0.Expression<int>? intValue,
-    i0.Expression<String>? strValue,
-  }) {
-    return i0.RawValuesInsertable({
-      if (id != null) 'id': id,
-      if (intValue != null) 'int_value': intValue,
-      if (strValue != null) 'str_value': strValue,
-    });
-  }
-
-  i1.StoreEntityCompanion copyWith(
-      {i0.Value<int>? id,
-      i0.Value<int?>? intValue,
-      i0.Value<String?>? strValue}) {
-    return i1.StoreEntityCompanion(
-      id: id ?? this.id,
-      intValue: intValue ?? this.intValue,
-      strValue: strValue ?? this.strValue,
-    );
-  }
-
-  @override
-  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
-    final map = <String, i0.Expression>{};
-    if (id.present) {
-      map['id'] = i0.Variable<int>(id.value);
-    }
-    if (intValue.present) {
-      map['int_value'] = i0.Variable<int>(intValue.value);
-    }
-    if (strValue.present) {
-      map['str_value'] = i0.Variable<String>(strValue.value);
-    }
-    return map;
-  }
-
-  @override
-  String toString() {
-    return (StringBuffer('StoreEntityCompanion(')
-          ..write('id: $id, ')
-          ..write('intValue: $intValue, ')
-          ..write('strValue: $strValue')
-          ..write(')'))
-        .toString();
-  }
-}

mobile/lib/infrastructure/entities/store.entity.g.dart

@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'isar_store.entity.dart';
+part of 'store.entity.dart';
 
 // **************************************************************************
 // IsarCollectionGenerator

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

@@ -7,13 +7,11 @@ import 'package:immich_mobile/infrastructure/entities/exif.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_album.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_album_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.dart';
-import 'package:immich_mobile/infrastructure/entities/log.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/partner.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
-import 'package:immich_mobile/infrastructure/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.dart';
 import 'package:isar/isar.dart';
@@ -48,8 +46,6 @@ class IsarDatabaseRepository implements IDatabaseRepository {
     RemoteAlbumEntity,
     RemoteAlbumAssetEntity,
     RemoteAlbumUserEntity,
-    StoreEntity,
-    LoggerMessageEntity,
   ],
   include: {
     'package:immich_mobile/infrastructure/entities/merged_asset.drift',

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

@@ -23,13 +23,9 @@ import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.
     as i10;
 import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.drift.dart'
     as i11;
-import 'package:immich_mobile/infrastructure/entities/store.entity.drift.dart'
-    as i12;
-import 'package:immich_mobile/infrastructure/entities/log.entity.drift.dart'
-    as i13;
 import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
-    as i14;
-import 'package:drift/internal/modular.dart' as i15;
+    as i12;
+import 'package:drift/internal/modular.dart' as i13;
 
 abstract class $Drift extends i0.GeneratedDatabase {
   $Drift(i0.QueryExecutor e) : super(e);
@@ -55,11 +51,8 @@ abstract class $Drift extends i0.GeneratedDatabase {
       i10.$RemoteAlbumAssetEntityTable(this);
   late final i11.$RemoteAlbumUserEntityTable remoteAlbumUserEntity =
       i11.$RemoteAlbumUserEntityTable(this);
-  late final i12.$StoreEntityTable storeEntity = i12.$StoreEntityTable(this);
-  late final i13.$LoggerMessageEntityTable loggerMessageEntity =
-      i13.$LoggerMessageEntityTable(this);
-  i14.MergedAssetDrift get mergedAssetDrift => i15.ReadDatabaseContainer(this)
-      .accessor<i14.MergedAssetDrift>(i14.MergedAssetDrift.new);
+  i12.MergedAssetDrift get mergedAssetDrift => i13.ReadDatabaseContainer(this)
+      .accessor<i12.MergedAssetDrift>(i12.MergedAssetDrift.new);
   @override
   Iterable<i0.TableInfo<i0.Table, Object?>> get allTables =>
       allSchemaEntities.whereType<i0.TableInfo<i0.Table, Object?>>();
@@ -78,9 +71,7 @@ abstract class $Drift extends i0.GeneratedDatabase {
         remoteExifEntity,
         remoteAlbumEntity,
         remoteAlbumAssetEntity,
-        remoteAlbumUserEntity,
-        storeEntity,
-        loggerMessageEntity
+        remoteAlbumUserEntity
       ];
   @override
   i0.StreamQueryUpdateRules get streamUpdateRules =>
@@ -217,8 +208,4 @@ class $DriftManager {
           _db, _db.remoteAlbumAssetEntity);
   i11.$$RemoteAlbumUserEntityTableTableManager get remoteAlbumUserEntity => i11
       .$$RemoteAlbumUserEntityTableTableManager(_db, _db.remoteAlbumUserEntity);
-  i12.$$StoreEntityTableTableManager get storeEntity =>
-      i12.$$StoreEntityTableTableManager(_db, _db.storeEntity);
-  i13.$$LoggerMessageEntityTableTableManager get loggerMessageEntity =>
-      i13.$$LoggerMessageEntityTableTableManager(_db, _db.loggerMessageEntity);
 }

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

@@ -1,145 +0,0 @@
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/domain/models/user.model.dart';
-import 'package:immich_mobile/infrastructure/entities/store.entity.drift.dart';
-import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/drift_user.repository.dart';
-import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
-
-final driftStoreRepositoryProvider = Provider<DriftStoreRepository>(
-  (ref) => DriftStoreRepository(ref.watch(driftProvider)),
-);
-
-class DriftStoreRepository implements IStoreRepository {
-  final Drift _db;
-  final validStoreKeys = StoreKey.values.map((e) => e.id).toSet();
-
-  DriftStoreRepository(this._db);
-
-  @override
-  Future<bool> deleteAll() async {
-    return await _db.transaction(() async {
-      await _db.delete(_db.storeEntity).go();
-      return true;
-    });
-  }
-
-  @override
-  Stream<StoreDto<Object>> watchAll() {
-    return (_db.select(_db.storeEntity)
-          ..where((tbl) => tbl.id.isIn(validStoreKeys)))
-        .watch()
-        .asyncExpand(
-          (entities) => Stream.fromFutures(
-            entities.map((e) async => _toUpdateEvent(e)),
-          ),
-        );
-  }
-
-  @override
-  Future<void> delete<T>(StoreKey<T> key) async {
-    return await _db.transaction(() async {
-      await (_db.delete(_db.storeEntity)..where((tbl) => tbl.id.equals(key.id)))
-          .go();
-    });
-  }
-
-  @override
-  Future<bool> insert<T>(StoreKey<T> key, T value) async {
-    return await _db.transaction(() async {
-      await _db
-          .into(_db.storeEntity)
-          .insertOnConflictUpdate(await _fromValue(key, value));
-      return true;
-    });
-  }
-
-  @override
-  Future<T?> tryGet<T>(StoreKey<T> key) async {
-    final entity = await (_db.select(_db.storeEntity)
-          ..where((tbl) => tbl.id.equals(key.id)))
-        .getSingleOrNull();
-    if (entity == null) {
-      return null;
-    }
-    return await _toValue(key, entity);
-  }
-
-  @override
-  Future<bool> update<T>(StoreKey<T> key, T value) async {
-    return await _db.transaction(() async {
-      await _db
-          .into(_db.storeEntity)
-          .insertOnConflictUpdate(await _fromValue(key, value));
-      return true;
-    });
-  }
-
-  @override
-  Stream<T?> watch<T>(StoreKey<T> key) async* {
-    yield* (_db.select(_db.storeEntity)..where((tbl) => tbl.id.equals(key.id)))
-        .watchSingleOrNull()
-        .asyncMap((e) async => e == null ? null : await _toValue(key, e));
-  }
-
-  Future<StoreDto<Object>> _toUpdateEvent(StoreEntityData entity) async {
-    final key = StoreKey.values.firstWhere((e) => e.id == entity.id)
-        as StoreKey<Object>;
-    final value = await _toValue(key, entity);
-    return StoreDto(key, value);
-  }
-
-  Future<T?> _toValue<T>(StoreKey<T> key, StoreEntityData entity) async =>
-      switch (key.type) {
-        const (int) => entity.intValue,
-        const (String) => entity.strValue,
-        const (bool) => entity.intValue == 1,
-        const (DateTime) => entity.intValue == null
-            ? null
-            : DateTime.fromMillisecondsSinceEpoch(entity.intValue!),
-        const (UserDto) => entity.strValue == null
-            ? null
-            : await DriftUserRepository(_db).getByUserId(entity.strValue!),
-        _ => null,
-      } as T?;
-
-  Future<StoreEntityData> _fromValue<T>(StoreKey<T> key, T value) async {
-    final (int? intValue, String? strValue) = switch (key.type) {
-      const (int) => (value as int, null),
-      const (String) => (null, value as String),
-      const (bool) => ((value as bool) ? 1 : 0, null),
-      const (DateTime) => ((value as DateTime).millisecondsSinceEpoch, null),
-      const (UserDto) => (
-          null,
-          (await DriftUserRepository(_db).update(value as UserDto)).id,
-        ),
-      _ => throw UnsupportedError(
-          "Unsupported primitive type: ${key.type} for key: ${key.name}",
-        ),
-    };
-    return StoreEntityData(
-      id: key.id,
-      intValue: intValue,
-      strValue: strValue,
-    );
-  }
-
-  @override
-  Future<List<StoreDto<Object>>> getAll() async {
-    final entities = await (_db.select(_db.storeEntity)
-          ..where((tbl) => tbl.id.isIn(validStoreKeys)))
-        .get();
-    return Future.wait(entities.map((e) => _toUpdateEvent(e)).toList());
-  }
-}
-
-abstract class IStoreRepository {
-  Future<bool> deleteAll();
-  Stream<StoreDto<Object>> watchAll();
-  Future<void> delete<T>(StoreKey<T> key);
-  Future<bool> insert<T>(StoreKey<T> key, T value);
-  Future<T?> tryGet<T>(StoreKey<T> key);
-  Future<bool> update<T>(StoreKey<T> key, T value);
-  Stream<T?> watch<T>(StoreKey<T> key);
-  Future<List<StoreDto<Object>>> getAll();
-}

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

@@ -1,117 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/user.model.dart';
-import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
-import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart';
-import 'package:immich_mobile/domain/models/user_metadata.model.dart';
-
-class DriftUserRepository {
-  final Drift _db;
-  const DriftUserRepository(this._db);
-
-  Future<void> delete(List<String> ids) async {
-    await _db.transaction(() async {
-      await (_db.delete(_db.userEntity)..where((tbl) => tbl.id.isIn(ids))).go();
-    });
-  }
-
-  Future<void> deleteAll() async {
-    await _db.transaction(() async {
-      await _db.delete(_db.userEntity).go();
-    });
-  }
-
-  Future<List<UserDto>> getAll({SortUserBy? sortBy}) async {
-    var query = _db.select(_db.userEntity);
-
-    if (sortBy != null) {
-      switch (sortBy) {
-        case SortUserBy.id:
-          query = query..orderBy([(u) => OrderingTerm.asc(u.id)]);
-      }
-    }
-
-    final users = await query.get();
-    return users.map((u) => _toDto(u)).toList();
-  }
-
-  Future<UserDto?> getByUserId(String id) async {
-    final user = await (_db.select(_db.userEntity)
-          ..where((tbl) => tbl.id.equals(id)))
-        .getSingleOrNull();
-    return user != null ? _toDto(user) : null;
-  }
-
-  Future<List<UserDto?>> getByUserIds(List<String> ids) async {
-    final users = await (_db.select(_db.userEntity)
-          ..where((tbl) => tbl.id.isIn(ids)))
-        .get();
-
-    // Create a map for quick lookup
-    final userMap = {for (var user in users) user.id: _toDto(user)};
-
-    // Return results in the same order as input ids
-    return ids.map((id) => userMap[id]).toList();
-  }
-
-  Future<bool> insert(UserDto user) async {
-    await _db.transaction(() async {
-      await _db.into(_db.userEntity).insertOnConflictUpdate(_fromDto(user));
-    });
-    return true;
-  }
-
-  Future<UserDto> update(UserDto user) async {
-    await _db.transaction(() async {
-      await _db.into(_db.userEntity).insertOnConflictUpdate(_fromDto(user));
-    });
-    return user;
-  }
-
-  Future<bool> updateAll(List<UserDto> users) async {
-    await _db.transaction(() async {
-      await _db.batch((batch) {
-        for (final user in users) {
-          batch.insert(_db.userEntity, _fromDto(user),
-              mode: InsertMode.insertOrReplace);
-        }
-      });
-    });
-    return true;
-  }
-
-  UserDto _toDto(UserEntityData entity) {
-    return UserDto(
-      id: entity.id,
-      updatedAt: entity.updatedAt,
-      email: entity.email,
-      name: entity.name,
-      isAdmin: entity.isAdmin,
-      profileImagePath: entity.profileImagePath ?? '',
-      // Note: These fields are not in the current UserEntity table but are in UserDto
-      // You may need to add them to the table or provide defaults
-      isPartnerSharedBy: false,
-      isPartnerSharedWith: false,
-      avatarColor: AvatarColor.primary,
-      memoryEnabled: true,
-      inTimeline: false,
-      quotaUsageInBytes: entity.quotaUsageInBytes,
-      quotaSizeInBytes: entity.quotaSizeInBytes ?? 0,
-    );
-  }
-
-  UserEntityCompanion _fromDto(UserDto dto) {
-    return UserEntityCompanion(
-      id: Value(dto.id),
-      name: Value(dto.name),
-      isAdmin: Value(dto.isAdmin),
-      email: Value(dto.email),
-      profileImagePath: Value.absentIfNull(
-          dto.profileImagePath?.isEmpty == true ? null : dto.profileImagePath),
-      updatedAt: Value(dto.updatedAt),
-      quotaSizeInBytes: Value.absentIfNull(
-          dto.quotaSizeInBytes == 0 ? null : dto.quotaSizeInBytes),
-      quotaUsageInBytes: Value(dto.quotaUsageInBytes),
-    );
-  }
-}

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

@@ -1,6 +1,8 @@
+import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/exif.model.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.dart'
     as entity;
+import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:isar/isar.dart';
 
@@ -41,3 +43,36 @@ class IsarExifRepository extends IsarDatabaseRepository {
     });
   }
 }
+
+class DriftRemoteExifRepository extends DriftDatabaseRepository {
+  final Drift _db;
+  const DriftRemoteExifRepository(this._db) : super(_db);
+
+  Future<ExifInfo?> get(String assetId) {
+    final query = _db.remoteExifEntity.select()
+      ..where((exif) => exif.assetId.equals(assetId));
+
+    return query.map((asset) => asset.toDto()).getSingleOrNull();
+  }
+}
+
+extension on RemoteExifEntityData {
+  ExifInfo toDto() {
+    return ExifInfo(
+      fileSize: fileSize,
+      description: description,
+      orientation: orientation,
+      timeZone: timeZone,
+      dateTimeOriginal: dateTimeOriginal,
+      latitude: latitude,
+      longitude: longitude,
+      city: city,
+      state: state,
+      country: country,
+      make: make,
+      model: model,
+      f: fNumber,
+      iso: iso,
+    );
+  }
+}

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

@@ -1,99 +1,46 @@
-import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
-import 'package:immich_mobile/infrastructure/entities/log.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/entities/log.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
-import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
-import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:isar/isar.dart';
 
-final driftLogRepositoryProvider = Provider<LogRepository>(
-  (ref) => LogRepository(ref.watch(driftProvider)),
-);
-
-class LogRepository {
-  final Drift _db;
-
-  const LogRepository(this._db);
+class IsarLogRepository extends IsarDatabaseRepository {
+  final Isar _db;
+  const IsarLogRepository(super.db) : _db = db;
 
   Future<bool> deleteAll() async {
-    await _db.transaction(() async {
-      await _db.delete(_db.loggerMessageEntity).go();
-    });
+    await transaction(() async => await _db.loggerMessages.clear());
     return true;
   }
 
   Future<List<LogMessage>> getAll() async {
-    final query = _db.select(_db.loggerMessageEntity)
-      ..orderBy([(t) => OrderingTerm.desc(t.createdAt)]);
-    final results = await query.get();
-    return results
-        .map(
-          (row) => LogMessage(
-            message: row.message,
-            level: row.level,
-            createdAt: row.createdAt,
-            logger: row.context1,
-            error: row.details,
-            stack: row.context2,
-          ),
-        )
-        .toList();
+    final logs =
+        await _db.loggerMessages.where().sortByCreatedAtDesc().findAll();
+    return logs.map((l) => l.toDto()).toList();
   }
 
   Future<bool> insert(LogMessage log) async {
-    await _db.transaction(() async {
-      await _db.into(_db.loggerMessageEntity).insert(
-            LoggerMessageEntityCompanion.insert(
-              id: 0, // Will be auto-incremented by the database
-              message: log.message,
-              details: Value(log.error),
-              level: log.level,
-              createdAt: log.createdAt,
-              context1: Value(log.logger),
-              context2: Value(log.stack),
-            ),
-          );
+    final logEntity = LoggerMessage.fromDto(log);
+    await transaction(() async {
+      await _db.loggerMessages.put(logEntity);
     });
     return true;
   }
 
   Future<bool> insertAll(Iterable<LogMessage> logs) async {
-    await _db.transaction(() async {
-      for (final log in logs) {
-        await _db.into(_db.loggerMessageEntity).insert(
-              LoggerMessageEntityCompanion.insert(
-                id: 0, // Will be auto-incremented by the database
-                message: log.message,
-                details: Value(log.error),
-                level: log.level,
-                createdAt: log.createdAt,
-                context1: Value(log.logger),
-                context2: Value(log.stack),
-              ),
-            );
-      }
+    await transaction(() async {
+      final logEntities =
+          logs.map((log) => LoggerMessage.fromDto(log)).toList();
+      await _db.loggerMessages.putAll(logEntities);
     });
     return true;
   }
 
   Future<void> truncate({int limit = 250}) async {
-    await _db.transaction(() async {
-      final countQuery = _db.selectOnly(_db.loggerMessageEntity)
-        ..addColumns([_db.loggerMessageEntity.id.count()]);
-      final countResult = await countQuery.getSingle();
-      final count = countResult.read(_db.loggerMessageEntity.id.count()) ?? 0;
-
+    await transaction(() async {
+      final count = await _db.loggerMessages.count();
       if (count <= limit) return;
-
       final toRemove = count - limit;
-      final oldestIds = await (_db.select(_db.loggerMessageEntity)
-            ..orderBy([(t) => OrderingTerm.asc(t.createdAt)])
-            ..limit(toRemove))
-          .get();
-
-      final idsToDelete = oldestIds.map((row) => row.id).toList();
-      await (_db.delete(_db.loggerMessageEntity)
-            ..where((tbl) => tbl.id.isIn(idsToDelete)))
-          .go();
+      await _db.loggerMessages.where().limit(toRemove).deleteAll();
     });
   }
 }

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

@@ -10,26 +10,48 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
   const DriftRemoteAlbumRepository(this._db) : super(_db);
 
   Future<List<Album>> getAll({Set<SortRemoteAlbumsBy> sortBy = const {}}) {
-    final query = _db.remoteAlbumEntity.select();
+    final assetCount = _db.remoteAlbumAssetEntity.assetId.count();
+
+    final query = _db.remoteAlbumEntity.select().join([
+      leftOuterJoin(
+        _db.remoteAlbumAssetEntity,
+        _db.remoteAlbumAssetEntity.albumId.equalsExp(_db.remoteAlbumEntity.id),
+        useColumns: false,
+      ),
+      leftOuterJoin(
+        _db.userEntity,
+        _db.userEntity.id.equalsExp(_db.remoteAlbumEntity.ownerId),
+      ),
+    ]);
+    query
+      ..addColumns([assetCount])
+      ..groupBy([_db.remoteAlbumEntity.id]);
 
     if (sortBy.isNotEmpty) {
-      final orderings = <OrderClauseGenerator<$RemoteAlbumEntityTable>>[];
+      final orderings = <OrderingTerm>[];
       for (final sort in sortBy) {
         orderings.add(
           switch (sort) {
-            SortRemoteAlbumsBy.id => (row) => OrderingTerm.asc(row.id),
+            SortRemoteAlbumsBy.id => OrderingTerm.asc(_db.remoteAlbumEntity.id),
           },
         );
       }
       query.orderBy(orderings);
     }
 
-    return query.map((row) => row.toDto()).get();
+    return query
+        .map(
+          (row) => row.readTable(_db.remoteAlbumEntity).toDto(
+                assetCount: row.read(assetCount) ?? 0,
+                ownerName: row.readTable(_db.userEntity).name,
+              ),
+        )
+        .get();
   }
 }
 
 extension on RemoteAlbumEntityData {
-  Album toDto() {
+  Album toDto({int assetCount = 0, required String ownerName}) {
     return Album(
       id: id,
       name: name,
@@ -40,6 +62,8 @@ extension on RemoteAlbumEntityData {
       thumbnailAssetId: thumbnailAssetId,
       isActivityEnabled: isActivityEnabled,
       order: order,
+      assetCount: assetCount,
+      ownerName: ownerName,
     );
   }
 }

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

@@ -0,0 +1,50 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
+
+class DriftRemoteAssetRepository extends DriftDatabaseRepository {
+  final Drift _db;
+  const DriftRemoteAssetRepository(this._db) : super(_db);
+
+  Future<void> updateFavorite(List<String> ids, bool isFavorite) {
+    return _db.batch((batch) async {
+      for (final id in ids) {
+        batch.update(
+          _db.remoteAssetEntity,
+          RemoteAssetEntityCompanion(isFavorite: Value(isFavorite)),
+          where: (e) => e.id.equals(id),
+        );
+      }
+    });
+  }
+
+  Future<void> updateVisibility(List<String> ids, AssetVisibility visibility) {
+    return _db.batch((batch) async {
+      for (final id in ids) {
+        batch.update(
+          _db.remoteAssetEntity,
+          RemoteAssetEntityCompanion(visibility: Value(visibility)),
+          where: (e) => e.id.equals(id),
+        );
+      }
+    });
+  }
+
+  Future<void> updateLocation(List<String> ids, LatLng location) {
+    return _db.batch((batch) async {
+      for (final id in ids) {
+        batch.update(
+          _db.remoteExifEntity,
+          RemoteExifEntityCompanion(
+            latitude: Value(location.latitude),
+            longitude: Value(location.longitude),
+          ),
+          where: (e) => e.assetId.equals(id),
+        );
+      }
+    });
+  }
+}

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

@@ -1,19 +1,16 @@
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
-import 'package:immich_mobile/infrastructure/entities/isar_store.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/user.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/drift_store.repository.dart';
 import 'package:isar/isar.dart';
 
-class IsarStoreRepository extends IsarDatabaseRepository
-    implements IStoreRepository {
+class IsarStoreRepository extends IsarDatabaseRepository {
   final Isar _db;
   final validStoreKeys = StoreKey.values.map((e) => e.id).toSet();
 
   IsarStoreRepository(super.db) : _db = db;
 
-  @override
   Future<bool> deleteAll() async {
     return await transaction(() async {
       await _db.storeValues.clear();
@@ -21,7 +18,6 @@ class IsarStoreRepository extends IsarDatabaseRepository
     });
   }
 
-  @override
   Stream<StoreDto<Object>> watchAll() {
     return _db.storeValues
         .filter()
@@ -34,12 +30,10 @@ class IsarStoreRepository extends IsarDatabaseRepository
         );
   }
 
-  @override
   Future<void> delete<T>(StoreKey<T> key) async {
     return await transaction(() async => await _db.storeValues.delete(key.id));
   }
 
-  @override
   Future<bool> insert<T>(StoreKey<T> key, T value) async {
     return await transaction(() async {
       await _db.storeValues.put(await _fromValue(key, value));
@@ -47,7 +41,6 @@ class IsarStoreRepository extends IsarDatabaseRepository
     });
   }
 
-  @override
   Future<T?> tryGet<T>(StoreKey<T> key) async {
     final entity = (await _db.storeValues.get(key.id));
     if (entity == null) {
@@ -56,7 +49,6 @@ class IsarStoreRepository extends IsarDatabaseRepository
     return await _toValue(key, entity);
   }
 
-  @override
   Future<bool> update<T>(StoreKey<T> key, T value) async {
     return await transaction(() async {
       await _db.storeValues.put(await _fromValue(key, value));
@@ -64,7 +56,6 @@ class IsarStoreRepository extends IsarDatabaseRepository
     });
   }
 
-  @override
   Stream<T?> watch<T>(StoreKey<T> key) async* {
     yield* _db.storeValues
         .watchObject(key.id, fireImmediately: true)
@@ -109,7 +100,6 @@ class IsarStoreRepository extends IsarDatabaseRepository
     return StoreValue(key.id, intValue: intValue, strValue: strValue);
   }
 
-  @override
   Future<List<StoreDto<Object>>> getAll() async {
     final entities = await _db.storeValues
         .filter()

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

@@ -70,36 +70,38 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
     return _db.mergedAssetDrift
         .mergedAsset(userIds, limit: Limit(count, offset))
         .map(
-          (row) => row.remoteId != null
-              ? Asset(
-                  id: row.remoteId!,
-                  localId: row.localId,
-                  name: row.name,
-                  checksum: row.checksum,
-                  type: row.type,
-                  createdAt: row.createdAt,
-                  updatedAt: row.updatedAt,
-                  thumbHash: row.thumbHash,
-                  width: row.width,
-                  height: row.height,
-                  isFavorite: row.isFavorite,
-                  durationInSeconds: row.durationInSeconds,
-                )
-              : LocalAsset(
-                  id: row.localId!,
-                  remoteId: row.remoteId,
-                  name: row.name,
-                  checksum: row.checksum,
-                  type: row.type,
-                  createdAt: row.createdAt,
-                  updatedAt: row.updatedAt,
-                  width: row.width,
-                  height: row.height,
-                  isFavorite: row.isFavorite,
-                  durationInSeconds: row.durationInSeconds,
-                ),
-        )
-        .get();
+      (row) {
+        return row.remoteId != null && row.ownerId != null
+            ? RemoteAsset(
+                id: row.remoteId!,
+                localId: row.localId,
+                name: row.name,
+                ownerId: row.ownerId!,
+                checksum: row.checksum,
+                type: row.type,
+                createdAt: row.createdAt,
+                updatedAt: row.updatedAt,
+                thumbHash: row.thumbHash,
+                width: row.width,
+                height: row.height,
+                isFavorite: row.isFavorite,
+                durationInSeconds: row.durationInSeconds,
+              )
+            : LocalAsset(
+                id: row.localId!,
+                remoteId: row.remoteId,
+                name: row.name,
+                checksum: row.checksum,
+                type: row.type,
+                createdAt: row.createdAt,
+                updatedAt: row.updatedAt,
+                width: row.width,
+                height: row.height,
+                isFavorite: row.isFavorite,
+                durationInSeconds: row.durationInSeconds,
+              );
+      },
+    ).get();
   }
 
   Stream<List<Bucket>> watchLocalBucket(

mobile/lib/pages/common/tab_shell.page.dart

@@ -4,11 +4,11 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/providers/asset_viewer/scroll_notifier.provider.dart';
-import 'package:immich_mobile/providers/multiselect.provider.dart';
-import 'package:immich_mobile/providers/search/search_input_focus.provider.dart';
-import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
+import 'package:immich_mobile/providers/search/search_input_focus.provider.dart';
 import 'package:immich_mobile/providers/tab.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
 
 @RoutePage()
 class TabShellPage extends ConsumerWidget {
@@ -138,12 +138,13 @@ class TabShellPage extends ConsumerWidget {
       );
     }
 
-    final multiselectEnabled = ref.watch(multiselectProvider);
+    final multiselectEnabled =
+        ref.watch(multiSelectProvider.select((s) => s.isEnabled));
     return AutoTabsRouter(
       routes: [
         const MainTimelineRoute(),
         SearchRoute(),
-        const AlbumsRoute(),
+        const DriftAlbumsRoute(),
         const LibraryRoute(),
       ],
       duration: const Duration(milliseconds: 600),

mobile/lib/presentation/pages/dev/dev_logger.dart

@@ -1,11 +1,12 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:drift/drift.dart';
 import 'package:flutter/foundation.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
-import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+import 'package:immich_mobile/infrastructure/entities/log.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/log.repository.dart';
+// ignore: import_rule_isar
+import 'package:isar/isar.dart';
 
 const kDevLoggerTag = 'DEV';
 
@@ -13,38 +14,28 @@ abstract final class DLog {
   const DLog();
 
   static Stream<List<LogMessage>> watchLog() {
-    final db = Drift();
+    final db = Isar.getInstance();
+    if (db == null) {
+      return const Stream.empty();
+    }
 
-    final query = db.select(db.loggerMessageEntity)
-      ..where((tbl) => tbl.context1.equals(kDevLoggerTag))
-      ..orderBy([(t) => OrderingTerm.desc(t.createdAt)]);
-
-    return query.watch().map(
-          (rows) => rows
-              .map(
-                (row) => LogMessage(
-                  message: row.message,
-                  level: row.level,
-                  createdAt: row.createdAt,
-                  logger: row.context1,
-                  error: row.details,
-                  stack: row.context2,
-                ),
-              )
-              .toList(),
-        );
+    return db.loggerMessages
+        .filter()
+        .context1EqualTo(kDevLoggerTag)
+        .sortByCreatedAtDesc()
+        .watch(fireImmediately: true)
+        .map((logs) => logs.map((log) => log.toDto()).toList());
   }
 
   static void clearLog() {
-    final db = Drift();
+    final db = Isar.getInstance();
+    if (db == null) {
+      return;
+    }
 
-    unawaited(
-      db.transaction(() async {
-        await (db.delete(db.loggerMessageEntity)
-              ..where((tbl) => tbl.context1.equals(kDevLoggerTag)))
-            .go();
-      }),
-    );
+    db.writeTxnSync(() {
+      db.loggerMessages.filter().context1EqualTo(kDevLoggerTag).deleteAllSync();
+    });
   }
 
   static void log(String message, [Object? error, StackTrace? stackTrace]) {
@@ -58,7 +49,10 @@ abstract final class DLog {
       debugPrint('StackTrace: $stackTrace');
     }
 
-    final db = Drift();
+    final isar = Isar.getInstance();
+    if (isar == null) {
+      return;
+    }
 
     final record = LogMessage(
       message: message,
@@ -69,6 +63,6 @@ abstract final class DLog {
       stack: stackTrace?.toString(),
     );
 
-    unawaited(LogRepository(db).insert(record));
+    unawaited(IsarLogRepository(isar).insert(record));
   }
 }

mobile/lib/presentation/pages/dev/feat_in_development.page.dart

@@ -5,11 +5,8 @@ import 'package:drift/drift.dart' hide Column;
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/theme_extensions.dart';
-import 'package:immich_mobile/infrastructure/repositories/drift_store.repository.dart';
 import 'package:immich_mobile/presentation/pages/dev/dev_logger.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
@@ -17,32 +14,6 @@ import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 
 final _features = [
-  _Feature(
-    name: 'test',
-    icon: Icons.abc,
-    onTap: (_, ref) {
-      final UserDto value = UserDto(
-        id: "1234",
-        email: "alex@email.com",
-        name: "alex",
-        isAdmin: true,
-        updatedAt: DateTime.now(),
-      );
-
-      ref
-          .read(driftStoreRepositoryProvider)
-          .insert(StoreKey.serverUrl, "https://example.com");
-
-      final readback =
-          ref.read(driftStoreRepositoryProvider).tryGet(StoreKey.serverUrl);
-
-      readback.then((value) {
-        print("Read back: $value");
-      });
-
-      return Future.value();
-    },
-  ),
   _Feature(
     name: 'Sync Local',
     icon: Icons.photo_album_rounded,

mobile/lib/presentation/pages/dev/local_timeline.page.dart

@@ -1,5 +1,3 @@
-import 'dart:async';
-
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/widgets.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -20,7 +18,7 @@ class LocalTimelinePage extends StatelessWidget {
           (ref) {
             final timelineService =
                 ref.watch(timelineFactoryProvider).localAlbum(albumId: albumId);
-            ref.onDispose(() => unawaited(timelineService.dispose()));
+            ref.onDispose(timelineService.dispose);
             return timelineService;
           },
         ),

mobile/lib/presentation/pages/dev/main_timeline.page.dart

@@ -1,31 +1,14 @@
-import 'dart:async';
-
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
-import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 
 @RoutePage()
-class MainTimelinePage extends StatelessWidget {
+class MainTimelinePage extends ConsumerWidget {
   const MainTimelinePage({super.key});
 
   @override
-  Widget build(BuildContext context) {
-    return ProviderScope(
-      overrides: [
-        timelineServiceProvider.overrideWith(
-          (ref) {
-            final timelineUsers =
-                ref.watch(timelineUsersProvider).valueOrNull ?? [];
-            final timelineService =
-                ref.watch(timelineFactoryProvider).main(timelineUsers);
-            ref.onDispose(() => unawaited(timelineService.dispose()));
-            return timelineService;
-          },
-        ),
-      ],
-      child: const Timeline(),
-    );
+  Widget build(BuildContext context, WidgetRef ref) {
+    return const Timeline();
   }
 }

mobile/lib/presentation/pages/dev/remote_timeline.page.dart

@@ -1,5 +1,3 @@
-import 'dart:async';
-
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/widgets.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -21,7 +19,7 @@ class RemoteTimelinePage extends StatelessWidget {
             final timelineService = ref
                 .watch(timelineFactoryProvider)
                 .remoteAlbum(albumId: albumId);
-            ref.onDispose(() => unawaited(timelineService.dispose()));
+            ref.onDispose(timelineService.dispose);
             return timelineService;
           },
         ),

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

@@ -0,0 +1,767 @@
+import 'dart:async';
+import 'dart:math';
+
+import 'package:auto_route/auto_route.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/album/album.model.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/theme_extensions.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/models/albums/album_search.model.dart';
+import 'package:immich_mobile/pages/common/large_leading_tile.dart';
+import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/utils/remote_album.utils.dart';
+import 'package:immich_mobile/widgets/common/immich_sliver_app_bar.dart';
+import 'package:immich_mobile/widgets/common/search_field.dart';
+
+@RoutePage()
+class DriftAlbumsPage extends ConsumerStatefulWidget {
+  const DriftAlbumsPage({super.key});
+
+  @override
+  ConsumerState<DriftAlbumsPage> createState() => _DriftAlbumsPageState();
+}
+
+class _DriftAlbumsPageState extends ConsumerState<DriftAlbumsPage> {
+  bool isGrid = false;
+  final searchController = TextEditingController();
+  QuickFilterMode filterMode = QuickFilterMode.all;
+  final searchFocusNode = FocusNode();
+
+  @override
+  void initState() {
+    super.initState();
+
+    // Load albums when component mounts
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      ref.read(remoteAlbumProvider.notifier).getAll();
+    });
+
+    searchController.addListener(() {
+      onSearch(searchController.text, filterMode);
+    });
+  }
+
+  void onSearch(String searchTerm, QuickFilterMode sortMode) {
+    final userId = ref.watch(currentUserProvider)?.id;
+    ref
+        .read(remoteAlbumProvider.notifier)
+        .searchAlbums(searchTerm, userId, sortMode);
+  }
+
+  Future<void> onRefresh() async {
+    await ref.read(remoteAlbumProvider.notifier).refresh();
+  }
+
+  void toggleViewMode() {
+    setState(() {
+      isGrid = !isGrid;
+    });
+  }
+
+  void changeFilter(QuickFilterMode sortMode) {
+    setState(() {
+      filterMode = sortMode;
+    });
+  }
+
+  void clearSearch() {
+    setState(() {
+      filterMode = QuickFilterMode.all;
+      searchController.clear();
+      ref.read(remoteAlbumProvider.notifier).clearSearch();
+    });
+  }
+
+  @override
+  void dispose() {
+    searchController.dispose();
+    searchFocusNode.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final albumState = ref.watch(remoteAlbumProvider);
+    final albums = albumState.filteredAlbums;
+    final isLoading = albumState.isLoading;
+    final error = albumState.error;
+    final userId = ref.watch(currentUserProvider)?.id;
+
+    return RefreshIndicator(
+      onRefresh: onRefresh,
+      child: CustomScrollView(
+        slivers: [
+          const ImmichSliverAppBar(),
+          _SearchBar(
+            searchController: searchController,
+            searchFocusNode: searchFocusNode,
+            onSearch: onSearch,
+            filterMode: filterMode,
+            onClearSearch: clearSearch,
+          ),
+          _QuickFilterButtonRow(
+            filterMode: filterMode,
+            onChangeFilter: changeFilter,
+            onSearch: onSearch,
+            searchController: searchController,
+          ),
+          _QuickSortAndViewMode(
+            isGrid: isGrid,
+            onToggleViewMode: toggleViewMode,
+          ),
+          isGrid
+              ? _AlbumGrid(
+                  albums: albums,
+                  userId: userId,
+                  isLoading: isLoading,
+                  error: error,
+                )
+              : _AlbumList(
+                  albums: albums,
+                  userId: userId,
+                  isLoading: isLoading,
+                  error: error,
+                ),
+        ],
+      ),
+    );
+  }
+}
+
+class _SortButton extends ConsumerStatefulWidget {
+  const _SortButton();
+
+  @override
+  ConsumerState<_SortButton> createState() => _SortButtonState();
+}
+
+class _SortButtonState extends ConsumerState<_SortButton> {
+  RemoteAlbumSortMode albumSortOption = RemoteAlbumSortMode.lastModified;
+  bool albumSortIsReverse = true;
+
+  void onMenuTapped(RemoteAlbumSortMode sortMode) {
+    final selected = albumSortOption == sortMode;
+    // Switch direction
+    if (selected) {
+      setState(() {
+        albumSortIsReverse = !albumSortIsReverse;
+      });
+      ref.read(remoteAlbumProvider.notifier).sortFilteredAlbums(
+            sortMode,
+            isReverse: albumSortIsReverse,
+          );
+    } else {
+      setState(() {
+        albumSortOption = sortMode;
+      });
+      ref.read(remoteAlbumProvider.notifier).sortFilteredAlbums(
+            sortMode,
+            isReverse: albumSortIsReverse,
+          );
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return MenuAnchor(
+      style: MenuStyle(
+        elevation: const WidgetStatePropertyAll(1),
+        shape: WidgetStateProperty.all(
+          const RoundedRectangleBorder(
+            borderRadius: BorderRadius.all(
+              Radius.circular(24),
+            ),
+          ),
+        ),
+        padding: const WidgetStatePropertyAll(
+          EdgeInsets.all(4),
+        ),
+      ),
+      consumeOutsideTap: true,
+      menuChildren: RemoteAlbumSortMode.values
+          .map(
+            (sortMode) => MenuItemButton(
+              leadingIcon: albumSortOption == sortMode
+                  ? albumSortIsReverse
+                      ? Icon(
+                          Icons.keyboard_arrow_down,
+                          color: albumSortOption == sortMode
+                              ? context.colorScheme.onPrimary
+                              : context.colorScheme.onSurface,
+                        )
+                      : Icon(
+                          Icons.keyboard_arrow_up_rounded,
+                          color: albumSortOption == sortMode
+                              ? context.colorScheme.onPrimary
+                              : context.colorScheme.onSurface,
+                        )
+                  : const Icon(Icons.abc, color: Colors.transparent),
+              onPressed: () => onMenuTapped(sortMode),
+              style: ButtonStyle(
+                padding: WidgetStateProperty.all(
+                  const EdgeInsets.fromLTRB(16, 16, 32, 16),
+                ),
+                backgroundColor: WidgetStateProperty.all(
+                  albumSortOption == sortMode
+                      ? context.colorScheme.primary
+                      : Colors.transparent,
+                ),
+                shape: WidgetStateProperty.all(
+                  const RoundedRectangleBorder(
+                    borderRadius: BorderRadius.all(
+                      Radius.circular(24),
+                    ),
+                  ),
+                ),
+              ),
+              child: Text(
+                sortMode.key.t(context: context),
+                style: context.textTheme.titleSmall?.copyWith(
+                  fontWeight: FontWeight.w600,
+                  color: albumSortOption == sortMode
+                      ? context.colorScheme.onPrimary
+                      : context.colorScheme.onSurface.withAlpha(185),
+                ),
+              ),
+            ),
+          )
+          .toList(),
+      builder: (context, controller, child) {
+        return GestureDetector(
+          onTap: () {
+            if (controller.isOpen) {
+              controller.close();
+            } else {
+              controller.open();
+            }
+          },
+          child: Row(
+            children: [
+              Padding(
+                padding: const EdgeInsets.only(right: 5),
+                child: albumSortIsReverse
+                    ? const Icon(
+                        Icons.keyboard_arrow_down,
+                      )
+                    : const Icon(
+                        Icons.keyboard_arrow_up_rounded,
+                      ),
+              ),
+              Text(
+                albumSortOption.key.t(context: context),
+                style: context.textTheme.bodyLarge?.copyWith(
+                  fontWeight: FontWeight.w500,
+                  color: context.colorScheme.onSurface.withAlpha(225),
+                ),
+              ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+}
+
+class _SearchBar extends StatelessWidget {
+  const _SearchBar({
+    required this.searchController,
+    required this.searchFocusNode,
+    required this.onSearch,
+    required this.filterMode,
+    required this.onClearSearch,
+  });
+
+  final TextEditingController searchController;
+  final FocusNode searchFocusNode;
+  final void Function(String, QuickFilterMode) onSearch;
+  final QuickFilterMode filterMode;
+  final VoidCallback onClearSearch;
+
+  @override
+  Widget build(BuildContext context) {
+    return SliverPadding(
+      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+      sliver: SliverToBoxAdapter(
+        child: Container(
+          decoration: BoxDecoration(
+            border: Border.all(
+              color: context.colorScheme.onSurface.withAlpha(0),
+              width: 0,
+            ),
+            borderRadius: const BorderRadius.all(
+              Radius.circular(24),
+            ),
+            gradient: LinearGradient(
+              colors: [
+                context.colorScheme.primary.withValues(alpha: 0.075),
+                context.colorScheme.primary.withValues(alpha: 0.09),
+                context.colorScheme.primary.withValues(alpha: 0.075),
+              ],
+              begin: Alignment.topLeft,
+              end: Alignment.bottomRight,
+              transform: const GradientRotation(0.5 * pi),
+            ),
+          ),
+          child: SearchField(
+            autofocus: false,
+            contentPadding: const EdgeInsets.all(16),
+            hintText: 'search_albums'.tr(),
+            prefixIcon: const Icon(Icons.search_rounded),
+            suffixIcon: searchController.text.isNotEmpty
+                ? IconButton(
+                    icon: const Icon(Icons.clear_rounded),
+                    onPressed: onClearSearch,
+                  )
+                : null,
+            controller: searchController,
+            onChanged: (_) => onSearch(searchController.text, filterMode),
+            focusNode: searchFocusNode,
+            onTapOutside: (_) => searchFocusNode.unfocus(),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _QuickFilterButtonRow extends StatelessWidget {
+  const _QuickFilterButtonRow({
+    required this.filterMode,
+    required this.onChangeFilter,
+    required this.onSearch,
+    required this.searchController,
+  });
+
+  final QuickFilterMode filterMode;
+  final void Function(QuickFilterMode) onChangeFilter;
+  final void Function(String, QuickFilterMode) onSearch;
+  final TextEditingController searchController;
+
+  @override
+  Widget build(BuildContext context) {
+    return SliverPadding(
+      padding: const EdgeInsets.symmetric(horizontal: 16),
+      sliver: SliverToBoxAdapter(
+        child: Wrap(
+          spacing: 4,
+          runSpacing: 4,
+          children: [
+            _QuickFilterButton(
+              label: 'all'.tr(),
+              isSelected: filterMode == QuickFilterMode.all,
+              onTap: () {
+                onChangeFilter(QuickFilterMode.all);
+                onSearch(searchController.text, QuickFilterMode.all);
+              },
+            ),
+            _QuickFilterButton(
+              label: 'shared_with_me'.tr(),
+              isSelected: filterMode == QuickFilterMode.sharedWithMe,
+              onTap: () {
+                onChangeFilter(QuickFilterMode.sharedWithMe);
+                onSearch(
+                  searchController.text,
+                  QuickFilterMode.sharedWithMe,
+                );
+              },
+            ),
+            _QuickFilterButton(
+              label: 'my_albums'.tr(),
+              isSelected: filterMode == QuickFilterMode.myAlbums,
+              onTap: () {
+                onChangeFilter(QuickFilterMode.myAlbums);
+                onSearch(
+                  searchController.text,
+                  QuickFilterMode.myAlbums,
+                );
+              },
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _QuickFilterButton extends StatelessWidget {
+  const _QuickFilterButton({
+    required this.isSelected,
+    required this.onTap,
+    required this.label,
+  });
+
+  final bool isSelected;
+  final VoidCallback onTap;
+  final String label;
+
+  @override
+  Widget build(BuildContext context) {
+    return TextButton(
+      onPressed: onTap,
+      style: ButtonStyle(
+        backgroundColor: WidgetStateProperty.all(
+          isSelected ? context.colorScheme.primary : Colors.transparent,
+        ),
+        shape: WidgetStateProperty.all(
+          RoundedRectangleBorder(
+            borderRadius: const BorderRadius.all(
+              Radius.circular(20),
+            ),
+            side: BorderSide(
+              color: context.colorScheme.onSurface.withAlpha(25),
+              width: 1,
+            ),
+          ),
+        ),
+      ),
+      child: Text(
+        label,
+        style: TextStyle(
+          color: isSelected
+              ? context.colorScheme.onPrimary
+              : context.colorScheme.onSurface,
+          fontSize: 14,
+        ),
+      ),
+    );
+  }
+}
+
+class _QuickSortAndViewMode extends StatelessWidget {
+  const _QuickSortAndViewMode({
+    required this.isGrid,
+    required this.onToggleViewMode,
+  });
+
+  final bool isGrid;
+  final VoidCallback onToggleViewMode;
+
+  @override
+  Widget build(BuildContext context) {
+    return SliverPadding(
+      padding: const EdgeInsets.symmetric(horizontal: 16),
+      sliver: SliverToBoxAdapter(
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
+            const _SortButton(),
+            IconButton(
+              icon: Icon(
+                isGrid ? Icons.view_list_outlined : Icons.grid_view_outlined,
+                size: 24,
+              ),
+              onPressed: onToggleViewMode,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _AlbumList extends StatelessWidget {
+  const _AlbumList({
+    required this.isLoading,
+    required this.error,
+    required this.albums,
+    required this.userId,
+  });
+
+  final bool isLoading;
+  final String? error;
+  final List<Album> albums;
+  final String? userId;
+
+  @override
+  Widget build(BuildContext context) {
+    if (isLoading) {
+      return const SliverToBoxAdapter(
+        child: Center(
+          child: Padding(
+            padding: EdgeInsets.all(20.0),
+            child: CircularProgressIndicator(),
+          ),
+        ),
+      );
+    }
+
+    if (error != null) {
+      return SliverToBoxAdapter(
+        child: Center(
+          child: Padding(
+            padding: const EdgeInsets.all(20.0),
+            child: Text(
+              'Error loading albums: $error',
+              style: TextStyle(
+                color: context.colorScheme.error,
+              ),
+            ),
+          ),
+        ),
+      );
+    }
+
+    if (albums.isEmpty) {
+      return const SliverToBoxAdapter(
+        child: Center(
+          child: Padding(
+            padding: EdgeInsets.all(20.0),
+            child: Text('No albums found'),
+          ),
+        ),
+      );
+    }
+
+    return SliverPadding(
+      padding: const EdgeInsets.symmetric(horizontal: 16.0),
+      sliver: SliverList.builder(
+        itemBuilder: (_, index) {
+          final album = albums[index];
+
+          return Padding(
+            padding: const EdgeInsets.only(
+              bottom: 8.0,
+            ),
+            child: LargeLeadingTile(
+              title: Text(
+                album.name,
+                maxLines: 2,
+                overflow: TextOverflow.ellipsis,
+                style: context.textTheme.titleSmall?.copyWith(
+                  fontWeight: FontWeight.w600,
+                ),
+              ),
+              subtitle: Text(
+                '${'items_count'.t(
+                  context: context,
+                  args: {
+                    'count': album.assetCount,
+                  },
+                )} • ${album.ownerId != userId ? 'shared_by_user'.t(
+                    context: context,
+                    args: {
+                      'user': album.ownerName,
+                    },
+                  ) : 'owned'.t(context: context)}',
+                overflow: TextOverflow.ellipsis,
+                style: context.textTheme.bodyMedium?.copyWith(
+                  color: context.colorScheme.onSurfaceSecondary,
+                ),
+              ),
+              onTap: () => context.router.push(
+                RemoteTimelineRoute(albumId: album.id),
+              ),
+              leadingPadding: const EdgeInsets.only(
+                right: 16,
+              ),
+              leading: album.thumbnailAssetId != null
+                  ? ClipRRect(
+                      borderRadius: const BorderRadius.all(
+                        Radius.circular(15),
+                      ),
+                      child: SizedBox(
+                        width: 80,
+                        height: 80,
+                        child: Thumbnail(
+                          remoteId: album.thumbnailAssetId,
+                        ),
+                      ),
+                    )
+                  : const SizedBox(
+                      width: 80,
+                      height: 80,
+                      child: Icon(
+                        Icons.photo_album_rounded,
+                        size: 40,
+                        color: Colors.grey,
+                      ),
+                    ),
+            ),
+          );
+        },
+        itemCount: albums.length,
+      ),
+    );
+  }
+}
+
+class _AlbumGrid extends StatelessWidget {
+  const _AlbumGrid({
+    required this.albums,
+    required this.userId,
+    required this.isLoading,
+    required this.error,
+  });
+
+  final List<Album> albums;
+  final String? userId;
+  final bool isLoading;
+  final String? error;
+
+  @override
+  Widget build(BuildContext context) {
+    if (isLoading) {
+      return const SliverToBoxAdapter(
+        child: Center(
+          child: Padding(
+            padding: EdgeInsets.all(20.0),
+            child: CircularProgressIndicator(),
+          ),
+        ),
+      );
+    }
+
+    if (error != null) {
+      return SliverToBoxAdapter(
+        child: Center(
+          child: Padding(
+            padding: const EdgeInsets.all(20.0),
+            child: Text(
+              'Error loading albums: $error',
+              style: TextStyle(
+                color: context.colorScheme.error,
+              ),
+            ),
+          ),
+        ),
+      );
+    }
+
+    if (albums.isEmpty) {
+      return const SliverToBoxAdapter(
+        child: Center(
+          child: Padding(
+            padding: EdgeInsets.all(20.0),
+            child: Text('No albums found'),
+          ),
+        ),
+      );
+    }
+
+    return SliverPadding(
+      padding: const EdgeInsets.symmetric(horizontal: 16.0),
+      sliver: SliverGrid(
+        gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
+          maxCrossAxisExtent: 250,
+          mainAxisSpacing: 4,
+          crossAxisSpacing: 4,
+          childAspectRatio: .7,
+        ),
+        delegate: SliverChildBuilderDelegate(
+          (context, index) {
+            final album = albums[index];
+            return _GridAlbumCard(
+              album: album,
+              userId: userId,
+            );
+          },
+          childCount: albums.length,
+        ),
+      ),
+    );
+  }
+}
+
+class _GridAlbumCard extends StatelessWidget {
+  const _GridAlbumCard({
+    required this.album,
+    required this.userId,
+  });
+
+  final Album album;
+  final String? userId;
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      onTap: () => context.router.push(
+        RemoteTimelineRoute(albumId: album.id),
+      ),
+      child: Card(
+        elevation: 0,
+        color: context.colorScheme.surfaceBright,
+        shape: RoundedRectangleBorder(
+          borderRadius: const BorderRadius.all(
+            Radius.circular(16),
+          ),
+          side: BorderSide(
+            color: context.colorScheme.onSurface.withAlpha(25),
+            width: 1,
+          ),
+        ),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Expanded(
+              flex: 2,
+              child: ClipRRect(
+                borderRadius: const BorderRadius.vertical(
+                  top: Radius.circular(15),
+                ),
+                child: SizedBox(
+                  width: double.infinity,
+                  child: album.thumbnailAssetId != null
+                      ? Thumbnail(
+                          remoteId: album.thumbnailAssetId,
+                        )
+                      : Container(
+                          color: context.colorScheme.surfaceContainerHighest,
+                          child: const Icon(
+                            Icons.photo_album_rounded,
+                            size: 40,
+                            color: Colors.grey,
+                          ),
+                        ),
+                ),
+              ),
+            ),
+            Expanded(
+              flex: 1,
+              child: Padding(
+                padding: const EdgeInsets.all(12.0),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                  children: [
+                    Text(
+                      album.name,
+                      maxLines: 2,
+                      overflow: TextOverflow.ellipsis,
+                      style: context.textTheme.titleSmall?.copyWith(
+                        fontWeight: FontWeight.w600,
+                      ),
+                    ),
+                    Text(
+                      '${'items_count'.t(
+                        context: context,
+                        args: {
+                          'count': album.assetCount,
+                        },
+                      )} • ${album.ownerId != userId ? 'shared_by_user'.t(
+                          context: context,
+                          args: {
+                            'user': album.ownerName,
+                          },
+                        ) : 'owned'.t(context: context)}',
+                      maxLines: 1,
+                      overflow: TextOverflow.ellipsis,
+                      style: context.textTheme.labelMedium?.copyWith(
+                        color: context.colorScheme.onSurfaceSecondary,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

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

@@ -1,16 +1,51 @@
 import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 class ArchiveActionButton extends ConsumerWidget {
-  const ArchiveActionButton({super.key});
+  final ActionSource source;
+
+  const ArchiveActionButton({super.key, required this.source});
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    final result = await ref.read(actionProvider.notifier).archive(source);
+    await ref.read(timelineServiceProvider).reloadBucket();
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'archive_action_prompt'.t(
+      context: context,
+      args: {'count': result.count.toString()},
+    );
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success
+            ? successMessage
+            : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+    }
+  }
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     return BaseActionButton(
       iconData: Icons.archive_outlined,
       label: "archive".t(context: context),
+      onPressed: () => _onTap(context, ref),
     );
   }
 }

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

@@ -1,16 +1,54 @@
 import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 class EditLocationActionButton extends ConsumerWidget {
-  const EditLocationActionButton({super.key});
+  final ActionSource source;
+
+  const EditLocationActionButton({super.key, required this.source});
+
+  _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    final result =
+        await ref.read(actionProvider.notifier).editLocation(source, context);
+    if (result == null) {
+      return;
+    }
+
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'edit_location_action_prompt'.t(
+      context: context,
+      args: {'count': result.count.toString()},
+    );
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success
+            ? successMessage
+            : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+    }
+  }
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     return BaseActionButton(
       iconData: Icons.edit_location_alt_outlined,
       label: "control_bottom_app_bar_edit_location".t(context: context),
+      onPressed: () => _onTap(context, ref),
     );
   }
 }

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

@@ -1,16 +1,51 @@
 import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 class FavoriteActionButton extends ConsumerWidget {
-  const FavoriteActionButton({super.key});
+  final ActionSource source;
+
+  const FavoriteActionButton({super.key, required this.source});
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    final result = await ref.read(actionProvider.notifier).favorite(source);
+    await ref.read(timelineServiceProvider).reloadBucket();
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'favorite_action_prompt'.t(
+      context: context,
+      args: {'count': result.count.toString()},
+    );
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success
+            ? successMessage
+            : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+    }
+  }
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     return BaseActionButton(
       iconData: Icons.favorite_border_rounded,
       label: "favorite".t(context: context),
+      onPressed: () => _onTap(context, ref),
     );
   }
 }

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

@@ -1,10 +1,45 @@
 import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 class MoveToLockFolderActionButton extends ConsumerWidget {
-  const MoveToLockFolderActionButton({super.key});
+  final ActionSource source;
+
+  const MoveToLockFolderActionButton({super.key, required this.source});
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    final result =
+        await ref.read(actionProvider.notifier).moveToLockFolder(source);
+    await ref.read(timelineServiceProvider).reloadBucket();
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'move_to_lock_folder_action_prompt'.t(
+      context: context,
+      args: {'count': result.count.toString()},
+    );
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success
+            ? successMessage
+            : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+    }
+  }
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -12,6 +47,7 @@ class MoveToLockFolderActionButton extends ConsumerWidget {
       maxWidth: 100.0,
       iconData: Icons.lock_outline_rounded,
       label: "move_to_locked_folder".t(context: context),
+      onPressed: () => _onTap(context, ref),
     );
   }
 }

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

@@ -1,10 +1,45 @@
 import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 class RemoveFromLockFolderActionButton extends ConsumerWidget {
-  const RemoveFromLockFolderActionButton({super.key});
+  final ActionSource source;
+
+  const RemoveFromLockFolderActionButton({super.key, required this.source});
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    final result =
+        await ref.read(actionProvider.notifier).removeFromLockFolder(source);
+    await ref.read(timelineServiceProvider).reloadBucket();
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'remove_from_lock_folder_action_prompt'.t(
+      context: context,
+      args: {'count': result.count.toString()},
+    );
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success
+            ? successMessage
+            : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+    }
+  }
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -12,6 +47,7 @@ class RemoveFromLockFolderActionButton extends ConsumerWidget {
       maxWidth: 100.0,
       iconData: Icons.lock_open_rounded,
       label: "remove_from_locked_folder".t(context: context),
+      onPressed: () => _onTap(context, ref),
     );
   }
 }

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

@@ -1,16 +1,50 @@
 import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 class ShareLinkActionButton extends ConsumerWidget {
-  const ShareLinkActionButton({super.key});
+  final ActionSource source;
+
+  const ShareLinkActionButton({super.key, required this.source});
+
+  _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    final result =
+        await ref.read(actionProvider.notifier).shareLink(source, context);
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'share_link_action_prompt'.t(
+      context: context,
+      args: {'count': result.count.toString()},
+    );
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success
+            ? successMessage
+            : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+    }
+  }
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     return BaseActionButton(
       iconData: Icons.link_rounded,
       label: "share_link".t(context: context),
+      onPressed: () => _onTap(context, ref),
     );
   }
 }

mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
@@ -29,20 +30,22 @@ class HomeBottomAppBar extends ConsumerWidget {
 
     return BaseBottomSheet(
       initialChildSize: 0.25,
-      minChildSize: 0.22,
+      shouldCloseOnMinExtent: false,
       actions: [
-        const ShareActionButton(),
+        if (multiselect.isEnabled) const ShareActionButton(),
         if (multiselect.hasRemote) ...[
-          const ShareLinkActionButton(),
-          const ArchiveActionButton(),
-          const FavoriteActionButton(),
+          const ShareLinkActionButton(source: ActionSource.timeline),
+          const ArchiveActionButton(source: ActionSource.timeline),
+          const FavoriteActionButton(source: ActionSource.timeline),
           const DownloadActionButton(),
           isTrashEnable
               ? const TrashActionButton()
               : const DeletePermanentActionButton(),
           const EditDateTimeActionButton(),
-          const EditLocationActionButton(),
-          const MoveToLockFolderActionButton(),
+          const EditLocationActionButton(source: ActionSource.timeline),
+          const MoveToLockFolderActionButton(
+            source: ActionSource.timeline,
+          ),
           const StackActionButton(),
         ],
         if (multiselect.hasLocal) ...[

mobile/lib/presentation/widgets/images/thumbnail.widget.dart

@@ -10,20 +10,39 @@ import 'package:octo_image/octo_image.dart';
 
 class Thumbnail extends StatelessWidget {
   const Thumbnail({
-    required this.asset,
+    this.asset,
+    this.remoteId,
     this.size = const Size.square(256),
     this.fit = BoxFit.cover,
     super.key,
-  });
+  }) : assert(
+          asset != null || remoteId != null,
+          'Either asset or remoteId must be provided',
+        );
 
-  final BaseAsset asset;
+  final BaseAsset? asset;
+  final String? remoteId;
   final Size size;
   final BoxFit fit;
 
   static ImageProvider imageProvider({
-    required BaseAsset asset,
+    BaseAsset? asset,
+    String? remoteId,
     Size size = const Size.square(256),
   }) {
+    assert(
+      asset != null || remoteId != null,
+      'Either asset or remoteId must be provided',
+    );
+
+    if (remoteId != null) {
+      return RemoteThumbProvider(
+        assetId: remoteId,
+        height: size.height,
+        width: size.width,
+      );
+    }
+
     if (asset is LocalAsset) {
       return LocalThumbProvider(
         asset: asset,
@@ -32,7 +51,7 @@ class Thumbnail extends StatelessWidget {
       );
     }
 
-    if (asset is Asset) {
+    if (asset is RemoteAsset) {
       return RemoteThumbProvider(
         assetId: asset.id,
         height: size.height,
@@ -45,8 +64,10 @@ class Thumbnail extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final thumbHash = asset is Asset ? (asset as Asset).thumbHash : null;
-    final provider = imageProvider(asset: asset, size: size);
+    final thumbHash =
+        asset is RemoteAsset ? (asset as RemoteAsset).thumbHash : null;
+    final provider =
+        imageProvider(asset: asset, remoteId: remoteId, size: size);
 
     return OctoImage.fromSet(
       image: provider,

mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart

@@ -30,9 +30,11 @@ class ThumbnailTile extends ConsumerWidget {
         ? context.primaryColor.darken(amount: 0.6)
         : context.primaryColor.lighten(amount: 0.8);
 
-    final isSelected = ref
-        .watch(multiSelectProvider.select((state) => state.selectedAssets))
-        .contains(asset);
+    final isSelected = ref.watch(
+      multiSelectProvider.select(
+        (multiselect) => multiselect.selectedAssets.contains(asset),
+      ),
+    );
 
     return Stack(
       children: [

mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart

@@ -185,7 +185,7 @@ class FixedSegment extends Segment {
   /// and prevents duplicate keys even when assets have the same name/timestamp
   String _generateUniqueKey(BaseAsset asset, int assetIndex) {
     // Try to get the most unique identifier based on asset type
-    if (asset is Asset) {
+    if (asset is RemoteAsset) {
       // For remote/merged assets, use the remote ID which is globally unique
       return 'asset_${asset.id}';
     } else if (asset is LocalAsset) {

mobile/lib/presentation/widgets/timeline/header.widget.dart

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

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

@@ -407,7 +407,7 @@ class _MultiSelectStatusButton extends ConsumerWidget {
     final selectCount =
         ref.watch(multiSelectProvider.select((s) => s.selectedAssets.length));
     return ElevatedButton.icon(
-      onPressed: () => ref.read(multiSelectProvider.notifier).clearSelection(),
+      onPressed: () => ref.read(multiSelectProvider.notifier).reset(),
       icon: Icon(
         Icons.close_rounded,
         color: context.colorScheme.onPrimary,

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

@@ -0,0 +1,197 @@
+import 'package:flutter/material.dart';
+import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:immich_mobile/services/action.service.dart';
+import 'package:immich_mobile/services/timeline.service.dart';
+import 'package:logging/logging.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+
+final actionProvider = NotifierProvider<ActionNotifier, void>(
+  ActionNotifier.new,
+  dependencies: [
+    multiSelectProvider,
+    timelineServiceProvider,
+  ],
+);
+
+class ActionResult {
+  final int count;
+  final bool success;
+  final String? error;
+
+  const ActionResult({required this.count, required this.success, this.error});
+
+  @override
+  String toString() =>
+      'ActionResult(count: $count, success: $success, error: $error)';
+}
+
+class ActionNotifier extends Notifier<void> {
+  final Logger _logger = Logger('ActionNotifier');
+  late ActionService _service;
+
+  ActionNotifier() : super();
+
+  @override
+  void build() {
+    _service = ref.watch(actionServiceProvider);
+  }
+
+  List<String> _getIdsForSource<T extends BaseAsset>(ActionSource source) {
+    final currentUser = ref.read(currentUserProvider);
+    if (T is RemoteAsset && currentUser == null) {
+      return [];
+    }
+
+    final Set<BaseAsset> assets = switch (source) {
+      ActionSource.timeline =>
+        ref.read(multiSelectProvider.select((s) => s.selectedAssets)),
+      ActionSource.viewer => {},
+    };
+
+    return switch (T) {
+      const (RemoteAsset) => assets
+          .where(
+            (asset) => asset is RemoteAsset && asset.ownerId == currentUser!.id,
+          )
+          .cast<RemoteAsset>()
+          .map((asset) => asset.id)
+          .toList(),
+      const (LocalAsset) =>
+        assets.whereType<LocalAsset>().map((asset) => asset.id).toList(),
+      _ => [],
+    };
+  }
+
+  Future<ActionResult> shareLink(
+    ActionSource source,
+    BuildContext context,
+  ) async {
+    final ids = _getIdsForSource<RemoteAsset>(source);
+    try {
+      await _service.shareLink(ids, context);
+      return ActionResult(count: ids.length, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to create shared link for assets', error, stack);
+      return ActionResult(
+        count: ids.length,
+        success: false,
+        error: error.toString(),
+      );
+    }
+  }
+
+  Future<ActionResult> favorite(ActionSource source) async {
+    final ids = _getIdsForSource<RemoteAsset>(source);
+    try {
+      await _service.favorite(ids);
+      return ActionResult(count: ids.length, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to favorite assets', error, stack);
+      return ActionResult(
+        count: ids.length,
+        success: false,
+        error: error.toString(),
+      );
+    }
+  }
+
+  Future<ActionResult> unFavorite(ActionSource source) async {
+    final ids = _getIdsForSource<RemoteAsset>(source);
+    try {
+      await _service.unFavorite(ids);
+      return ActionResult(count: ids.length, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to unfavorite assets', error, stack);
+      return ActionResult(
+        count: ids.length,
+        success: false,
+        error: error.toString(),
+      );
+    }
+  }
+
+  Future<ActionResult> archive(ActionSource source) async {
+    final ids = _getIdsForSource<RemoteAsset>(source);
+    try {
+      await _service.archive(ids);
+      return ActionResult(count: ids.length, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to archive assets', error, stack);
+      return ActionResult(
+        count: ids.length,
+        success: false,
+        error: error.toString(),
+      );
+    }
+  }
+
+  Future<ActionResult> unArchive(ActionSource source) async {
+    final ids = _getIdsForSource<RemoteAsset>(source);
+    try {
+      await _service.unArchive(ids);
+      return ActionResult(count: ids.length, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to unarchive assets', error, stack);
+      return ActionResult(
+        count: ids.length,
+        success: false,
+        error: error.toString(),
+      );
+    }
+  }
+
+  Future<ActionResult> moveToLockFolder(ActionSource source) async {
+    final ids = _getIdsForSource<RemoteAsset>(source);
+    try {
+      await _service.moveToLockFolder(ids);
+      return ActionResult(count: ids.length, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to move assets to lock folder', error, stack);
+      return ActionResult(
+        count: ids.length,
+        success: false,
+        error: error.toString(),
+      );
+    }
+  }
+
+  Future<ActionResult> removeFromLockFolder(ActionSource source) async {
+    final ids = _getIdsForSource<RemoteAsset>(source);
+    try {
+      await _service.removeFromLockFolder(ids);
+      return ActionResult(count: ids.length, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to remove assets from lock folder', error, stack);
+      return ActionResult(
+        count: ids.length,
+        success: false,
+        error: error.toString(),
+      );
+    }
+  }
+
+  Future<ActionResult?> editLocation(
+    ActionSource source,
+    BuildContext context,
+  ) async {
+    final ids = _getIdsForSource<RemoteAsset>(source);
+    try {
+      final isEdited = await _service.editLocation(ids, context);
+      if (!isEdited) {
+        return null;
+      }
+
+      return ActionResult(count: ids.length, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to edit location for assets', error, stack);
+      return ActionResult(
+        count: ids.length,
+        success: false,
+        error: error.toString(),
+      );
+    }
+  }
+}

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

@@ -1,7 +1,9 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/services/remote_album.service.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_album.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/remote_album.provider.dart';
 
 final localAlbumRepository = Provider<DriftLocalAlbumRepository>(
   (ref) => DriftLocalAlbumRepository(ref.watch(driftProvider)),
@@ -10,3 +12,14 @@ final localAlbumRepository = Provider<DriftLocalAlbumRepository>(
 final remoteAlbumRepository = Provider<DriftRemoteAlbumRepository>(
   (ref) => DriftRemoteAlbumRepository(ref.watch(driftProvider)),
 );
+
+final remoteAlbumServiceProvider = Provider<RemoteAlbumService>(
+  (ref) => RemoteAlbumService(ref.watch(remoteAlbumRepository)),
+  dependencies: [remoteAlbumRepository],
+);
+
+final remoteAlbumProvider =
+    NotifierProvider<RemoteAlbumNotifier, RemoteAlbumState>(
+  RemoteAlbumNotifier.new,
+  dependencies: [remoteAlbumServiceProvider],
+);

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

@@ -1,7 +1,12 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/remote_asset.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 
 final localAssetRepository = Provider<DriftLocalAssetRepository>(
   (ref) => DriftLocalAssetRepository(ref.watch(driftProvider)),
 );
+
+final remoteAssetRepository = Provider<DriftRemoteAssetRepository>(
+  (ref) => DriftRemoteAssetRepository(ref.watch(driftProvider)),
+);

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

@@ -8,3 +8,7 @@ part 'exif.provider.g.dart';
 @Riverpod(keepAlive: true)
 IsarExifRepository exifRepository(Ref ref) =>
     IsarExifRepository(ref.watch(isarProvider));
+
+final remoteExifRepository = Provider<DriftRemoteExifRepository>(
+  (ref) => DriftRemoteExifRepository(ref.watch(driftProvider)),
+);

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

@@ -0,0 +1,121 @@
+import 'package:collection/collection.dart';
+import 'package:immich_mobile/domain/models/album/album.model.dart';
+import 'package:immich_mobile/domain/services/remote_album.service.dart';
+import 'package:immich_mobile/models/albums/album_search.model.dart';
+import 'package:immich_mobile/utils/remote_album.utils.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+
+import 'album.provider.dart';
+
+class RemoteAlbumState {
+  final List<Album> albums;
+  final List<Album> filteredAlbums;
+  final bool isLoading;
+  final String? error;
+
+  const RemoteAlbumState({
+    required this.albums,
+    List<Album>? filteredAlbums,
+    this.isLoading = false,
+    this.error,
+  }) : filteredAlbums = filteredAlbums ?? albums;
+
+  RemoteAlbumState copyWith({
+    List<Album>? albums,
+    List<Album>? filteredAlbums,
+    bool? isLoading,
+    String? error,
+  }) {
+    return RemoteAlbumState(
+      albums: albums ?? this.albums,
+      filteredAlbums: filteredAlbums ?? this.filteredAlbums,
+      isLoading: isLoading ?? this.isLoading,
+      error: error ?? this.error,
+    );
+  }
+
+  @override
+  String toString() =>
+      'RemoteAlbumState(albums: ${albums.length}, filteredAlbums: ${filteredAlbums.length}, isLoading: $isLoading, error: $error)';
+
+  @override
+  bool operator ==(covariant RemoteAlbumState other) {
+    if (identical(this, other)) return true;
+    final listEquals = const DeepCollectionEquality().equals;
+
+    return listEquals(other.albums, albums) &&
+        listEquals(other.filteredAlbums, filteredAlbums) &&
+        other.isLoading == isLoading &&
+        other.error == error;
+  }
+
+  @override
+  int get hashCode =>
+      albums.hashCode ^
+      filteredAlbums.hashCode ^
+      isLoading.hashCode ^
+      error.hashCode;
+}
+
+class RemoteAlbumNotifier extends Notifier<RemoteAlbumState> {
+  late final RemoteAlbumService _remoteAlbumService;
+
+  @override
+  RemoteAlbumState build() {
+    _remoteAlbumService = ref.read(remoteAlbumServiceProvider);
+    return const RemoteAlbumState(albums: [], filteredAlbums: []);
+  }
+
+  Future<List<Album>> getAll() async {
+    state = state.copyWith(isLoading: true, error: null);
+
+    try {
+      final albums = await _remoteAlbumService.getAll();
+      state = state.copyWith(
+        albums: albums,
+        filteredAlbums: albums,
+        isLoading: false,
+      );
+      return albums;
+    } catch (e) {
+      state = state.copyWith(isLoading: false, error: e.toString());
+      rethrow;
+    }
+  }
+
+  Future<void> refresh() async {
+    await getAll();
+  }
+
+  void searchAlbums(
+    String query,
+    String? userId, [
+    QuickFilterMode filterMode = QuickFilterMode.all,
+  ]) {
+    final filtered = _remoteAlbumService.searchAlbums(
+      state.albums,
+      query,
+      userId,
+      filterMode,
+    );
+
+    state = state.copyWith(
+      filteredAlbums: filtered,
+    );
+  }
+
+  void clearSearch() {
+    state = state.copyWith(
+      filteredAlbums: state.albums,
+    );
+  }
+
+  void sortFilteredAlbums(
+    RemoteAlbumSortMode sortMode, {
+    bool isReverse = false,
+  }) {
+    final sortedAlbums = _remoteAlbumService
+        .sortAlbums(state.filteredAlbums, sortMode, isReverse: isReverse);
+    state = state.copyWith(filteredAlbums: sortedAlbums);
+  }
+}

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

@@ -15,9 +15,17 @@ final timelineArgsProvider = Provider.autoDispose<TimelineArgs>(
       throw UnimplementedError('Will be overridden through a ProviderScope.'),
 );
 
-final timelineServiceProvider = Provider.autoDispose<TimelineService>(
-  (ref) =>
-      throw UnimplementedError('Will be overridden through a ProviderScope.'),
+final timelineServiceProvider = Provider<TimelineService>(
+  (ref) {
+    final timelineUsers = ref.watch(timelineUsersProvider).valueOrNull ?? [];
+    final timelineService =
+        ref.watch(timelineFactoryProvider).main(timelineUsers);
+    ref.onDispose(timelineService.dispose);
+    return timelineService;
+  },
+  // Empty dependencies to inform the framework that this provider
+  // might be used in a ProviderScope
+  dependencies: [],
 );
 
 final timelineFactoryProvider = Provider<TimelineFactory>(

mobile/lib/providers/timeline/multiselect.provider.dart

@@ -1,6 +1,5 @@
 import 'package:collection/collection.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/services/timeline.service.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
@@ -14,9 +13,7 @@ final multiSelectProvider =
 class MultiSelectState {
   final Set<BaseAsset> selectedAssets;
 
-  const MultiSelectState({
-    required this.selectedAssets,
-  });
+  const MultiSelectState({required this.selectedAssets});
 
   bool get isEnabled => selectedAssets.isNotEmpty;
   bool get hasRemote => selectedAssets.any(
@@ -28,9 +25,7 @@ class MultiSelectState {
         (asset) => asset.storage == AssetState.local,
       );
 
-  MultiSelectState copyWith({
-    Set<BaseAsset>? selectedAssets,
-  }) {
+  MultiSelectState copyWith({Set<BaseAsset>? selectedAssets}) {
     return MultiSelectState(
       selectedAssets: selectedAssets ?? this.selectedAssets,
     );
@@ -52,15 +47,11 @@ class MultiSelectState {
 }
 
 class MultiSelectNotifier extends Notifier<MultiSelectState> {
-  late final TimelineService _timelineService;
+  TimelineService get _timelineService => ref.read(timelineServiceProvider);
 
   @override
   MultiSelectState build() {
-    _timelineService = ref.read(timelineServiceProvider);
-
-    return const MultiSelectState(
-      selectedAssets: {},
-    );
+    return const MultiSelectState(selectedAssets: {});
   }
 
   void selectAsset(BaseAsset asset) {
@@ -91,10 +82,8 @@ class MultiSelectNotifier extends Notifier<MultiSelectState> {
     }
   }
 
-  void clearSelection() {
-    state = state.copyWith(
-      selectedAssets: {},
-    );
+  void reset() {
+    state = const MultiSelectState(selectedAssets: {});
   }
 
   /// Bucket bulk operations
@@ -154,5 +143,5 @@ final bucketSelectionProvider = Provider.family<bool, List<BaseAsset>>(
     // Check if all assets in the bucket are selected
     return bucketAssets.every((asset) => selectedAssets.contains(asset));
   },
-  dependencies: [multiSelectProvider],
+  dependencies: [multiSelectProvider, timelineServiceProvider],
 );