refactor(web): sidebar

cli/package.json

@@ -20,7 +20,7 @@
     "@types/lodash-es": "^4.17.12",
     "@types/micromatch": "^4.0.9",
     "@types/mock-fs": "^4.13.1",
-    "@types/node": "^24.10.8",
+    "@types/node": "^24.10.4",
     "@vitest/coverage-v8": "^3.0.0",
     "byte-size": "^9.0.0",
     "cli-progress": "^3.12.0",

docs/docs/features/mobile-app.mdx

@@ -68,56 +68,6 @@ Now make sure that the local album is selected in the backup screen (steps 1-2 a
   title="Upload button after photos selection"
 />
 
-## Free Up Space
-
-The **Free Up Space** tool allows you to remove local media files from your device that have already been successfully backed up to your Immich server (and are not in the Immich trash). This helps reclaim storage on your mobile device without losing your memories.
-
-### How it works
-
-1.  **Configuration:**
-    - **Cutoff Date:** You can select a cutoff date. The tool will only look for photos and videos **on or before** this date.
-    - **Filter Options:** You can choose to remove **All** assets, or restrict removal to **Photos only** or **Videos only**.
-    - **Keep Favorites:** By default, local assets marked as favorites are preserved on your device, even if they match the cutoff date.
-2.  **Scan & Review:** Before any files are removed, you are presented with a review screen to verify which items will be deleted.
-3.  **Deletion:** Confirmed items are moved to your device's native Trash/Recycle Bin. They will be permanently removed by the OS based on your system settings (usually after 30 days).
-
-:::info Android Permissions
-For the smoothest experience on Android, you should grant Immich special delete privileges. Without this, you may be prompted to confirm deletion for every single image.
-
-Go to **Immich Settings > Advanced** and enable **"Media Management Access"**.
-:::
-
-### iCloud Photos (iOS Users)
-
-If you use **iCloud Photos** alongside Immich, it is vital to understand how deletion affects your data. iCloud utilizes a two-way sync; this means deleting a photo from your iPhone to free up space will **also delete it from iCloud**.
-
-:::warning iCloud & Backups
-If you rely on iCloud as a secondary backup (part of a 3-2-1 backup strategy), using the Free Up Space feature in Immich will remove the file from both your phone and iCloud.
-
-Once deleted, the photo will exist **only** on your Immich server (and your phone's "Recently Deleted" folder for 30 days).
-
-When you use iCloud Photos and delete a photo or video on one device, it's also deleted on all other devices where you're signed in with the same Apple Account.
-
-More information on the [Apple Support](https://support.apple.com/en-us/108922#iCloud_photo_library) website
-
-**Shared Albums**
-Assets that are part of an **iCloud Shared Album** are automatically excluded from the cleanup scan to ensure they remain viewable to others in the shared album.
-:::
-
-### External App Dependencies (WhatsApp, etc.)
-
-:::danger WhatsApp & Local Files
-Android applications like **WhatsApp** rely on local files to display media in chat history.
-
-If Immich backs up your WhatsApp folder and you run **Free Up Space**, the local copies of these images will be deleted. Consequently, **media in your WhatsApp chats will appear blurry or missing.** You will only be able to view these photos inside the Immich app; they will no longer be visible within the WhatsApp interface.
-
-**Recommendation:** If keeping chat history intact is important, please ensure you review the deletion list carefully or consider excluding WhatsApp folders from the backup if you intend to use this feature frequently.
-:::
-
-:::info reclaim storage
-You must empty the system/gallery trash manually to reclaim storage.
-:::
-
 ## Album Sync
 
 You can sync or mirror an album from your phone to the Immich server on your account. For example, if you select Recents, Camera and Videos album for backup, the corresponding album with the same name will be created on the server. Once the assets from those albums are uploaded, they will be put into the target albums automatically.

e2e/package.json

@@ -27,7 +27,7 @@
     "@playwright/test": "^1.44.1",
     "@socket.io/component-emitter": "^3.1.2",
     "@types/luxon": "^3.4.2",
-    "@types/node": "^24.10.8",
+    "@types/node": "^24.10.4",
     "@types/pg": "^8.15.1",
     "@types/pngjs": "^6.0.4",
     "@types/supertest": "^6.0.2",

e2e/playwright.config.ts

@@ -8,7 +8,7 @@ dotenv.config({ path: resolve(import.meta.dirname, '.env') });
 export const playwrightHost = process.env.PLAYWRIGHT_HOST ?? '127.0.0.1';
 export const playwrightDbHost = process.env.PLAYWRIGHT_DB_HOST ?? '127.0.0.1';
 export const playwriteBaseUrl = process.env.PLAYWRIGHT_BASE_URL ?? `http://${playwrightHost}:2285`;
-export const playwriteSlowMo = Number.parseInt(process.env.PLAYWRIGHT_SLOW_MO ?? '0');
+export const playwriteSlowMo = parseInt(process.env.PLAYWRIGHT_SLOW_MO ?? '0');
 export const playwrightDisableWebserver = process.env.PLAYWRIGHT_DISABLE_WEBSERVER;
 
 process.env.PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS = '1';
@@ -39,13 +39,13 @@ const config: PlaywrightTestConfig = {
       testMatch: /.*\.e2e-spec\.ts/,
       workers: 1,
     },
-    // {
-    //   name: 'parallel tests',
-    //   use: { ...devices['Desktop Chrome'] },
-    //   testMatch: /.*\.parallel-e2e-spec\.ts/,
-    //   fullyParallel: true,
-    //   workers: process.env.CI ? 3 : Math.max(1, Math.round(cpus().length * 0.75) - 1),
-    // },
+    {
+      name: 'parallel tests',
+      use: { ...devices['Desktop Chrome'] },
+      testMatch: /.*\.parallel-e2e-spec\.ts/,
+      fullyParallel: true,
+      workers: process.env.CI ? 3 : Math.max(1, Math.round(cpus().length * 0.75) - 1),
+    },
 
     // {
     //   name: 'firefox',

e2e/src/api/specs/database-backups.e2e-spec.ts

@@ -1,350 +0,0 @@
-import { LoginResponseDto, ManualJobName } from '@immich/sdk';
-import { errorDto } from 'src/responses';
-import { app, utils } from 'src/utils';
-import request from 'supertest';
-import { afterAll, beforeAll, describe, expect, it } from 'vitest';
-
-describe('/admin/database-backups', () => {
-  let cookie: string | undefined;
-  let admin: LoginResponseDto;
-
-  beforeAll(async () => {
-    await utils.resetDatabase();
-    admin = await utils.adminSetup();
-    await utils.resetBackups(admin.accessToken);
-  });
-
-  describe('GET /', async () => {
-    it('should succeed and be empty', async () => {
-      const { status, body } = await request(app)
-        .get('/admin/database-backups')
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(status).toBe(200);
-      expect(body).toEqual({
-        backups: [],
-      });
-    });
-
-    it('should contain a created backup', async () => {
-      await utils.createJob(admin.accessToken, {
-        name: ManualJobName.BackupDatabase,
-      });
-
-      await utils.waitForQueueFinish(admin.accessToken, 'backupDatabase');
-
-      await expect
-        .poll(
-          async () => {
-            const { status, body } = await request(app)
-              .get('/admin/database-backups')
-              .set('Authorization', `Bearer ${admin.accessToken}`);
-
-            expect(status).toBe(200);
-            return body;
-          },
-          {
-            interval: 500,
-            timeout: 10_000,
-          },
-        )
-        .toEqual(
-          expect.objectContaining({
-            backups: [
-              expect.objectContaining({
-                filename: expect.stringMatching(/immich-db-backup-\d{8}T\d{6}-v.*-pg.*\.sql\.gz$/),
-                filesize: expect.any(Number),
-              }),
-            ],
-          }),
-        );
-    });
-  });
-
-  describe('DELETE /', async () => {
-    it('should delete backup', async () => {
-      const filename = await utils.createBackup(admin.accessToken);
-
-      const { status } = await request(app)
-        .delete(`/admin/database-backups`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ backups: [filename] });
-
-      expect(status).toBe(200);
-
-      const { status: listStatus, body } = await request(app)
-        .get('/admin/database-backups')
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(listStatus).toBe(200);
-      expect(body).toEqual(
-        expect.objectContaining({
-          backups: [],
-        }),
-      );
-    });
-  });
-
-  // => action: restore database flow
-
-  describe.sequential('POST /start-restore', () => {
-    afterAll(async () => {
-      await request(app).post('/admin/maintenance').set('cookie', cookie!).send({ action: 'end' });
-      await utils.poll(
-        () => request(app).get('/server/config'),
-        ({ status, body }) => status === 200 && !body.maintenanceMode,
-      );
-
-      admin = await utils.adminSetup();
-    });
-
-    it.sequential('should not work when the server is configured', async () => {
-      const { status, body } = await request(app).post('/admin/database-backups/start-restore').send();
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest('The server already has an admin'));
-    });
-
-    it.sequential('should enter maintenance mode in "database restore mode"', async () => {
-      await utils.resetDatabase(); // reset database before running this test
-
-      const { status, headers } = await request(app).post('/admin/database-backups/start-restore').send();
-
-      expect(status).toBe(201);
-
-      cookie = headers['set-cookie'][0].split(';')[0];
-
-      await expect
-        .poll(
-          async () => {
-            const { status, body } = await request(app).get('/server/config');
-            expect(status).toBe(200);
-            return body.maintenanceMode;
-          },
-          {
-            interval: 500,
-            timeout: 10_000,
-          },
-        )
-        .toBeTruthy();
-
-      const { status: status2, body } = await request(app).get('/admin/maintenance/status').send({ token: 'token' });
-      expect(status2).toBe(200);
-      expect(body).toEqual({
-        active: true,
-        action: 'select_database_restore',
-      });
-    });
-  });
-
-  // => action: restore database
-
-  describe.sequential('POST /backups/restore', () => {
-    beforeAll(async () => {
-      await utils.disconnectDatabase();
-    });
-
-    afterAll(async () => {
-      await utils.connectDatabase();
-    });
-
-    it.sequential('should restore a backup', { timeout: 60_000 }, async () => {
-      let filename = await utils.createBackup(admin.accessToken);
-
-      // work-around until test is running on released version
-      await utils.move(
-        `/data/backups/${filename}`,
-        '/data/backups/immich-db-backup-20260114T184016-v2.5.0-pg14.19.sql.gz',
-      );
-      filename = 'immich-db-backup-20260114T184016-v2.5.0-pg14.19.sql.gz';
-
-      const { status } = await request(app)
-        .post('/admin/maintenance')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({
-          action: 'restore_database',
-          restoreBackupFilename: filename,
-        });
-
-      expect(status).toBe(201);
-
-      await expect
-        .poll(
-          async () => {
-            const { status, body } = await request(app).get('/server/config');
-            expect(status).toBe(200);
-            return body.maintenanceMode;
-          },
-          {
-            interval: 500,
-            timeout: 10_000,
-          },
-        )
-        .toBeTruthy();
-
-      const { status: status2, body } = await request(app).get('/admin/maintenance/status').send({ token: 'token' });
-      expect(status2).toBe(200);
-      expect(body).toEqual(
-        expect.objectContaining({
-          active: true,
-          action: 'restore_database',
-        }),
-      );
-
-      await expect
-        .poll(
-          async () => {
-            const { status, body } = await request(app).get('/server/config');
-            expect(status).toBe(200);
-            return body.maintenanceMode;
-          },
-          {
-            interval: 500,
-            timeout: 60_000,
-          },
-        )
-        .toBeFalsy();
-    });
-
-    it.sequential('fail to restore a corrupted backup', { timeout: 60_000 }, async () => {
-      await utils.prepareTestBackup('corrupted');
-
-      const { status, headers } = await request(app)
-        .post('/admin/maintenance')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({
-          action: 'restore_database',
-          restoreBackupFilename: 'development-corrupted.sql.gz',
-        });
-
-      expect(status).toBe(201);
-      cookie = headers['set-cookie'][0].split(';')[0];
-
-      await expect
-        .poll(
-          async () => {
-            const { status, body } = await request(app).get('/server/config');
-            expect(status).toBe(200);
-            return body.maintenanceMode;
-          },
-          {
-            interval: 500,
-            timeout: 10_000,
-          },
-        )
-        .toBeTruthy();
-
-      await expect
-        .poll(
-          async () => {
-            const { status, body } = await request(app).get('/admin/maintenance/status').send({ token: 'token' });
-            expect(status).toBe(200);
-            return body;
-          },
-          {
-            interval: 500,
-            timeout: 10_000,
-          },
-        )
-        .toEqual(
-          expect.objectContaining({
-            active: true,
-            action: 'restore_database',
-            error: 'Something went wrong, see logs!',
-          }),
-        );
-
-      const { status: status2, body: body2 } = await request(app)
-        .get('/admin/maintenance/status')
-        .set('cookie', cookie!)
-        .send({ token: 'token' });
-      expect(status2).toBe(200);
-      expect(body2).toEqual(
-        expect.objectContaining({
-          active: true,
-          action: 'restore_database',
-          error: expect.stringContaining('IM CORRUPTED'),
-        }),
-      );
-
-      await request(app).post('/admin/maintenance').set('cookie', cookie!).send({
-        action: 'end',
-      });
-
-      await utils.poll(
-        () => request(app).get('/server/config'),
-        ({ status, body }) => status === 200 && !body.maintenanceMode,
-      );
-    });
-
-    it.sequential('rollback to restore point if backup is missing admin', { timeout: 60_000 }, async () => {
-      await utils.prepareTestBackup('empty');
-
-      const { status, headers } = await request(app)
-        .post('/admin/maintenance')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({
-          action: 'restore_database',
-          restoreBackupFilename: 'development-empty.sql.gz',
-        });
-
-      expect(status).toBe(201);
-      cookie = headers['set-cookie'][0].split(';')[0];
-
-      await expect
-        .poll(
-          async () => {
-            const { status, body } = await request(app).get('/server/config');
-            expect(status).toBe(200);
-            return body.maintenanceMode;
-          },
-          {
-            interval: 500,
-            timeout: 10_000,
-          },
-        )
-        .toBeTruthy();
-
-      await expect
-        .poll(
-          async () => {
-            const { status, body } = await request(app).get('/admin/maintenance/status').send({ token: 'token' });
-            expect(status).toBe(200);
-            return body;
-          },
-          {
-            interval: 500,
-            timeout: 30_000,
-          },
-        )
-        .toEqual(
-          expect.objectContaining({
-            active: true,
-            action: 'restore_database',
-            error: 'Something went wrong, see logs!',
-          }),
-        );
-
-      const { status: status2, body: body2 } = await request(app)
-        .get('/admin/maintenance/status')
-        .set('cookie', cookie!)
-        .send({ token: 'token' });
-      expect(status2).toBe(200);
-      expect(body2).toEqual(
-        expect.objectContaining({
-          active: true,
-          action: 'restore_database',
-          error: expect.stringContaining('Server health check failed, no admin exists.'),
-        }),
-      );
-
-      await request(app).post('/admin/maintenance').set('cookie', cookie!).send({
-        action: 'end',
-      });
-
-      await utils.poll(
-        () => request(app).get('/server/config'),
-        ({ status, body }) => status === 200 && !body.maintenanceMode,
-      );
-    });
-  });
-});

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

@@ -14,7 +14,6 @@ describe('/admin/maintenance', () => {
     await utils.resetDatabase();
     admin = await utils.adminSetup();
     nonAdmin = await utils.userSetup(admin.accessToken, createUserDto.user1);
-    await utils.resetBackups(admin.accessToken);
   });
 
   // => outside of maintenance mode
@@ -27,17 +26,6 @@ describe('/admin/maintenance', () => {
     });
   });
 
-  describe('GET /status', async () => {
-    it('to always indicate we are not in maintenance mode', async () => {
-      const { status, body } = await request(app).get('/admin/maintenance/status').send({ token: 'token' });
-      expect(status).toBe(200);
-      expect(body).toEqual({
-        active: false,
-        action: 'end',
-      });
-    });
-  });
-
   describe('POST /login', async () => {
     it('should not work out of maintenance mode', async () => {
       const { status, body } = await request(app).post('/admin/maintenance/login').send({ token: 'token' });
@@ -51,7 +39,6 @@ describe('/admin/maintenance', () => {
   describe.sequential('POST /', () => {
     it('should require authentication', async () => {
       const { status, body } = await request(app).post('/admin/maintenance').send({
-        active: false,
         action: 'end',
       });
       expect(status).toBe(401);
@@ -82,7 +69,6 @@ describe('/admin/maintenance', () => {
         .send({
           action: 'start',
         });
-
       expect(status).toBe(201);
 
       cookie = headers['set-cookie'][0].split(';')[0];
@@ -93,13 +79,12 @@ describe('/admin/maintenance', () => {
       await expect
         .poll(
           async () => {
-            const { status, body } = await request(app).get('/server/config');
-            expect(status).toBe(200);
+            const { body } = await request(app).get('/server/config');
             return body.maintenanceMode;
           },
           {
-            interval: 500,
-            timeout: 10_000,
+            interval: 5e2,
+            timeout: 1e4,
           },
         )
         .toBeTruthy();
@@ -117,17 +102,6 @@ describe('/admin/maintenance', () => {
       });
     });
 
-    describe('GET /status', async () => {
-      it('to indicate we are in maintenance mode', async () => {
-        const { status, body } = await request(app).get('/admin/maintenance/status').send({ token: 'token' });
-        expect(status).toBe(200);
-        expect(body).toEqual({
-          active: true,
-          action: 'start',
-        });
-      });
-    });
-
     describe('POST /login', async () => {
       it('should fail without cookie or token in body', async () => {
         const { status, body } = await request(app).post('/admin/maintenance/login').send({});
@@ -184,13 +158,12 @@ describe('/admin/maintenance', () => {
       await expect
         .poll(
           async () => {
-            const { status, body } = await request(app).get('/server/config');
-            expect(status).toBe(200);
+            const { body } = await request(app).get('/server/config');
             return body.maintenanceMode;
           },
           {
-            interval: 500,
-            timeout: 10_000,
+            interval: 5e2,
+            timeout: 1e4,
           },
         )
         .toBeFalsy();

e2e/src/generators/timeline/rest-response.ts

@@ -348,7 +348,6 @@ export function toAssetResponseDto(asset: MockTimelineAsset, owner?: UserRespons
     checksum: asset.checksum,
     width: exifInfo.exifImageWidth ?? 1,
     height: exifInfo.exifImageHeight ?? 1,
-    isEdited: false,
   };
 }
 

e2e/src/utils.ts

@@ -6,9 +6,7 @@ import {
   CheckExistingAssetsDto,
   CreateAlbumDto,
   CreateLibraryDto,
-  JobCreateDto,
   MaintenanceAction,
-  ManualJobName,
   MetadataSearchDto,
   Permission,
   PersonCreateDto,
@@ -23,7 +21,6 @@ import {
   checkExistingAssets,
   createAlbum,
   createApiKey,
-  createJob,
   createLibrary,
   createPartner,
   createPerson,
@@ -31,12 +28,10 @@ import {
   createStack,
   createUserAdmin,
   deleteAssets,
-  deleteDatabaseBackup,
   getAssetInfo,
   getConfig,
   getConfigDefaults,
   getQueuesLegacy,
-  listDatabaseBackups,
   login,
   runQueueCommandLegacy,
   scanLibrary,
@@ -57,15 +52,11 @@ import {
 import { BrowserContext } from '@playwright/test';
 import { exec, spawn } from 'node:child_process';
 import { createHash } from 'node:crypto';
-import { createWriteStream, existsSync, mkdirSync, renameSync, rmSync, writeFileSync } from 'node:fs';
-import { mkdtemp } from 'node:fs/promises';
+import { existsSync, mkdirSync, renameSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
-import { Readable } from 'node:stream';
-import { pipeline } from 'node:stream/promises';
+import { dirname, resolve } from 'node:path';
 import { setTimeout as setAsyncTimeout } from 'node:timers/promises';
 import { promisify } from 'node:util';
-import { createGzip } from 'node:zlib';
 import pg from 'pg';
 import { io, type Socket } from 'socket.io-client';
 import { loginDto, signupDto } from 'src/fixtures';
@@ -93,9 +84,8 @@ export const asBearerAuth = (accessToken: string) => ({ Authorization: `Bearer $
 export const asKeyAuth = (key: string) => ({ 'x-api-key': key });
 export const immichCli = (args: string[]) =>
   executeCommand('pnpm', ['exec', 'immich', '-d', `/${tempDir}/immich/`, ...args], { cwd: '../cli' }).promise;
-export const dockerExec = (args: string[]) =>
-  executeCommand('docker', ['exec', '-i', 'immich-e2e-server', '/bin/bash', '-c', args.join(' ')]);
-export const immichAdmin = (args: string[]) => dockerExec([`immich-admin ${args.join(' ')}`]);
+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];
 
@@ -159,26 +149,12 @@ const onEvent = ({ event, id }: { event: EventType; id: string }) => {
 };
 
 export const utils = {
-  connectDatabase: async () => {
-    if (!client) {
-      client = new pg.Client(dbUrl);
-      client.on('end', () => (client = null));
-      client.on('error', () => (client = null));
-      await client.connect();
-    }
-
-    return client;
-  },
-
-  disconnectDatabase: async () => {
-    if (client) {
-      await client.end();
-    }
-  },
-
   resetDatabase: async (tables?: string[]) => {
     try {
-      client = await utils.connectDatabase();
+      if (!client) {
+        client = new pg.Client(dbUrl);
+        await client.connect();
+      }
 
       tables = tables || [
         // TODO e2e test for deleting a stack, since it is quite complex
@@ -505,9 +481,6 @@ export const utils = {
   tagAssets: (accessToken: string, tagId: string, assetIds: string[]) =>
     tagAssets({ id: tagId, bulkIdsDto: { ids: assetIds } }, { headers: asBearerAuth(accessToken) }),
 
-  createJob: async (accessToken: string, jobCreateDto: JobCreateDto) =>
-    createJob({ jobCreateDto }, { headers: asBearerAuth(accessToken) }),
-
   queueCommand: async (accessToken: string, name: QueueName, queueCommandDto: QueueCommandDto) =>
     runQueueCommandLegacy({ name, queueCommandDto }, { headers: asBearerAuth(accessToken) }),
 
@@ -586,45 +559,6 @@ export const utils = {
     mkdirSync(`${testAssetDir}/temp`, { recursive: true });
   },
 
-  async move(source: string, dest: string) {
-    return executeCommand('docker', ['exec', 'immich-e2e-server', 'mv', source, dest]).promise;
-  },
-
-  createBackup: async (accessToken: string) => {
-    await utils.createJob(accessToken, {
-      name: ManualJobName.BackupDatabase,
-    });
-
-    return utils.poll(
-      () => request(app).get('/admin/database-backups').set('Authorization', `Bearer ${accessToken}`),
-      ({ status, body }) => status === 200 && body.backups.length === 1,
-      ({ body }) => body.backups[0].filename,
-    );
-  },
-
-  resetBackups: async (accessToken: string) => {
-    const { backups } = await listDatabaseBackups({ headers: asBearerAuth(accessToken) });
-
-    const backupFiles = backups.map((b) => b.filename);
-    await deleteDatabaseBackup(
-      { databaseBackupDeleteDto: { backups: backupFiles } },
-      { headers: asBearerAuth(accessToken) },
-    );
-  },
-
-  prepareTestBackup: async (generate: 'empty' | 'corrupted') => {
-    const dir = await mkdtemp(join(tmpdir(), 'test-'));
-    const fn = join(dir, 'file');
-
-    const sql = Readable.from(generate === 'corrupted' ? 'IM CORRUPTED;' : 'SELECT 1;');
-    const gzip = createGzip();
-    const writeStream = createWriteStream(fn);
-    await pipeline(sql, gzip, writeStream);
-
-    await executeCommand('docker', ['cp', fn, `immich-e2e-server:/data/backups/development-${generate}.sql.gz`])
-      .promise;
-  },
-
   resetAdminConfig: async (accessToken: string) => {
     const defaultConfig = await getConfigDefaults({ headers: asBearerAuth(accessToken) });
     await updateConfig({ systemConfigDto: defaultConfig }, { headers: asBearerAuth(accessToken) });
@@ -667,25 +601,6 @@ export const utils = {
     await utils.waitForQueueFinish(accessToken, 'sidecar');
     await utils.waitForQueueFinish(accessToken, 'metadataExtraction');
   },
-
-  async poll<T>(cb: () => Promise<T>, validate: (value: T) => boolean, map?: (value: T) => any) {
-    let timeout = 0;
-    while (true) {
-      try {
-        const data = await cb();
-        if (validate(data)) {
-          return map ? map(data) : data;
-        }
-        timeout++;
-        if (timeout >= 10) {
-          throw 'Could not clean up test.';
-        }
-        await new Promise((resolve) => setTimeout(resolve, 5e2));
-      } catch {
-        // no-op
-      }
-    }
-  },
 };
 
 utils.initSdk();

e2e/src/web/specs/asset-viewer/asset-viewer.parallel-e2e-spec.ts

@@ -12,7 +12,7 @@ import {
 import { setupBaseMockApiRoutes } from 'src/mock-network/base-network';
 import { setupTimelineMockApiRoutes, TimelineTestContext } from 'src/mock-network/timeline-network';
 import { utils } from 'src/utils';
-import { assetViewerUtils } from 'src/web/specs/timeline/utils';
+import { assetViewerUtils, cancelAllPollers } from 'src/web/specs/timeline/utils';
 
 test.describe.configure({ mode: 'parallel' });
 test.describe('asset-viewer', () => {
@@ -49,6 +49,7 @@ test.describe('asset-viewer', () => {
   });
 
   test.afterEach(() => {
+    cancelAllPollers();
     testContext.slowBucket = false;
     changes.albumAdditions = [];
     changes.assetDeletions = [];

e2e/src/web/specs/database-backups.e2e-spec.ts

@@ -1,105 +0,0 @@
-import { LoginResponseDto } from '@immich/sdk';
-import { expect, test } from '@playwright/test';
-import { utils } from 'src/utils';
-
-test.describe.configure({ mode: 'serial' });
-
-test.describe('Database Backups', () => {
-  let admin: LoginResponseDto;
-
-  test.beforeAll(async () => {
-    utils.initSdk();
-    await utils.resetDatabase();
-    admin = await utils.adminSetup();
-  });
-
-  test('restore a backup from settings', async ({ context, page }) => {
-    test.setTimeout(60_000);
-
-    await utils.resetBackups(admin.accessToken);
-    const filename = await utils.createBackup(admin.accessToken);
-    await utils.setAuthCookies(context, admin.accessToken);
-
-    // work-around until test is running on released version
-    await utils.move(
-      `/data/backups/${filename}`,
-      '/data/backups/immich-db-backup-20260114T184016-v2.5.0-pg14.19.sql.gz',
-    );
-
-    await page.goto('/admin/maintenance?isOpen=backups');
-    await page.getByRole('button', { name: 'Restore', exact: true }).click();
-    await page.getByRole('dialog').getByRole('button', { name: 'Restore' }).click();
-
-    await page.waitForURL('/maintenance?**');
-    await page.waitForURL('/admin/maintenance**', { timeout: 60_000 });
-  });
-
-  test('handle backup restore failure', async ({ context, page }) => {
-    test.setTimeout(60_000);
-
-    await utils.resetBackups(admin.accessToken);
-    await utils.prepareTestBackup('corrupted');
-    await utils.setAuthCookies(context, admin.accessToken);
-
-    await page.goto('/admin/maintenance?isOpen=backups');
-    await page.getByRole('button', { name: 'Restore', exact: true }).click();
-    await page.getByRole('dialog').getByRole('button', { name: 'Restore' }).click();
-
-    await page.waitForURL('/maintenance?**');
-    await expect(page.getByText('IM CORRUPTED')).toBeVisible({ timeout: 60_000 });
-    await page.getByRole('button', { name: 'End maintenance mode' }).click();
-    await page.waitForURL('/admin/maintenance**');
-  });
-
-  test('rollback to restore point if backup is missing admin', async ({ context, page }) => {
-    test.setTimeout(60_000);
-
-    await utils.resetBackups(admin.accessToken);
-    await utils.prepareTestBackup('empty');
-    await utils.setAuthCookies(context, admin.accessToken);
-
-    await page.goto('/admin/maintenance?isOpen=backups');
-    await page.getByRole('button', { name: 'Restore', exact: true }).click();
-    await page.getByRole('dialog').getByRole('button', { name: 'Restore' }).click();
-
-    await page.waitForURL('/maintenance?**');
-    await expect(page.getByText('Server health check failed, no admin exists.')).toBeVisible({ timeout: 60_000 });
-    await page.getByRole('button', { name: 'End maintenance mode' }).click();
-    await page.waitForURL('/admin/maintenance**');
-  });
-
-  test('restore a backup from onboarding', async ({ context, page }) => {
-    test.setTimeout(60_000);
-
-    await utils.resetBackups(admin.accessToken);
-    const filename = await utils.createBackup(admin.accessToken);
-    await utils.setAuthCookies(context, admin.accessToken);
-
-    // work-around until test is running on released version
-    await utils.move(
-      `/data/backups/${filename}`,
-      '/data/backups/immich-db-backup-20260114T184016-v2.5.0-pg14.19.sql.gz',
-    );
-
-    await utils.resetDatabase();
-
-    await page.goto('/');
-    await page.getByRole('button', { name: 'Restore from backup' }).click();
-
-    try {
-      await page.waitForURL('/maintenance**');
-    } catch {
-      // when chained with the rest of the tests
-      // this navigation may fail..? not sure why...
-      await page.goto('/maintenance');
-      await page.waitForURL('/maintenance**');
-    }
-
-    await page.getByRole('button', { name: 'Next' }).click();
-    await page.getByRole('button', { name: 'Restore', exact: true }).click();
-    await page.getByRole('dialog').getByRole('button', { name: 'Restore' }).click();
-
-    await page.waitForURL('/maintenance?**');
-    await page.waitForURL('/photos', { timeout: 60_000 });
-  });
-});

e2e/src/web/specs/maintenance.e2e-spec.ts

@@ -16,12 +16,12 @@ test.describe('Maintenance', () => {
   test('enter and exit maintenance mode', async ({ context, page }) => {
     await utils.setAuthCookies(context, admin.accessToken);
 
-    await page.goto('/admin/maintenance');
-    await page.getByRole('button', { name: 'Switch to maintenance mode' }).click();
+    await page.goto('/admin/system-settings?isOpen=maintenance');
+    await page.getByRole('button', { name: 'Start maintenance mode' }).click();
 
     await expect(page.getByText('Temporarily Unavailable')).toBeVisible({ timeout: 10_000 });
     await page.getByRole('button', { name: 'End maintenance mode' }).click();
-    await page.waitForURL('**/admin/maintenance*', { timeout: 10_000 });
+    await page.waitForURL('**/admin/system-settings*', { timeout: 10_000 });
   });
 
   test('maintenance shows no options to users until they authenticate', async ({ page }) => {

e2e/src/web/specs/timeline/timeline.parallel-e2e-spec.ts

@@ -18,6 +18,7 @@ import { pageRoutePromise, setupTimelineMockApiRoutes, TimelineTestContext } fro
 import { utils } from 'src/utils';
 import {
   assetViewerUtils,
+  cancelAllPollers,
   padYearMonth,
   pageUtils,
   poll,
@@ -63,6 +64,7 @@ test.describe('Timeline', () => {
   });
 
   test.afterEach(() => {
+    cancelAllPollers();
     testContext.slowBucket = false;
     changes.albumAdditions = [];
     changes.assetDeletions = [];

e2e/src/web/specs/timeline/utils.ts

@@ -23,6 +23,13 @@ export async function throttlePage(context: BrowserContext, page: Page) {
   await session.send('Emulation.setCPUThrottlingRate', { rate: 10 });
 }
 
+let activePollsAbortController = new AbortController();
+
+export const cancelAllPollers = () => {
+  activePollsAbortController.abort();
+  activePollsAbortController = new AbortController();
+};
+
 export const poll = async <T>(
   page: Page,
   query: () => Promise<T>,
@@ -30,14 +37,21 @@ export const poll = async <T>(
 ) => {
   let result;
   const timeout = Date.now() + 10_000;
+  const signal = activePollsAbortController.signal;
 
   const terminate = callback || ((result: Awaited<T> | undefined) => !!result);
   while (!terminate(result) && Date.now() < timeout) {
+    if (signal.aborted) {
+      return;
+    }
     try {
       result = await query();
     } catch {
       // ignore
     }
+    if (signal.aborted) {
+      return;
+    }
     if (page.isClosed()) {
       return;
     }

i18n/en.json

@@ -188,21 +188,10 @@
     "machine_learning_smart_search_enabled": "Enable smart search",
     "machine_learning_smart_search_enabled_description": "If disabled, images will not be encoded for smart search.",
     "machine_learning_url_description": "The URL of the machine learning server. If more than one URL is provided, each server will be attempted one-at-a-time until one responds successfully, in order from first to last. Servers that don't respond will be temporarily ignored until they come back online.",
-    "maintenance_delete_backup": "Delete Backup",
-    "maintenance_delete_backup_description": "This file will be irrevocably deleted.",
-    "maintenance_delete_error": "Failed to delete backup.",
-    "maintenance_restore_backup": "Restore Backup",
-    "maintenance_restore_backup_description": "Immich will be wiped and restored from the chosen backup. A backup will be created before continuing.",
-    "maintenance_restore_backup_different_version": "This backup was created with a different version of Immich!",
-    "maintenance_restore_backup_unknown_version": "Couldn't determine backup version.",
-    "maintenance_restore_database_backup": "Restore database backup",
-    "maintenance_restore_database_backup_description": "Rollback to an earlier database state using a backup file",
     "maintenance_settings": "Maintenance",
     "maintenance_settings_description": "Put Immich into maintenance mode.",
-    "maintenance_start": "Switch to maintenance mode",
+    "maintenance_start": "Start maintenance mode",
     "maintenance_start_error": "Failed to start maintenance mode.",
-    "maintenance_upload_backup": "Upload database backup file",
-    "maintenance_upload_backup_error": "Could not upload backup, is it an .sql/.sql.gz file?",
     "manage_concurrency": "Manage Concurrency",
     "manage_concurrency_description": "Navigate to the jobs page to manage job concurrency",
     "manage_log_settings": "Manage log settings",
@@ -614,7 +603,7 @@
   "backup_album_selection_page_select_albums": "Select albums",
   "backup_album_selection_page_selection_info": "Selection Info",
   "backup_album_selection_page_total_assets": "Total unique assets",
-  "backup_albums_sync": "Backup Albums Synchronization",
+  "backup_albums_sync": "Backup albums synchronization",
   "backup_all": "All",
   "backup_background_service_backup_failed_message": "Failed to backup assets. Retrying…",
   "backup_background_service_complete_notification": "Asset backup complete",
@@ -1009,11 +998,9 @@
   "error_getting_places": "Error getting places",
   "error_loading_image": "Error loading image",
   "error_loading_partners": "Error loading partners: {error}",
-  "error_retrieving_asset_information": "Error retrieving asset information",
   "error_saving_image": "Error: {error}",
   "error_tag_face_bounding_box": "Error tagging face - cannot get bounding box coordinates",
   "error_title": "Error - Something went wrong",
-  "error_while_navigating": "Error while navigating to asset",
   "errors": {
     "cannot_navigate_next_asset": "Cannot navigate to the next asset",
     "cannot_navigate_previous_asset": "Cannot navigate to previous asset",
@@ -1417,28 +1404,10 @@
   "loop_videos_description": "Enable to automatically loop a video in the detail viewer.",
   "main_branch_warning": "You're using a development version; we strongly recommend using a release version!",
   "main_menu": "Main menu",
-  "maintenance_action_restore": "Restoring Database",
   "maintenance_description": "Immich has been put into <link>maintenance mode</link>.",
   "maintenance_end": "End maintenance mode",
   "maintenance_end_error": "Failed to end maintenance mode.",
   "maintenance_logged_in_as": "Currently logged in as {user}",
-  "maintenance_restore_from_backup": "Restore From Backup",
-  "maintenance_restore_library": "Restore Your Library",
-  "maintenance_restore_library_confirm": "If this looks correct, continue to restoring a backup!",
-  "maintenance_restore_library_description": "Restoring Database",
-  "maintenance_restore_library_folder_has_files": "{folder} has {count} folder(s)",
-  "maintenance_restore_library_folder_no_files": "{folder} is missing files!",
-  "maintenance_restore_library_folder_pass": "readable and writable",
-  "maintenance_restore_library_folder_read_fail": "not readable",
-  "maintenance_restore_library_folder_write_fail": "not writable",
-  "maintenance_restore_library_hint_missing_files": "You may be missing important files",
-  "maintenance_restore_library_hint_regenerate_later": "You can regenerate these later in settings",
-  "maintenance_restore_library_hint_storage_template_missing_files": "Using storage template? You may be missing files",
-  "maintenance_restore_library_loading": "Loading integrity checks and heuristics…",
-  "maintenance_task_backup": "Creating a backup of the existing database…",
-  "maintenance_task_migrations": "Running database migrations…",
-  "maintenance_task_restore": "Restoring the chosen backup…",
-  "maintenance_task_rollback": "Restore failed, rolling back to restore point…",
   "maintenance_title": "Temporarily Unavailable",
   "make": "Make",
   "manage_geolocation": "Manage location",
@@ -1557,7 +1526,7 @@
   "no_albums_with_name_yet": "It looks like you do not have any albums with this name yet.",
   "no_albums_yet": "It looks like you do not have any albums yet.",
   "no_archived_assets_message": "Archive photos and videos to hide them from your Photos view",
-  "no_assets_message": "Click to upload your first photo",
+  "no_assets_message": "CLICK TO UPLOAD YOUR FIRST PHOTO",
   "no_assets_to_show": "No assets to show",
   "no_cast_devices_found": "No cast devices found",
   "no_checksum_local": "No checksum available - cannot fetch local assets",
@@ -2191,7 +2160,6 @@
   "theme_setting_theme_subtitle": "Choose the app's theme setting",
   "theme_setting_three_stage_loading_subtitle": "Three-stage loading might increase the loading performance but causes significantly higher network load",
   "theme_setting_three_stage_loading_title": "Enable three-stage loading",
-  "then": "Then",
   "they_will_be_merged_together": "They will be merged together",
   "third_party_resources": "Third-Party Resources",
   "time": "Time",
@@ -2247,7 +2215,6 @@
   "unhide_person": "Unhide person",
   "unknown": "Unknown",
   "unknown_country": "Unknown Country",
-  "unknown_date": "Unknown date",
   "unknown_year": "Unknown Year",
   "unlimited": "Unlimited",
   "unlink_motion_video": "Unlink motion video",
@@ -2290,7 +2257,7 @@
   "url": "URL",
   "usage": "Usage",
   "use_biometric": "Use biometric",
-  "use_current_connection": "Use current connection",
+  "use_current_connection": "use current connection",
   "use_custom_date_range": "Use custom date range instead",
   "user": "User",
   "user_has_been_deleted": "This user has been deleted.",

mise.toml

@@ -3,7 +3,7 @@ experimental_monorepo_root = true
 [tools]
 node = "24.13.0"
 flutter = "3.35.7"
-pnpm = "10.28.0"
+pnpm = "10.27.0"
 terragrunt = "0.93.10"
 opentofu = "1.10.7"
 java = "25.0.1"

mobile/android/app/src/main/AndroidManifest.xml

@@ -117,9 +117,6 @@
         <data
           android:host="my.immich.app"
           android:pathPrefix="/memories/" />
-        <data
-          android:host="my.immich.app"
-          android:path="/memory" />
         <data
           android:host="my.immich.app"
           android:pathPrefix="/photos/" />

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

@@ -92,7 +92,7 @@ class _MobileLayout extends StatelessWidget {
                 ],
         )
         .toList();
-    return ListView(padding: const EdgeInsets.only(top: 10.0, bottom: 60), children: [...settings]);
+    return ListView(padding: const EdgeInsets.only(top: 10.0, bottom: 16), children: [...settings]);
   }
 }
 
@@ -142,7 +142,7 @@ class SettingsSubPage extends StatelessWidget {
     context.locale;
     return Scaffold(
       appBar: AppBar(centerTitle: false, title: Text(section.title).tr()),
-      body: Padding(padding: const EdgeInsets.only(bottom: 60.0), child: section.widget),
+      body: section.widget,
     );
   }
 }

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

@@ -10,7 +10,6 @@ import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/backup.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
 import 'package:immich_mobile/providers/gallery_permission.provider.dart';
-import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:logging/logging.dart';
@@ -50,7 +49,6 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
     final accessToken = Store.tryGet(StoreKey.accessToken);
 
     if (accessToken != null && serverUrl != null && endpoint != null) {
-      final infoProvider = ref.read(serverInfoProvider.notifier);
       final wsProvider = ref.read(websocketProvider.notifier);
       final backgroundManager = ref.read(backgroundSyncProvider);
       final backupProvider = ref.read(driftBackupProvider.notifier);
@@ -60,7 +58,6 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
           (_) async {
             try {
               wsProvider.connect();
-              unawaited(infoProvider.getServerInfo());
 
               if (Store.isBetaTimelineEnabled) {
                 bool syncSuccess = false;

mobile/lib/pages/settings/sync_status.page.dart

@@ -18,7 +18,6 @@ class SyncStatusPage extends StatelessWidget {
           splashRadius: 24,
           icon: const Icon(Icons.arrow_back_ios_rounded),
         ),
-        centerTitle: false,
       ),
       body: const SyncStatusAndActions(),
     );

mobile/lib/presentation/widgets/album/album_selector.widget.dart

@@ -311,17 +311,18 @@ class _SortButtonState extends ConsumerState<_SortButton> {
                   : const Icon(Icons.abc, color: Colors.transparent),
               onPressed: () => onMenuTapped(sortMode),
               style: ButtonStyle(
-                padding: WidgetStateProperty.all(const EdgeInsets.fromLTRB(12, 12, 24, 12)),
+                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(12))),
+                  const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(24))),
                 ),
               ),
               child: Text(
                 sortMode.label.t(context: context),
-                style: context.textTheme.labelLarge?.copyWith(
+                style: context.textTheme.titleSmall?.copyWith(
+                  fontWeight: FontWeight.w600,
                   color: albumSortOption == sortMode
                       ? context.colorScheme.onPrimary
                       : context.colorScheme.onSurface.withAlpha(185),
@@ -349,7 +350,10 @@ class _SortButtonState extends ConsumerState<_SortButton> {
               ),
               Text(
                 albumSortOption.label.t(context: context),
-                style: context.textTheme.labelLarge?.copyWith(color: context.colorScheme.onSurface.withAlpha(225)),
+                style: context.textTheme.bodyLarge?.copyWith(
+                  fontWeight: FontWeight.w500,
+                  color: context.colorScheme.onSurface.withAlpha(225),
+                ),
               ),
               isSorting
                   ? SizedBox(

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

@@ -10,7 +10,6 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/exif.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/duration_extensions.dart';
-import 'package:immich_mobile/extensions/theme_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/album/album_tile.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
@@ -165,8 +164,11 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
           children: [
             if (albums.isNotEmpty)
               SheetTile(
-                title: 'appears_in'.t(context: context),
-                titleStyle: context.textTheme.labelLarge?.copyWith(color: context.colorScheme.onSurfaceSecondary),
+                title: 'appears_in'.t(context: context).toUpperCase(),
+                titleStyle: context.textTheme.labelMedium?.copyWith(
+                  color: context.textTheme.labelMedium?.color?.withAlpha(200),
+                  fontWeight: FontWeight.w600,
+                ),
               ),
             Padding(
               padding: const EdgeInsets.only(left: 24),
@@ -222,7 +224,9 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
                 color: context.textTheme.labelLarge?.color,
               ),
               subtitle: _getFileInfo(asset, exifInfo),
-              subtitleStyle: context.textTheme.bodyMedium?.copyWith(color: context.colorScheme.onSurfaceSecondary),
+              subtitleStyle: context.textTheme.labelMedium?.copyWith(
+                color: context.textTheme.labelMedium?.color?.withAlpha(200),
+              ),
             );
           },
         );
@@ -237,7 +241,9 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
             color: context.textTheme.labelLarge?.color,
           ),
           subtitle: _getFileInfo(asset, exifInfo),
-          subtitleStyle: context.textTheme.bodyMedium?.copyWith(color: context.colorScheme.onSurfaceSecondary),
+          subtitleStyle: context.textTheme.labelMedium?.copyWith(
+            color: context.textTheme.labelMedium?.color?.withAlpha(200),
+          ),
         );
       }
     }
@@ -256,8 +262,11 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
         const SheetLocationDetails(),
         // Details header
         SheetTile(
-          title: 'details'.t(context: context),
-          titleStyle: context.textTheme.labelLarge?.copyWith(color: context.colorScheme.onSurfaceSecondary),
+          title: 'details'.t(context: context).toUpperCase(),
+          titleStyle: context.textTheme.labelMedium?.copyWith(
+            color: context.textTheme.labelMedium?.color?.withAlpha(200),
+            fontWeight: FontWeight.w600,
+          ),
         ),
         // File info
         buildFileInfoTile(),
@@ -269,7 +278,9 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
             titleStyle: context.textTheme.labelLarge,
             leading: Icon(Icons.camera_alt_outlined, size: 24, color: context.textTheme.labelLarge?.color),
             subtitle: _getCameraInfoSubtitle(exifInfo),
-            subtitleStyle: context.textTheme.bodyMedium?.copyWith(color: context.colorScheme.onSurfaceSecondary),
+            subtitleStyle: context.textTheme.labelMedium?.copyWith(
+              color: context.textTheme.labelMedium?.color?.withAlpha(200),
+            ),
           ),
         ],
         // Lens info
@@ -280,13 +291,15 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
             titleStyle: context.textTheme.labelLarge,
             leading: Icon(Icons.camera_outlined, size: 24, color: context.textTheme.labelLarge?.color),
             subtitle: _getLensInfoSubtitle(exifInfo),
-            subtitleStyle: context.textTheme.bodyMedium?.copyWith(color: context.colorScheme.onSurfaceSecondary),
+            subtitleStyle: context.textTheme.labelMedium?.copyWith(
+              color: context.textTheme.labelMedium?.color?.withAlpha(200),
+            ),
           ),
         ],
         // Appears in (Albums)
         Padding(padding: const EdgeInsets.only(top: 16.0), child: _buildAppearsInList(ref, context)),
         // padding at the bottom to avoid cut-off
-        const SizedBox(height: 60),
+        const SizedBox(height: 30),
       ],
     );
   }

mobile/lib/presentation/widgets/asset_viewer/bottom_sheet/sheet_location_details.widget.dart

@@ -4,7 +4,6 @@ import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/exif.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/theme_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/sheet_tile.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
@@ -78,8 +77,11 @@ class _SheetLocationDetailsState extends ConsumerState<SheetLocationDetails> {
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           SheetTile(
-            title: 'location'.t(context: context),
-            titleStyle: context.textTheme.labelLarge?.copyWith(color: context.colorScheme.onSurfaceSecondary),
+            title: 'location'.t(context: context).toUpperCase(),
+            titleStyle: context.textTheme.labelMedium?.copyWith(
+              color: context.textTheme.labelMedium?.color?.withAlpha(200),
+              fontWeight: FontWeight.w600,
+            ),
             trailing: hasCoordinates ? const Icon(Icons.edit_location_alt, size: 20) : null,
             onTap: editLocation,
           ),
@@ -103,7 +105,9 @@ class _SheetLocationDetailsState extends ConsumerState<SheetLocationDetails> {
                     ),
                   Text(
                     coordinates,
-                    style: context.textTheme.bodySmall?.copyWith(color: context.colorScheme.onSurfaceSecondary),
+                    style: context.textTheme.labelMedium?.copyWith(
+                      color: context.textTheme.labelMedium?.color?.withAlpha(200),
+                    ),
                   ),
                 ],
               ),

mobile/lib/presentation/widgets/asset_viewer/bottom_sheet/sheet_people_details.widget.dart

@@ -4,7 +4,6 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/person.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/theme_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/people/person_edit_name_modal.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
@@ -54,8 +53,11 @@ class _SheetPeopleDetailsState extends ConsumerState<SheetPeopleDetails> {
               Padding(
                 padding: const EdgeInsets.only(left: 16, top: 16, bottom: 16),
                 child: Text(
-                  "people".t(context: context),
-                  style: context.textTheme.labelLarge?.copyWith(color: context.colorScheme.onSurfaceSecondary),
+                  "people".t(context: context).toUpperCase(),
+                  style: context.textTheme.labelMedium?.copyWith(
+                    color: context.textTheme.labelMedium?.color?.withAlpha(200),
+                    fontWeight: FontWeight.w600,
+                  ),
                 ),
               ),
               SizedBox(

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

@@ -6,7 +6,6 @@ import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/duration_extensions.dart';
 import 'package:immich_mobile/extensions/theme_extensions.dart';
-import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/constants.dart';
 import 'package:immich_mobile/providers/backup/asset_upload_progress.provider.dart';
@@ -48,7 +47,6 @@ class _ThumbnailTileState extends ConsumerState<ThumbnailTile> {
   Widget build(BuildContext context) {
     final asset = widget.asset;
     final heroIndex = widget.heroOffset ?? TabsRouterScope.of(context)?.controller.activeIndex ?? 0;
-    final isCurrentAsset = ref.watch(assetViewerProvider.select((current) => current.currentAsset == asset));
 
     final assetContainerColor = context.isDarkTheme
         ? context.primaryColor.darken(amount: 0.4)
@@ -61,10 +59,6 @@ class _ThumbnailTileState extends ConsumerState<ThumbnailTile> {
     final bool storageIndicator =
         ref.watch(settingsProvider.select((s) => s.get(Setting.showStorageIndicator))) && widget.showStorageIndicator;
 
-    if (!isCurrentAsset) {
-      _hideIndicators = false;
-    }
-
     if (isSelected) {
       _showSelectionContainer = true;
     }
@@ -102,11 +96,7 @@ class _ThumbnailTileState extends ConsumerState<ThumbnailTile> {
               children: [
                 Positioned.fill(
                   child: Hero(
-                    // This key resets the hero animation when the asset is changed in the asset viewer.
-                    // It doesn't seem like the best solution, and only works to reset the hero, not prime the hero of the new active asset for animation,
-                    // but other solutions have failed thus far.
-                    key: ValueKey(isCurrentAsset),
-                    tag: '${asset?.heroTag}_$heroIndex',
+                    tag: '${asset?.heroTag ?? ''}_$heroIndex',
                     child: Thumbnail.fromAsset(asset: asset, size: widget.size),
                     // Placeholderbuilder used to hide indicators on first hero animation, since flightShuttleBuilder isn't called until both source and destination hero exist in widget tree.
                     placeholderBuilder: (context, heroSize, child) {

mobile/lib/providers/app_life_cycle.provider.dart

@@ -160,7 +160,7 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
             _resumeBackup();
           }),
           _resumeBackup(),
-          _safeRun(backgroundManager.syncCloudIds(), "syncCloudIds"),
+          backgroundManager.syncCloudIds(),
         ]);
       } else {
         await _safeRun(backgroundManager.hashAssets(), "hashAssets");

mobile/lib/services/background_upload.service.dart

@@ -285,12 +285,7 @@ class BackgroundUploadService {
       return null;
     }
 
-    String fileName = await _assetMediaRepository.getOriginalFilename(asset.id) ?? asset.name;
-    final hasExtension = p.extension(fileName).isNotEmpty;
-    if (!hasExtension) {
-      fileName = p.setExtension(fileName, p.extension(asset.name));
-    }
-
+    final fileName = await _assetMediaRepository.getOriginalFilename(asset.id) ?? asset.name;
     final originalFileName = entity.isLivePhoto ? p.setExtension(fileName, p.extension(file.path)) : fileName;
 
     String metadata = UploadTaskMetadata(
@@ -312,10 +307,10 @@ class BackgroundUploadService {
       priority: priority,
       isFavorite: asset.isFavorite,
       requiresWiFi: requiresWiFi,
-      cloudId: entity.isLivePhoto ? null : asset.cloudId,
-      adjustmentTime: entity.isLivePhoto ? null : asset.adjustmentTime?.toIso8601String(),
-      latitude: entity.isLivePhoto ? null : asset.latitude?.toString(),
-      longitude: entity.isLivePhoto ? null : asset.longitude?.toString(),
+      cloudId: asset.cloudId,
+      adjustmentTime: asset.adjustmentTime?.toIso8601String(),
+      latitude: asset.latitude?.toString(),
+      longitude: asset.longitude?.toString(),
     );
   }
 

mobile/lib/services/foreground_upload.service.dart

@@ -16,7 +16,6 @@ import 'package:immich_mobile/platform/connectivity_api.g.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/storage.provider.dart';
-import 'package:immich_mobile/repositories/asset_media.repository.dart';
 import 'package:immich_mobile/repositories/upload.repository.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
@@ -41,7 +40,6 @@ final foregroundUploadServiceProvider = Provider((ref) {
     ref.watch(backupRepositoryProvider),
     ref.watch(connectivityApiProvider),
     ref.watch(appSettingsServiceProvider),
-    ref.watch(assetMediaRepositoryProvider),
   );
 });
 
@@ -57,7 +55,6 @@ class ForegroundUploadService {
     this._backupRepository,
     this._connectivityApi,
     this._appSettingsService,
-    this._assetMediaRepository,
   );
 
   final UploadRepository _uploadRepository;
@@ -65,7 +62,6 @@ class ForegroundUploadService {
   final DriftBackupRepository _backupRepository;
   final ConnectivityApi _connectivityApi;
   final AppSettingsService _appSettingsService;
-  final AssetMediaRepository _assetMediaRepository;
   final Logger _logger = Logger('ForegroundUploadService');
 
   bool shouldAbortUpload = false;
@@ -315,17 +311,7 @@ class ForegroundUploadService {
         return;
       }
 
-      String fileName = await _assetMediaRepository.getOriginalFilename(asset.id) ?? asset.name;
-
-      /// Handle special file name from DJI or Fusion app
-      /// If the file name has no extension, likely due to special renaming template by specific apps
-      /// we append the original extension from the asset name
-      final hasExtension = p.extension(fileName).isNotEmpty;
-      if (!hasExtension) {
-        fileName = p.setExtension(fileName, p.extension(asset.name));
-      }
-
-      final originalFileName = entity.isLivePhoto ? p.setExtension(fileName, p.extension(file.path)) : fileName;
+      final originalFileName = entity.isLivePhoto ? p.setExtension(asset.name, p.extension(file.path)) : asset.name;
       final deviceId = Store.get(StoreKey.deviceId);
 
       final headers = ApiService.getRequestHeaders();
@@ -336,6 +322,19 @@ class ForegroundUploadService {
         'fileModifiedAt': asset.updatedAt.toUtc().toIso8601String(),
         'isFavorite': asset.isFavorite.toString(),
         'duration': asset.duration.toString(),
+        if (CurrentPlatform.isIOS && asset.cloudId != null)
+          'metadata': jsonEncode([
+            RemoteAssetMetadataItem(
+              key: RemoteAssetMetadataKey.mobileApp,
+              value: RemoteAssetMobileAppMetadata(
+                cloudId: asset.cloudId,
+                createdAt: asset.createdAt.toIso8601String(),
+                adjustmentTime: asset.adjustmentTime?.toIso8601String(),
+                latitude: asset.latitude?.toString(),
+                longitude: asset.longitude?.toString(),
+              ),
+            ),
+          ]),
       };
 
       // Upload live photo video first if available
@@ -364,22 +363,6 @@ class ForegroundUploadService {
         fields['livePhotoVideoId'] = livePhotoVideoId;
       }
 
-      // Add cloudId metadata only to the still image, not the motion video, becasue when the sync id happens, the motion video can get associated with the wrong still image.
-      if (CurrentPlatform.isIOS && asset.cloudId != null) {
-        fields['metadata'] = jsonEncode([
-          RemoteAssetMetadataItem(
-            key: RemoteAssetMetadataKey.mobileApp,
-            value: RemoteAssetMobileAppMetadata(
-              cloudId: asset.cloudId,
-              createdAt: asset.createdAt.toIso8601String(),
-              adjustmentTime: asset.adjustmentTime?.toIso8601String(),
-              latitude: asset.latitude?.toString(),
-              longitude: asset.longitude?.toString(),
-            ),
-          ),
-        ]);
-      }
-
       final result = await _uploadRepository.uploadFile(
         file: file,
         originalFileName: originalFileName,

mobile/lib/theme/theme_data.dart

@@ -61,12 +61,7 @@ ThemeData getThemeData({required ColorScheme colorScheme, required Locale locale
       ),
     ),
     chipTheme: const ChipThemeData(side: BorderSide.none),
-    sliderTheme: const SliderThemeData(
-      thumbShape: RoundSliderThumbShape(enabledThumbRadius: 7),
-      trackHeight: 2.0,
-      // ignore: deprecated_member_use
-      year2023: false,
-    ),
+    sliderTheme: const SliderThemeData(thumbShape: RoundSliderThumbShape(enabledThumbRadius: 7), trackHeight: 2.0),
     bottomNavigationBarTheme: const BottomNavigationBarThemeData(type: BottomNavigationBarType.fixed),
     popupMenuTheme: const PopupMenuThemeData(
       shape: RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(10))),

mobile/lib/widgets/settings/asset_list_settings/asset_list_group_settings.dart

@@ -1,14 +1,14 @@
 import 'dart:async';
 
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';
 import 'package:immich_mobile/widgets/asset_grid/asset_grid_data_structure.dart';
-import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
 import 'package:immich_mobile/widgets/settings/settings_radio_list_tile.dart';
+import 'package:immich_mobile/widgets/settings/settings_sub_title.dart';
 
 class GroupSettings extends HookConsumerWidget {
   const GroupSettings({super.key});
@@ -33,24 +33,12 @@ class GroupSettings extends HookConsumerWidget {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        SettingGroupTitle(
-          title: "asset_list_group_by_sub_title".t(context: context),
-          icon: Icons.group_work_outlined,
-        ),
+        SettingsSubTitle(title: "asset_list_group_by_sub_title".tr()),
         SettingsRadioListTile(
           groups: [
-            SettingsRadioGroup(
-              title: 'asset_list_layout_settings_group_by_month_day'.t(context: context),
-              value: GroupAssetsBy.day,
-            ),
-            SettingsRadioGroup(
-              title: 'month'.t(context: context),
-              value: GroupAssetsBy.month,
-            ),
-            SettingsRadioGroup(
-              title: 'asset_list_layout_settings_group_automatically'.t(context: context),
-              value: GroupAssetsBy.auto,
-            ),
+            SettingsRadioGroup(title: 'asset_list_layout_settings_group_by_month_day'.tr(), value: GroupAssetsBy.day),
+            SettingsRadioGroup(title: 'month'.tr(), value: GroupAssetsBy.month),
+            SettingsRadioGroup(title: 'asset_list_layout_settings_group_automatically'.tr(), value: GroupAssetsBy.auto),
           ],
           groupBy: groupBy,
           onRadioChanged: changeGroupValue,

mobile/lib/widgets/settings/asset_list_settings/asset_list_layout_settings.dart

@@ -1,12 +1,11 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';
-import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
 import 'package:immich_mobile/widgets/settings/settings_slider_list_tile.dart';
+import 'package:immich_mobile/widgets/settings/settings_sub_title.dart';
 import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';
 
 class LayoutSettings extends HookConsumerWidget {
@@ -20,13 +19,10 @@ class LayoutSettings extends HookConsumerWidget {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        SettingGroupTitle(
-          title: "asset_list_layout_sub_title".t(context: context),
-          icon: Icons.view_module_outlined,
-        ),
+        SettingsSubTitle(title: "asset_list_layout_sub_title".tr()),
         SettingsSwitchListTile(
           valueNotifier: useDynamicLayout,
-          title: "asset_list_layout_settings_dynamic_layout_title".t(context: context),
+          title: "asset_list_layout_settings_dynamic_layout_title".tr(),
           onChanged: (_) => ref.invalidate(appSettingsServiceProvider),
         ),
         SettingsSliderListTile(

mobile/lib/widgets/settings/asset_viewer_settings/image_viewer_quality_setting.dart

@@ -1,9 +1,10 @@
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
-import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
+import 'package:immich_mobile/widgets/settings/settings_sub_title.dart';
 import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';
 import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';
 
@@ -18,21 +19,21 @@ class ImageViewerQualitySetting extends HookConsumerWidget {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        SettingGroupTitle(
-          title: "photos".t(context: context),
-          icon: Icons.image_outlined,
-          subtitle: "setting_image_viewer_help".t(context: context),
+        SettingsSubTitle(title: "setting_image_viewer_title".tr()),
+        ListTile(
+          contentPadding: const EdgeInsets.symmetric(horizontal: 20),
+          title: Text('setting_image_viewer_help', style: context.textTheme.bodyMedium).tr(),
         ),
         SettingsSwitchListTile(
           valueNotifier: isPreview,
-          title: "setting_image_viewer_preview_title".t(context: context),
-          subtitle: "setting_image_viewer_preview_subtitle".t(context: context),
+          title: "setting_image_viewer_preview_title".tr(),
+          subtitle: "setting_image_viewer_preview_subtitle".tr(),
           onChanged: (_) => ref.invalidate(appSettingsServiceProvider),
         ),
         SettingsSwitchListTile(
           valueNotifier: isOriginal,
-          title: "setting_image_viewer_original_title".t(context: context),
-          subtitle: "setting_image_viewer_original_subtitle".t(context: context),
+          title: "setting_image_viewer_original_title".tr(),
+          subtitle: "setting_image_viewer_original_subtitle".tr(),
           onChanged: (_) => ref.invalidate(appSettingsServiceProvider),
         ),
       ],

mobile/lib/widgets/settings/asset_viewer_settings/video_viewer_settings.dart

@@ -1,9 +1,9 @@
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
-import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
+import 'package:immich_mobile/widgets/settings/settings_sub_title.dart';
 import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';
 import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';
 
@@ -19,26 +19,23 @@ class VideoViewerSettings extends HookConsumerWidget {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        SettingGroupTitle(
-          title: "videos".t(context: context),
-          icon: Icons.video_camera_back_outlined,
-        ),
+        SettingsSubTitle(title: "videos".tr()),
         SettingsSwitchListTile(
           valueNotifier: useAutoPlayVideo,
-          title: "setting_video_viewer_auto_play_title".t(context: context),
-          subtitle: "setting_video_viewer_auto_play_subtitle".t(context: context),
+          title: "setting_video_viewer_auto_play_title".tr(),
+          subtitle: "setting_video_viewer_auto_play_subtitle".tr(),
           onChanged: (_) => ref.invalidate(appSettingsServiceProvider),
         ),
         SettingsSwitchListTile(
           valueNotifier: useLoopVideo,
-          title: "setting_video_viewer_looping_title".t(context: context),
-          subtitle: "loop_videos_description".t(context: context),
+          title: "setting_video_viewer_looping_title".tr(),
+          subtitle: "loop_videos_description".tr(),
           onChanged: (_) => ref.invalidate(appSettingsServiceProvider),
         ),
         SettingsSwitchListTile(
           valueNotifier: useOriginalVideo,
-          title: "setting_video_viewer_original_video_title".t(context: context),
-          subtitle: "setting_video_viewer_original_video_subtitle".t(context: context),
+          title: "setting_video_viewer_original_video_title".tr(),
+          subtitle: "setting_video_viewer_original_video_subtitle".tr(),
           onChanged: (_) => ref.invalidate(appSettingsServiceProvider),
         ),
       ],

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

@@ -16,8 +16,6 @@ import 'package:immich_mobile/providers/backup/backup_album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
-import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
-import 'package:immich_mobile/widgets/settings/setting_list_tile.dart';
 import 'package:immich_mobile/widgets/settings/settings_sub_page_scaffold.dart';
 
 class DriftBackupSettings extends ConsumerWidget {
@@ -27,25 +25,36 @@ class DriftBackupSettings extends ConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     return SettingsSubPageScaffold(
       settings: [
-        SettingGroupTitle(
-          title: "network_requirements".t(context: context),
-          icon: Icons.cell_tower,
+        Padding(
+          padding: const EdgeInsets.only(left: 16.0),
+          child: Text(
+            "network_requirements".t(context: context).toUpperCase(),
+            style: context.textTheme.labelSmall?.copyWith(color: context.colorScheme.onSurface.withValues(alpha: 0.7)),
+          ),
         ),
         const _UseWifiForUploadVideosButton(),
         const _UseWifiForUploadPhotosButton(),
         if (CurrentPlatform.isAndroid) ...[
           const Divider(),
-          SettingGroupTitle(
-            title: "background_options".t(context: context),
-            icon: Icons.charging_station_rounded,
+          Padding(
+            padding: const EdgeInsets.only(left: 16.0),
+            child: Text(
+              "background_options".t(context: context).toUpperCase(),
+              style: context.textTheme.labelSmall?.copyWith(
+                color: context.colorScheme.onSurface.withValues(alpha: 0.7),
+              ),
+            ),
           ),
           const _BackupOnlyWhenChargingButton(),
           const _BackupDelaySlider(),
         ],
         const Divider(),
-        SettingGroupTitle(
-          title: "backup_albums_sync".t(context: context),
-          icon: Icons.sync,
+        Padding(
+          padding: const EdgeInsets.only(left: 16.0),
+          child: Text(
+            "backup_albums_sync".t(context: context).toUpperCase(),
+            style: context.textTheme.labelSmall?.copyWith(color: context.colorScheme.onSurface.withValues(alpha: 0.7)),
+          ),
         ),
         const _AlbumSyncActionButton(),
       ],
@@ -96,67 +105,81 @@ class _AlbumSyncActionButtonState extends ConsumerState<_AlbumSyncActionButton>
 
   @override
   Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.only(left: 8.0),
-      child: ListView(
-        shrinkWrap: true,
-        children: [
-          StreamBuilder(
-            stream: Store.watch(StoreKey.syncAlbums),
-            initialData: Store.tryGet(StoreKey.syncAlbums) ?? false,
-            builder: (context, snapshot) {
-              final albumSyncEnable = snapshot.data ?? false;
-              return Column(
-                children: [
-                  SettingListTile(
-                    title: "sync_albums".t(context: context),
-                    subtitle: "sync_upload_album_setting_subtitle".t(context: context),
-                    trailing: Switch(
-                      value: albumSyncEnable,
-                      onChanged: (bool newValue) async {
-                        await ref.read(appSettingsServiceProvider).setSetting(AppSettingsEnum.syncAlbums, newValue);
+    return ListView(
+      shrinkWrap: true,
+      children: [
+        StreamBuilder(
+          stream: Store.watch(StoreKey.syncAlbums),
+          initialData: Store.tryGet(StoreKey.syncAlbums) ?? false,
+          builder: (context, snapshot) {
+            final albumSyncEnable = snapshot.data ?? false;
+            return Column(
+              children: [
+                ListTile(
+                  title: Text(
+                    "sync_albums".t(context: context),
+                    style: context.textTheme.titleMedium?.copyWith(color: context.primaryColor),
+                  ),
+                  subtitle: Text(
+                    "sync_upload_album_setting_subtitle".t(context: context),
+                    style: context.textTheme.labelLarge,
+                  ),
+                  trailing: Switch(
+                    value: albumSyncEnable,
+                    onChanged: (bool newValue) async {
+                      await ref.read(appSettingsServiceProvider).setSetting(AppSettingsEnum.syncAlbums, newValue);
 
-                        if (newValue == true) {
-                          await _manageLinkedAlbums();
-                        }
-                      },
-                    ),
+                      if (newValue == true) {
+                        await _manageLinkedAlbums();
+                      }
+                    },
                   ),
-                  AnimatedSize(
-                    duration: const Duration(milliseconds: 300),
-                    curve: Curves.easeInOut,
-                    child: AnimatedOpacity(
-                      duration: const Duration(milliseconds: 200),
-                      opacity: albumSyncEnable ? 1.0 : 0.0,
-                      child: albumSyncEnable
-                          ? SettingListTile(
-                              onTap: _manualSyncAlbums,
-                              contentPadding: const EdgeInsets.only(left: 32, right: 16),
-                              title: "organize_into_albums".t(context: context),
-                              subtitle: "organize_into_albums_description".t(context: context),
-                              trailing: isAlbumSyncInProgress
-                                  ? const SizedBox(
-                                      width: 32,
-                                      height: 32,
-                                      child: CircularProgressIndicator.adaptive(strokeWidth: 2),
-                                    )
-                                  : IconButton(
-                                      onPressed: _manualSyncAlbums,
-                                      icon: const Icon(Icons.sync_rounded),
-                                      color: context.colorScheme.onSurface.withValues(alpha: 0.7),
-                                      iconSize: 20,
-                                      constraints: const BoxConstraints(minWidth: 32, minHeight: 32),
-                                    ),
-                            )
-                          : const SizedBox.shrink(),
-                    ),
+                ),
+                AnimatedSize(
+                  duration: const Duration(milliseconds: 300),
+                  curve: Curves.easeInOut,
+                  child: AnimatedOpacity(
+                    duration: const Duration(milliseconds: 200),
+                    opacity: albumSyncEnable ? 1.0 : 0.0,
+                    child: albumSyncEnable
+                        ? ListTile(
+                            onTap: _manualSyncAlbums,
+                            contentPadding: const EdgeInsets.only(left: 32, right: 16),
+                            title: Text(
+                              "organize_into_albums".t(context: context),
+                              style: context.textTheme.titleSmall?.copyWith(
+                                color: context.colorScheme.onSurface,
+                                fontWeight: FontWeight.normal,
+                              ),
+                            ),
+                            subtitle: Text(
+                              "organize_into_albums_description".t(context: context),
+                              style: context.textTheme.bodyMedium?.copyWith(
+                                color: context.colorScheme.onSurface.withValues(alpha: 0.7),
+                              ),
+                            ),
+                            trailing: isAlbumSyncInProgress
+                                ? const SizedBox(
+                                    width: 32,
+                                    height: 32,
+                                    child: CircularProgressIndicator.adaptive(strokeWidth: 2),
+                                  )
+                                : IconButton(
+                                    onPressed: _manualSyncAlbums,
+                                    icon: const Icon(Icons.sync_rounded),
+                                    color: context.colorScheme.onSurface.withValues(alpha: 0.7),
+                                    iconSize: 20,
+                                    constraints: const BoxConstraints(minWidth: 32, minHeight: 32),
+                                  ),
+                          )
+                        : const SizedBox.shrink(),
                   ),
-                ],
-              );
-            },
-          ),
-        ],
-      ),
+                ),
+              ],
+            );
+          },
+        ),
+      ],
     );
   }
 }
@@ -199,24 +222,24 @@ class _SettingsSwitchTileState extends ConsumerState<_SettingsSwitchTile> {
 
   @override
   Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.only(left: 8.0),
-      child: SettingListTile(
-        title: widget.titleKey.t(context: context),
-        subtitle: widget.subtitleKey.t(context: context),
-        trailing: StreamBuilder(
-          stream: valueStream,
-          initialData: Store.tryGet(widget.appSettingsEnum.storeKey) ?? widget.appSettingsEnum.defaultValue,
-          builder: (context, snapshot) {
-            final value = snapshot.data ?? false;
-            return Switch(
-              value: value,
-              onChanged: (bool newValue) async {
-                await ref.read(appSettingsServiceProvider).setSetting(widget.appSettingsEnum, newValue);
-              },
-            );
-          },
-        ),
+    return ListTile(
+      title: Text(
+        widget.titleKey.t(context: context),
+        style: context.textTheme.titleMedium?.copyWith(color: context.primaryColor),
+      ),
+      subtitle: Text(widget.subtitleKey.t(context: context), style: context.textTheme.labelLarge),
+      trailing: StreamBuilder(
+        stream: valueStream,
+        initialData: Store.tryGet(widget.appSettingsEnum.storeKey) ?? widget.appSettingsEnum.defaultValue,
+        builder: (context, snapshot) {
+          final value = snapshot.data ?? false;
+          return Switch(
+            value: value,
+            onChanged: (bool newValue) async {
+              await ref.read(appSettingsServiceProvider).setSetting(widget.appSettingsEnum, newValue);
+            },
+          );
+        },
       ),
     );
   }
@@ -331,7 +354,7 @@ class _BackupDelaySliderState extends ConsumerState<_BackupDelaySlider> {
             'backup_controller_page_background_delay'.tr(
               namedArgs: {'duration': formatBackupDelaySliderValue(currentValue)},
             ),
-            style: context.textTheme.bodyLarge?.copyWith(fontWeight: FontWeight.w500),
+            style: context.textTheme.titleMedium?.copyWith(color: context.primaryColor),
           ),
         ),
         Slider(

mobile/lib/widgets/settings/beta_sync_settings/entity_count_tile.dart

@@ -34,36 +34,33 @@ class EntityCountTile extends StatelessWidget {
         children: [
           // Icon and Label
           Row(
-            mainAxisAlignment: MainAxisAlignment.center,
+            mainAxisAlignment: MainAxisAlignment.start,
             children: [
-              Icon(icon, color: context.primaryColor, size: 14),
-              const SizedBox(width: 4),
+              Icon(icon, color: context.primaryColor),
+              const SizedBox(width: 8),
               Flexible(
                 child: Text(
                   label,
-                  style: TextStyle(color: context.primaryColor, fontWeight: FontWeight.w500),
+                  style: TextStyle(color: context.primaryColor, fontWeight: FontWeight.bold, fontSize: 16),
                 ),
               ),
             ],
           ),
           // Number
           const Spacer(),
-          Padding(
-            padding: const EdgeInsets.only(top: 8.0),
-            child: RichText(
-              text: TextSpan(
-                style: const TextStyle(fontSize: 18, fontFamily: 'GoogleSansCode'),
-                children: [
-                  TextSpan(
-                    text: zeroPadding(count, maxDigits),
-                    style: TextStyle(color: context.colorScheme.onSurfaceSecondary.withAlpha(75)),
-                  ),
-                  TextSpan(
-                    text: count.toString(),
-                    style: TextStyle(color: context.colorScheme.onSurface),
-                  ),
-                ],
-              ),
+          RichText(
+            text: TextSpan(
+              style: const TextStyle(fontSize: 18, fontFamily: 'GoogleSansCode', fontWeight: FontWeight.w600),
+              children: [
+                TextSpan(
+                  text: zeroPadding(count, maxDigits),
+                  style: TextStyle(color: context.colorScheme.onSurfaceSecondary.withAlpha(75)),
+                ),
+                TextSpan(
+                  text: count.toString(),
+                  style: TextStyle(color: context.primaryColor),
+                ),
+              ],
             ),
           ),
         ],

mobile/lib/widgets/settings/beta_sync_settings/sync_status_and_actions.dart

@@ -16,8 +16,6 @@ import 'package:immich_mobile/providers/infrastructure/trash_sync.provider.dart'
 import 'package:immich_mobile/providers/sync_status.provider.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/widgets/settings/beta_sync_settings/entity_count_tile.dart';
-import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
-import 'package:immich_mobile/widgets/settings/setting_list_tile.dart';
 import 'package:path/path.dart' as path;
 import 'package:path_provider/path_provider.dart';
 import 'package:share_plus/share_plus.dart';
@@ -114,39 +112,48 @@ class SyncStatusAndActions extends HookConsumerWidget {
       padding: const EdgeInsets.only(top: 16, bottom: 96),
       children: [
         const _SyncStatsCounts(),
-        const Divider(height: 10),
-        const SizedBox(height: 16),
-        SettingGroupTitle(title: "jobs".t(context: context)),
-        SettingListTile(
-          title: "sync_local".t(context: context),
-          subtitle: "tap_to_run_job".t(context: context),
+        const Divider(height: 1, indent: 16, endIndent: 16),
+        const SizedBox(height: 24),
+        _SectionHeaderText(text: "jobs".t(context: context)),
+        ListTile(
+          title: Text(
+            "sync_local".t(context: context),
+            style: const TextStyle(fontWeight: FontWeight.w500),
+          ),
+          subtitle: Text("tap_to_run_job".t(context: context)),
           leading: const Icon(Icons.sync),
           trailing: _SyncStatusIcon(status: ref.watch(syncStatusProvider).localSyncStatus),
           onTap: () {
             ref.read(backgroundSyncProvider).syncLocal(full: true);
           },
         ),
-        SettingListTile(
-          title: "sync_remote".t(context: context),
-          subtitle: "tap_to_run_job".t(context: context),
+        ListTile(
+          title: Text(
+            "sync_remote".t(context: context),
+            style: const TextStyle(fontWeight: FontWeight.w500),
+          ),
+          subtitle: Text("tap_to_run_job".t(context: context)),
           leading: const Icon(Icons.cloud_sync),
           trailing: _SyncStatusIcon(status: ref.watch(syncStatusProvider).remoteSyncStatus),
           onTap: () {
             ref.read(backgroundSyncProvider).syncRemote();
           },
         ),
-        SettingListTile(
-          title: "hash_asset".t(context: context),
+        ListTile(
+          title: Text(
+            "hash_asset".t(context: context),
+            style: const TextStyle(fontWeight: FontWeight.w500),
+          ),
           leading: const Icon(Icons.tag),
-          subtitle: "tap_to_run_job".t(context: context),
+          subtitle: Text("tap_to_run_job".t(context: context)),
           trailing: _SyncStatusIcon(status: ref.watch(syncStatusProvider).hashJobStatus),
           onTap: () {
             ref.read(backgroundSyncProvider).hashAssets();
           },
         ),
-        const Divider(height: 1),
-        const SizedBox(height: 16),
-        SettingGroupTitle(title: "actions".t(context: context)),
+        const Divider(height: 1, indent: 16, endIndent: 16),
+        const SizedBox(height: 24),
+        _SectionHeaderText(text: "actions".t(context: context)),
         ListTile(
           title: Text(
             "clear_file_cache".t(context: context),
@@ -195,6 +202,26 @@ class _SyncStatusIcon extends StatelessWidget {
   }
 }
 
+class _SectionHeaderText extends StatelessWidget {
+  final String text;
+
+  const _SectionHeaderText({required this.text});
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.only(left: 16.0),
+      child: Text(
+        text.toUpperCase(),
+        style: context.textTheme.labelLarge?.copyWith(
+          fontWeight: FontWeight.w500,
+          color: context.colorScheme.onSurface.withAlpha(200),
+        ),
+      ),
+    );
+  }
+}
+
 class _SyncStatsCounts extends ConsumerWidget {
   const _SyncStatsCounts();
 
@@ -252,9 +279,9 @@ class _SyncStatsCounts extends ConsumerWidget {
           mainAxisAlignment: MainAxisAlignment.start,
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            SettingGroupTitle(title: "assets".t(context: context)),
+            _SectionHeaderText(text: "assets".t(context: context)),
             Padding(
-              padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
+              padding: const EdgeInsets.fromLTRB(16, 8, 16, 16),
               // 1. Wrap in IntrinsicHeight
               child: IntrinsicHeight(
                 child: Flex(
@@ -282,9 +309,9 @@ class _SyncStatsCounts extends ConsumerWidget {
                 ),
               ),
             ),
-            SettingGroupTitle(title: "albums".t(context: context)),
+            _SectionHeaderText(text: "albums".t(context: context)),
             Padding(
-              padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
+              padding: const EdgeInsets.fromLTRB(16, 8, 16, 16),
               child: IntrinsicHeight(
                 child: Flex(
                   direction: Axis.horizontal,
@@ -310,9 +337,9 @@ class _SyncStatsCounts extends ConsumerWidget {
                 ),
               ),
             ),
-            SettingGroupTitle(title: "other".t(context: context)),
+            _SectionHeaderText(text: "other".t(context: context)),
             Padding(
-              padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
+              padding: const EdgeInsets.fromLTRB(16, 8, 16, 16),
               child: IntrinsicHeight(
                 child: Flex(
                   direction: Axis.horizontal,
@@ -341,7 +368,7 @@ class _SyncStatsCounts extends ConsumerWidget {
             // To be removed once the experimental feature is stable
             if (CurrentPlatform.isAndroid &&
                 appSettingsService.getSetting<bool>(AppSettingsEnum.manageLocalMediaAndroid)) ...[
-              SettingGroupTitle(title: "trash".t(context: context)),
+              _SectionHeaderText(text: "trash".t(context: context)),
               Consumer(
                 builder: (context, ref, _) {
                   final counts = ref.watch(trashedAssetsCountProvider);

mobile/lib/widgets/settings/beta_timeline_list_tile.dart

@@ -9,7 +9,6 @@ import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
-import 'package:immich_mobile/widgets/settings/setting_list_tile.dart';
 
 class BetaTimelineListTile extends ConsumerWidget {
   const BetaTimelineListTile({super.key});
@@ -57,8 +56,8 @@ class BetaTimelineListTile extends ConsumerWidget {
 
     return Padding(
       padding: const EdgeInsets.only(left: 4.0),
-      child: SettingListTile(
-        title: "new_timeline".t(context: context),
+      child: ListTile(
+        title: Text("new_timeline".t(context: context)),
         trailing: Switch.adaptive(
           value: betaTimelineValue,
           onChanged: onSwitchChanged,

mobile/lib/widgets/settings/free_up_space_settings.dart

@@ -142,9 +142,7 @@ class _FreeUpSpaceSettingsState extends ConsumerState<FreeUpSpaceSettings> {
     final state = ref.watch(cleanupProvider);
     final hasDate = state.selectedDate != null;
     final hasAssets = _hasScanned && state.assetsToDelete.isNotEmpty;
-    final subtitleStyle = context.textTheme.bodyMedium!.copyWith(
-      color: context.textTheme.bodyMedium!.color!.withAlpha(215),
-    );
+
     StepStyle styleForState(StepState stepState, {bool isDestructive = false}) {
       switch (stepState) {
         case StepState.complete:
@@ -216,7 +214,10 @@ class _FreeUpSpaceSettingsState extends ConsumerState<FreeUpSpaceSettings> {
                   borderRadius: const BorderRadius.all(Radius.circular(12)),
                   border: Border.all(color: context.primaryColor.withValues(alpha: 0.25)),
                 ),
-                child: Text('free_up_space_description'.t(context: context), style: context.textTheme.bodyMedium),
+                child: Text(
+                  'free_up_space_description'.t(context: context),
+                  style: context.textTheme.labelLarge?.copyWith(fontSize: 15),
+                ),
               ),
             ),
 
@@ -255,7 +256,7 @@ class _FreeUpSpaceSettingsState extends ConsumerState<FreeUpSpaceSettings> {
                   content: Column(
                     crossAxisAlignment: CrossAxisAlignment.stretch,
                     children: [
-                      Text('cutoff_date_description'.t(context: context), style: subtitleStyle),
+                      Text('cutoff_date_description'.t(context: context), style: context.textTheme.labelLarge),
                       const SizedBox(height: 16),
                       GridView.count(
                         shrinkWrap: true,
@@ -351,7 +352,7 @@ class _FreeUpSpaceSettingsState extends ConsumerState<FreeUpSpaceSettings> {
                   content: Column(
                     crossAxisAlignment: CrossAxisAlignment.stretch,
                     children: [
-                      Text('cleanup_filter_description'.t(context: context), style: subtitleStyle),
+                      Text('cleanup_filter_description'.t(context: context), style: context.textTheme.labelLarge),
                       const SizedBox(height: 16),
                       SegmentedButton<AssetFilterType>(
                         segments: [
@@ -380,15 +381,10 @@ class _FreeUpSpaceSettingsState extends ConsumerState<FreeUpSpaceSettings> {
                       const SizedBox(height: 16),
                       SwitchListTile(
                         contentPadding: EdgeInsets.zero,
-                        title: Text(
-                          'keep_favorites'.t(context: context),
-                          style: context.textTheme.bodyLarge!.copyWith(fontWeight: FontWeight.w500, height: 1.5),
-                        ),
+                        title: Text('keep_favorites'.t(context: context), style: context.textTheme.titleSmall),
                         subtitle: Text(
                           'keep_favorites_description'.t(context: context),
-                          style: context.textTheme.bodyMedium!.copyWith(
-                            color: context.textTheme.bodyMedium!.color!.withAlpha(215),
-                          ),
+                          style: context.textTheme.labelLarge,
                         ),
                         value: state.keepFavorites,
                         onChanged: (value) {
@@ -439,7 +435,10 @@ class _FreeUpSpaceSettingsState extends ConsumerState<FreeUpSpaceSettings> {
                       : null,
                   content: Column(
                     children: [
-                      Text('cleanup_step3_description'.t(context: context), style: subtitleStyle),
+                      Text(
+                        'cleanup_step3_description'.t(context: context),
+                        style: context.textTheme.labelLarge?.copyWith(fontSize: 15),
+                      ),
                       if (CurrentPlatform.isIOS) ...[
                         const SizedBox(height: 12),
                         Container(

mobile/lib/widgets/settings/networking_settings/endpoint_input.dart

@@ -117,7 +117,7 @@ class EndpointInputState extends ConsumerState<EndpointInput> {
           autovalidateMode: AutovalidateMode.onUserInteraction,
           validator: validateUrl,
           keyboardType: TextInputType.url,
-          style: const TextStyle(fontFamily: 'GoogleSansCode', fontSize: 14),
+          style: const TextStyle(fontFamily: 'GoogleSansCode', fontWeight: FontWeight.w600, fontSize: 14),
           decoration: InputDecoration(
             hintText: 'http(s)://immich.domain.com',
             contentPadding: const EdgeInsets.all(16),

mobile/lib/widgets/settings/networking_settings/external_network_preference.dart

@@ -1,12 +1,12 @@
 import 'dart:convert';
 
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart' hide Store;
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
 import 'package:immich_mobile/widgets/settings/networking_settings/endpoint_input.dart';
 
@@ -103,7 +103,7 @@ class ExternalNetworkPreference extends HookConsumerWidget {
               children: [
                 Padding(
                   padding: const EdgeInsets.symmetric(vertical: 4.0, horizontal: 24),
-                  child: Text("external_network_sheet_info".t(context: context), style: context.textTheme.bodyMedium),
+                  child: Text("external_network_sheet_info".tr(), style: context.textTheme.bodyMedium),
                 ),
                 const SizedBox(height: 4),
                 Divider(color: context.colorScheme.surfaceContainerHighest),
@@ -135,7 +135,7 @@ class ExternalNetworkPreference extends HookConsumerWidget {
                     height: 48,
                     child: OutlinedButton.icon(
                       icon: const Icon(Icons.add),
-                      label: Text('add_endpoint'.t(context: context)),
+                      label: Text('add_endpoint'.tr().toUpperCase()),
                       onPressed: enabled
                           ? () {
                               entries.value = [

mobile/lib/widgets/settings/networking_settings/local_network_preference.dart

@@ -5,7 +5,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/providers/network.provider.dart';
 
@@ -168,12 +167,13 @@ class LocalNetworkPreference extends HookConsumerWidget {
                       enabled: enabled,
                       contentPadding: const EdgeInsets.only(left: 24, right: 8),
                       leading: const Icon(Icons.lan_rounded),
-                      title: Text("server_endpoint".t(context: context)),
+                      title: Text("server_endpoint".tr()),
                       subtitle: localEndpointText.value.isEmpty
                           ? const Text("http://local-ip:2283")
                           : Text(
                               localEndpointText.value,
                               style: context.textTheme.labelLarge?.copyWith(
+                                fontWeight: FontWeight.bold,
                                 color: enabled ? context.primaryColor : context.colorScheme.onSurface.withAlpha(100),
                                 fontFamily: 'GoogleSansCode',
                               ),
@@ -190,7 +190,7 @@ class LocalNetworkPreference extends HookConsumerWidget {
                         height: 48,
                         child: OutlinedButton.icon(
                           icon: const Icon(Icons.wifi_find_rounded),
-                          label: Text('use_current_connection'.t(context: context)),
+                          label: Text('use_current_connection'.tr().toUpperCase()),
                           onPressed: enabled ? autofillCurrentNetwork : null,
                         ),
                       ),

mobile/lib/widgets/settings/networking_settings/networking_settings.dart

@@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart' hide Store;
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
 import 'package:immich_mobile/providers/network.provider.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
@@ -11,7 +10,6 @@ import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';
 import 'package:immich_mobile/utils/url_helper.dart';
 import 'package:immich_mobile/widgets/settings/networking_settings/external_network_preference.dart';
 import 'package:immich_mobile/widgets/settings/networking_settings/local_network_preference.dart';
-import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
 import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';
 
 class NetworkingSettings extends HookConsumerWidget {
@@ -89,10 +87,12 @@ class NetworkingSettings extends HookConsumerWidget {
     return ListView(
       padding: const EdgeInsets.only(bottom: 96),
       children: <Widget>[
-        const SizedBox(height: 8),
-        SettingGroupTitle(
-          title: "current_server_address".t(context: context),
-          icon: (currentEndpoint?.startsWith('https') ?? false) ? Icons.https_outlined : Icons.http_outlined,
+        Padding(
+          padding: const EdgeInsets.only(top: 8, left: 16, bottom: 8),
+          child: NetworkPreferenceTitle(
+            title: "current_server_address".tr().toUpperCase(),
+            icon: (currentEndpoint?.startsWith('https') ?? false) ? Icons.https_outlined : Icons.http_outlined,
+          ),
         ),
         Padding(
           padding: const EdgeInsets.symmetric(horizontal: 8),
@@ -108,7 +108,12 @@ class NetworkingSettings extends HookConsumerWidget {
                   : const Icon(Icons.circle_outlined),
               title: Text(
                 currentEndpoint ?? "--",
-                style: TextStyle(fontSize: 14, fontFamily: 'GoogleSansCode', color: context.primaryColor),
+                style: TextStyle(
+                  fontSize: 16,
+                  fontFamily: 'GoogleSansCode',
+                  fontWeight: FontWeight.bold,
+                  color: context.primaryColor,
+                ),
               ),
             ),
           ),
@@ -123,16 +128,14 @@ class NetworkingSettings extends HookConsumerWidget {
           title: "automatic_endpoint_switching_title".tr(),
           subtitle: "automatic_endpoint_switching_subtitle".tr(),
         ),
-        const SizedBox(height: 8),
-        SettingGroupTitle(
-          title: "local_network".t(context: context),
-          icon: Icons.home_outlined,
+        Padding(
+          padding: const EdgeInsets.only(top: 8, left: 16, bottom: 16),
+          child: NetworkPreferenceTitle(title: "local_network".tr().toUpperCase(), icon: Icons.home_outlined),
         ),
         LocalNetworkPreference(enabled: featureEnabled.value),
-        const SizedBox(height: 16),
-        SettingGroupTitle(
-          title: "external_network".t(context: context),
-          icon: Icons.dns_outlined,
+        Padding(
+          padding: const EdgeInsets.only(top: 32, left: 16, bottom: 16),
+          child: NetworkPreferenceTitle(title: "external_network".tr().toUpperCase(), icon: Icons.dns_outlined),
         ),
         ExternalNetworkPreference(enabled: featureEnabled.value),
       ],
@@ -140,6 +143,30 @@ class NetworkingSettings extends HookConsumerWidget {
   }
 }
 
+class NetworkPreferenceTitle extends StatelessWidget {
+  const NetworkPreferenceTitle({super.key, required this.icon, required this.title});
+
+  final IconData icon;
+  final String title;
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      children: [
+        Icon(icon, color: context.colorScheme.onSurface.withAlpha(150)),
+        const SizedBox(width: 8),
+        Text(
+          title,
+          style: context.textTheme.displaySmall?.copyWith(
+            color: context.colorScheme.onSurface.withAlpha(200),
+            fontWeight: FontWeight.w500,
+          ),
+        ),
+      ],
+    );
+  }
+}
+
 class NetworkStatusIcon extends StatelessWidget {
   const NetworkStatusIcon({super.key, required this.status, this.enabled = true}) : super();
 
@@ -148,10 +175,10 @@ class NetworkStatusIcon extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return AnimatedSwitcher(duration: const Duration(milliseconds: 200), child: buildIcon(context));
+    return AnimatedSwitcher(duration: const Duration(milliseconds: 200), child: _buildIcon(context));
   }
 
-  Widget buildIcon(BuildContext context) => switch (status) {
+  Widget _buildIcon(BuildContext context) => switch (status) {
     AuxCheckStatus.loading => Padding(
       padding: const EdgeInsets.only(left: 4.0),
       child: SizedBox(

mobile/lib/widgets/settings/preference_settings/haptic_setting.dart

@@ -1,9 +1,9 @@
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
-import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
+import 'package:immich_mobile/widgets/settings/settings_sub_title.dart';
 import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';
 import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';
 
@@ -22,13 +22,10 @@ class HapticSetting extends HookConsumerWidget {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        SettingGroupTitle(
-          title: "haptic_feedback_title".t(context: context),
-          icon: Icons.vibration_outlined,
-        ),
+        SettingsSubTitle(title: "haptic_feedback_title".tr()),
         SettingsSwitchListTile(
           valueNotifier: isHapticFeedbackEnabled,
-          title: 'enabled'.t(context: context),
+          title: 'haptic_feedback_switch'.tr(),
           onChanged: onHapticFeedbackChange,
         ),
       ],

mobile/lib/widgets/settings/preference_settings/theme_setting.dart

@@ -1,12 +1,12 @@
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/providers/theme.provider.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/widgets/settings/preference_settings/primary_color_setting.dart';
-import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
+import 'package:immich_mobile/widgets/settings/settings_sub_title.dart';
 import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';
 import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';
 
@@ -74,26 +74,23 @@ class ThemeSetting extends HookConsumerWidget {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        SettingGroupTitle(
-          title: "theme".t(context: context),
-          icon: Icons.color_lens_outlined,
-        ),
+        SettingsSubTitle(title: "theme".tr()),
         SettingsSwitchListTile(
           valueNotifier: isSystemTheme,
-          title: 'theme_setting_system_theme_switch'.t(context: context),
+          title: 'theme_setting_system_theme_switch'.tr(),
           onChanged: onSystemThemeChange,
         ),
         if (currentTheme.value != ThemeMode.system)
           SettingsSwitchListTile(
             valueNotifier: isDarkTheme,
-            title: 'map_settings_dark_mode'.t(context: context),
+            title: 'map_settings_dark_mode'.tr(),
             onChanged: onThemeChange,
           ),
         const PrimaryColorSetting(),
         SettingsSwitchListTile(
           valueNotifier: applyThemeToBackgroundProvider,
-          title: "theme_setting_colorful_interface_title".t(context: context),
-          subtitle: 'theme_setting_colorful_interface_subtitle'.t(context: context),
+          title: "theme_setting_colorful_interface_title".tr(),
+          subtitle: 'theme_setting_colorful_interface_subtitle'.tr(),
           onChanged: onSurfaceColorSettingChange,
         ),
       ],

mobile/lib/widgets/settings/setting_group_title.dart

@@ -1,39 +0,0 @@
-import 'package:flutter/widgets.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/theme_extensions.dart';
-
-class SettingGroupTitle extends StatelessWidget {
-  final String title;
-  final String? subtitle;
-  final IconData? icon;
-  final EdgeInsetsGeometry? contentPadding;
-
-  const SettingGroupTitle({super.key, required this.title, this.icon, this.subtitle, this.contentPadding});
-
-  @override
-  Widget build(BuildContext context) {
-    return Padding(
-      padding: contentPadding ?? const EdgeInsets.only(left: 20.0, right: 20.0, bottom: 8.0),
-      child: Column(
-        children: [
-          Row(
-            children: [
-              if (icon != null) ...[
-                Icon(icon, color: context.colorScheme.onSurfaceSecondary, size: 20),
-                const SizedBox(width: 8),
-              ],
-              Text(title, style: context.textTheme.labelLarge?.copyWith(color: context.colorScheme.onSurfaceSecondary)),
-            ],
-          ),
-          if (subtitle != null) ...[
-            const SizedBox(height: 8),
-            Text(
-              subtitle!,
-              style: context.textTheme.bodyMedium!.copyWith(color: context.colorScheme.onSurface.withAlpha(200)),
-            ),
-          ],
-        ],
-      ),
-    );
-  }
-}

mobile/lib/widgets/settings/setting_list_tile.dart

@@ -1,38 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-
-class SettingListTile extends StatelessWidget {
-  final String title;
-  final String? subtitle;
-  final Widget? leading;
-  final Widget? trailing;
-  final VoidCallback? onTap;
-  final EdgeInsetsGeometry? contentPadding;
-
-  const SettingListTile({
-    required this.title,
-    this.subtitle,
-    this.leading,
-    this.trailing,
-    this.onTap,
-    this.contentPadding,
-    super.key,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return ListTile(
-      title: Text(title, style: context.textTheme.bodyLarge!.copyWith(fontWeight: FontWeight.w500, height: 1.5)),
-      subtitle: subtitle != null
-          ? Text(
-              subtitle!,
-              style: context.textTheme.bodyMedium!.copyWith(color: context.textTheme.bodyMedium!.color!.withAlpha(215)),
-            )
-          : null,
-      leading: leading,
-      trailing: trailing,
-      onTap: onTap,
-      contentPadding: contentPadding,
-    );
-  }
-}

mobile/lib/widgets/settings/settings_card.dart

@@ -36,8 +36,11 @@ class SettingsCard extends StatelessWidget {
             padding: const EdgeInsets.all(16.0),
             child: Icon(icon, color: context.primaryColor),
           ),
-          title: Text(title, style: context.textTheme.titleMedium!.copyWith(color: context.primaryColor)),
-          subtitle: Text(subtitle, style: context.textTheme.bodyMedium),
+          title: Text(
+            title,
+            style: context.textTheme.titleMedium!.copyWith(fontWeight: FontWeight.w600, color: context.primaryColor),
+          ),
+          subtitle: Text(subtitle, style: context.textTheme.labelLarge),
           onTap: () => context.pushRoute(settingRoute),
         ),
       ),

mobile/lib/widgets/settings/settings_sub_page_scaffold.dart

@@ -9,11 +9,13 @@ class SettingsSubPageScaffold extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return ListView.separated(
-      padding: const EdgeInsets.symmetric(vertical: 16),
+      padding: const EdgeInsets.symmetric(vertical: 20),
       itemCount: settings.length,
       itemBuilder: (ctx, index) => settings[index],
       separatorBuilder: (context, index) => showDivider
-          ? const Column(children: [SizedBox(height: 5), Divider(height: 10), SizedBox(height: 15)])
+          ? const Column(
+              children: [SizedBox(height: 5), Divider(height: 10, indent: 15, endIndent: 15), SizedBox(height: 15)],
+            )
           : const SizedBox(height: 10),
     );
   }

mobile/openapi/README.md

@@ -138,11 +138,6 @@ Class | Method | HTTP request | Description
 *AuthenticationApi* | [**unlockAuthSession**](doc//AuthenticationApi.md#unlockauthsession) | **POST** /auth/session/unlock | Unlock auth session
 *AuthenticationApi* | [**validateAccessToken**](doc//AuthenticationApi.md#validateaccesstoken) | **POST** /auth/validateToken | Validate access token
 *AuthenticationAdminApi* | [**unlinkAllOAuthAccountsAdmin**](doc//AuthenticationAdminApi.md#unlinkalloauthaccountsadmin) | **POST** /admin/auth/unlink-all | Unlink all OAuth accounts
-*DatabaseBackupsAdminApi* | [**deleteDatabaseBackup**](doc//DatabaseBackupsAdminApi.md#deletedatabasebackup) | **DELETE** /admin/database-backups | Delete database backup
-*DatabaseBackupsAdminApi* | [**downloadDatabaseBackup**](doc//DatabaseBackupsAdminApi.md#downloaddatabasebackup) | **GET** /admin/database-backups/{filename} | Download database backup
-*DatabaseBackupsAdminApi* | [**listDatabaseBackups**](doc//DatabaseBackupsAdminApi.md#listdatabasebackups) | **GET** /admin/database-backups | List database backups
-*DatabaseBackupsAdminApi* | [**startDatabaseRestoreFlow**](doc//DatabaseBackupsAdminApi.md#startdatabaserestoreflow) | **POST** /admin/database-backups/start-restore | Start database backup restore flow
-*DatabaseBackupsAdminApi* | [**uploadDatabaseBackup**](doc//DatabaseBackupsAdminApi.md#uploaddatabasebackup) | **POST** /admin/database-backups/upload | Upload database backup
 *DeprecatedApi* | [**createPartnerDeprecated**](doc//DeprecatedApi.md#createpartnerdeprecated) | **POST** /partners/{id} | Create a partner
 *DeprecatedApi* | [**getAllUserAssetsByDeviceId**](doc//DeprecatedApi.md#getalluserassetsbydeviceid) | **GET** /assets/device/{deviceId} | Retrieve assets by device ID
 *DeprecatedApi* | [**getDeltaSync**](doc//DeprecatedApi.md#getdeltasync) | **POST** /sync/delta-sync | Get delta sync for user
@@ -171,8 +166,6 @@ Class | Method | HTTP request | Description
 *LibrariesApi* | [**scanLibrary**](doc//LibrariesApi.md#scanlibrary) | **POST** /libraries/{id}/scan | Scan a library
 *LibrariesApi* | [**updateLibrary**](doc//LibrariesApi.md#updatelibrary) | **PUT** /libraries/{id} | Update a library
 *LibrariesApi* | [**validate**](doc//LibrariesApi.md#validate) | **POST** /libraries/{id}/validate | Validate library settings
-*MaintenanceAdminApi* | [**detectPriorInstall**](doc//MaintenanceAdminApi.md#detectpriorinstall) | **GET** /admin/maintenance/detect-install | Detect existing install
-*MaintenanceAdminApi* | [**getMaintenanceStatus**](doc//MaintenanceAdminApi.md#getmaintenancestatus) | **GET** /admin/maintenance/status | Get maintenance mode status
 *MaintenanceAdminApi* | [**maintenanceLogin**](doc//MaintenanceAdminApi.md#maintenancelogin) | **POST** /admin/maintenance/login | Log into maintenance mode
 *MaintenanceAdminApi* | [**setMaintenanceMode**](doc//MaintenanceAdminApi.md#setmaintenancemode) | **POST** /admin/maintenance | Set maintenance mode
 *MapApi* | [**getMapMarkers**](doc//MapApi.md#getmapmarkers) | **GET** /map/markers | Retrieve map markers
@@ -412,9 +405,6 @@ Class | Method | HTTP request | Description
  - [CreateProfileImageResponseDto](doc//CreateProfileImageResponseDto.md)
  - [CropParameters](doc//CropParameters.md)
  - [DatabaseBackupConfig](doc//DatabaseBackupConfig.md)
- - [DatabaseBackupDeleteDto](doc//DatabaseBackupDeleteDto.md)
- - [DatabaseBackupDto](doc//DatabaseBackupDto.md)
- - [DatabaseBackupListResponseDto](doc//DatabaseBackupListResponseDto.md)
  - [DownloadArchiveInfo](doc//DownloadArchiveInfo.md)
  - [DownloadInfoDto](doc//DownloadInfoDto.md)
  - [DownloadResponse](doc//DownloadResponse.md)
@@ -444,10 +434,7 @@ Class | Method | HTTP request | Description
  - [MachineLearningAvailabilityChecksDto](doc//MachineLearningAvailabilityChecksDto.md)
  - [MaintenanceAction](doc//MaintenanceAction.md)
  - [MaintenanceAuthDto](doc//MaintenanceAuthDto.md)
- - [MaintenanceDetectInstallResponseDto](doc//MaintenanceDetectInstallResponseDto.md)
- - [MaintenanceDetectInstallStorageFolderDto](doc//MaintenanceDetectInstallStorageFolderDto.md)
  - [MaintenanceLoginDto](doc//MaintenanceLoginDto.md)
- - [MaintenanceStatusResponseDto](doc//MaintenanceStatusResponseDto.md)
  - [ManualJobName](doc//ManualJobName.md)
  - [MapMarkerResponseDto](doc//MapMarkerResponseDto.md)
  - [MapReverseGeocodeResponseDto](doc//MapReverseGeocodeResponseDto.md)
@@ -563,7 +550,6 @@ Class | Method | HTTP request | Description
  - [StackResponseDto](doc//StackResponseDto.md)
  - [StackUpdateDto](doc//StackUpdateDto.md)
  - [StatisticsSearchDto](doc//StatisticsSearchDto.md)
- - [StorageFolder](doc//StorageFolder.md)
  - [SyncAckDeleteDto](doc//SyncAckDeleteDto.md)
  - [SyncAckDto](doc//SyncAckDto.md)
  - [SyncAckSetDto](doc//SyncAckSetDto.md)

mobile/openapi/lib/api.dart

@@ -36,7 +36,6 @@ part 'api/albums_api.dart';
 part 'api/assets_api.dart';
 part 'api/authentication_api.dart';
 part 'api/authentication_admin_api.dart';
-part 'api/database_backups_admin_api.dart';
 part 'api/deprecated_api.dart';
 part 'api/download_api.dart';
 part 'api/duplicates_api.dart';
@@ -152,9 +151,6 @@ part 'model/create_library_dto.dart';
 part 'model/create_profile_image_response_dto.dart';
 part 'model/crop_parameters.dart';
 part 'model/database_backup_config.dart';
-part 'model/database_backup_delete_dto.dart';
-part 'model/database_backup_dto.dart';
-part 'model/database_backup_list_response_dto.dart';
 part 'model/download_archive_info.dart';
 part 'model/download_info_dto.dart';
 part 'model/download_response.dart';
@@ -184,10 +180,7 @@ part 'model/logout_response_dto.dart';
 part 'model/machine_learning_availability_checks_dto.dart';
 part 'model/maintenance_action.dart';
 part 'model/maintenance_auth_dto.dart';
-part 'model/maintenance_detect_install_response_dto.dart';
-part 'model/maintenance_detect_install_storage_folder_dto.dart';
 part 'model/maintenance_login_dto.dart';
-part 'model/maintenance_status_response_dto.dart';
 part 'model/manual_job_name.dart';
 part 'model/map_marker_response_dto.dart';
 part 'model/map_reverse_geocode_response_dto.dart';
@@ -303,7 +296,6 @@ part 'model/stack_create_dto.dart';
 part 'model/stack_response_dto.dart';
 part 'model/stack_update_dto.dart';
 part 'model/statistics_search_dto.dart';
-part 'model/storage_folder.dart';
 part 'model/sync_ack_delete_dto.dart';
 part 'model/sync_ack_dto.dart';
 part 'model/sync_ack_set_dto.dart';

mobile/openapi/lib/api/database_backups_admin_api.dart

@@ -1,269 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.18
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-
-class DatabaseBackupsAdminApi {
-  DatabaseBackupsAdminApi([ApiClient? apiClient]) : apiClient = apiClient ?? defaultApiClient;
-
-  final ApiClient apiClient;
-
-  /// Delete database backup
-  ///
-  /// Delete a backup by its filename
-  ///
-  /// Note: This method returns the HTTP [Response].
-  ///
-  /// Parameters:
-  ///
-  /// * [DatabaseBackupDeleteDto] databaseBackupDeleteDto (required):
-  Future<Response> deleteDatabaseBackupWithHttpInfo(DatabaseBackupDeleteDto databaseBackupDeleteDto,) async {
-    // ignore: prefer_const_declarations
-    final apiPath = r'/admin/database-backups';
-
-    // ignore: prefer_final_locals
-    Object? postBody = databaseBackupDeleteDto;
-
-    final queryParams = <QueryParam>[];
-    final headerParams = <String, String>{};
-    final formParams = <String, String>{};
-
-    const contentTypes = <String>['application/json'];
-
-
-    return apiClient.invokeAPI(
-      apiPath,
-      'DELETE',
-      queryParams,
-      postBody,
-      headerParams,
-      formParams,
-      contentTypes.isEmpty ? null : contentTypes.first,
-    );
-  }
-
-  /// Delete database backup
-  ///
-  /// Delete a backup by its filename
-  ///
-  /// Parameters:
-  ///
-  /// * [DatabaseBackupDeleteDto] databaseBackupDeleteDto (required):
-  Future<void> deleteDatabaseBackup(DatabaseBackupDeleteDto databaseBackupDeleteDto,) async {
-    final response = await deleteDatabaseBackupWithHttpInfo(databaseBackupDeleteDto,);
-    if (response.statusCode >= HttpStatus.badRequest) {
-      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
-    }
-  }
-
-  /// Download database backup
-  ///
-  /// Downloads the database backup file
-  ///
-  /// Note: This method returns the HTTP [Response].
-  ///
-  /// Parameters:
-  ///
-  /// * [String] filename (required):
-  Future<Response> downloadDatabaseBackupWithHttpInfo(String filename,) async {
-    // ignore: prefer_const_declarations
-    final apiPath = r'/admin/database-backups/{filename}'
-      .replaceAll('{filename}', filename);
-
-    // ignore: prefer_final_locals
-    Object? postBody;
-
-    final queryParams = <QueryParam>[];
-    final headerParams = <String, String>{};
-    final formParams = <String, String>{};
-
-    const contentTypes = <String>[];
-
-
-    return apiClient.invokeAPI(
-      apiPath,
-      'GET',
-      queryParams,
-      postBody,
-      headerParams,
-      formParams,
-      contentTypes.isEmpty ? null : contentTypes.first,
-    );
-  }
-
-  /// Download database backup
-  ///
-  /// Downloads the database backup file
-  ///
-  /// Parameters:
-  ///
-  /// * [String] filename (required):
-  Future<MultipartFile?> downloadDatabaseBackup(String filename,) async {
-    final response = await downloadDatabaseBackupWithHttpInfo(filename,);
-    if (response.statusCode >= HttpStatus.badRequest) {
-      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
-    }
-    // When a remote server returns no body with a status of 204, we shall not decode it.
-    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
-    // FormatException when trying to decode an empty string.
-    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'MultipartFile',) as MultipartFile;
-    
-    }
-    return null;
-  }
-
-  /// List database backups
-  ///
-  /// Get the list of the successful and failed backups
-  ///
-  /// Note: This method returns the HTTP [Response].
-  Future<Response> listDatabaseBackupsWithHttpInfo() async {
-    // ignore: prefer_const_declarations
-    final apiPath = r'/admin/database-backups';
-
-    // ignore: prefer_final_locals
-    Object? postBody;
-
-    final queryParams = <QueryParam>[];
-    final headerParams = <String, String>{};
-    final formParams = <String, String>{};
-
-    const contentTypes = <String>[];
-
-
-    return apiClient.invokeAPI(
-      apiPath,
-      'GET',
-      queryParams,
-      postBody,
-      headerParams,
-      formParams,
-      contentTypes.isEmpty ? null : contentTypes.first,
-    );
-  }
-
-  /// List database backups
-  ///
-  /// Get the list of the successful and failed backups
-  Future<DatabaseBackupListResponseDto?> listDatabaseBackups() async {
-    final response = await listDatabaseBackupsWithHttpInfo();
-    if (response.statusCode >= HttpStatus.badRequest) {
-      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
-    }
-    // When a remote server returns no body with a status of 204, we shall not decode it.
-    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
-    // FormatException when trying to decode an empty string.
-    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'DatabaseBackupListResponseDto',) as DatabaseBackupListResponseDto;
-    
-    }
-    return null;
-  }
-
-  /// Start database backup restore flow
-  ///
-  /// Put Immich into maintenance mode to restore a backup (Immich must not be configured)
-  ///
-  /// Note: This method returns the HTTP [Response].
-  Future<Response> startDatabaseRestoreFlowWithHttpInfo() async {
-    // ignore: prefer_const_declarations
-    final apiPath = r'/admin/database-backups/start-restore';
-
-    // ignore: prefer_final_locals
-    Object? postBody;
-
-    final queryParams = <QueryParam>[];
-    final headerParams = <String, String>{};
-    final formParams = <String, String>{};
-
-    const contentTypes = <String>[];
-
-
-    return apiClient.invokeAPI(
-      apiPath,
-      'POST',
-      queryParams,
-      postBody,
-      headerParams,
-      formParams,
-      contentTypes.isEmpty ? null : contentTypes.first,
-    );
-  }
-
-  /// Start database backup restore flow
-  ///
-  /// Put Immich into maintenance mode to restore a backup (Immich must not be configured)
-  Future<void> startDatabaseRestoreFlow() async {
-    final response = await startDatabaseRestoreFlowWithHttpInfo();
-    if (response.statusCode >= HttpStatus.badRequest) {
-      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
-    }
-  }
-
-  /// Upload database backup
-  ///
-  /// Uploads .sql/.sql.gz file to restore backup from
-  ///
-  /// Note: This method returns the HTTP [Response].
-  ///
-  /// Parameters:
-  ///
-  /// * [MultipartFile] file:
-  Future<Response> uploadDatabaseBackupWithHttpInfo({ MultipartFile? file, }) async {
-    // ignore: prefer_const_declarations
-    final apiPath = r'/admin/database-backups/upload';
-
-    // ignore: prefer_final_locals
-    Object? postBody;
-
-    final queryParams = <QueryParam>[];
-    final headerParams = <String, String>{};
-    final formParams = <String, String>{};
-
-    const contentTypes = <String>['multipart/form-data'];
-
-    bool hasFields = false;
-    final mp = MultipartRequest('POST', Uri.parse(apiPath));
-    if (file != null) {
-      hasFields = true;
-      mp.fields[r'file'] = file.field;
-      mp.files.add(file);
-    }
-    if (hasFields) {
-      postBody = mp;
-    }
-
-    return apiClient.invokeAPI(
-      apiPath,
-      'POST',
-      queryParams,
-      postBody,
-      headerParams,
-      formParams,
-      contentTypes.isEmpty ? null : contentTypes.first,
-    );
-  }
-
-  /// Upload database backup
-  ///
-  /// Uploads .sql/.sql.gz file to restore backup from
-  ///
-  /// Parameters:
-  ///
-  /// * [MultipartFile] file:
-  Future<void> uploadDatabaseBackup({ MultipartFile? file, }) async {
-    final response = await uploadDatabaseBackupWithHttpInfo( file: file, );
-    if (response.statusCode >= HttpStatus.badRequest) {
-      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
-    }
-  }
-}

mobile/openapi/lib/api/maintenance_admin_api.dart

@@ -16,102 +16,6 @@ class MaintenanceAdminApi {
 
   final ApiClient apiClient;
 
-  /// Detect existing install
-  ///
-  /// Collect integrity checks and other heuristics about local data.
-  ///
-  /// Note: This method returns the HTTP [Response].
-  Future<Response> detectPriorInstallWithHttpInfo() async {
-    // ignore: prefer_const_declarations
-    final apiPath = r'/admin/maintenance/detect-install';
-
-    // ignore: prefer_final_locals
-    Object? postBody;
-
-    final queryParams = <QueryParam>[];
-    final headerParams = <String, String>{};
-    final formParams = <String, String>{};
-
-    const contentTypes = <String>[];
-
-
-    return apiClient.invokeAPI(
-      apiPath,
-      'GET',
-      queryParams,
-      postBody,
-      headerParams,
-      formParams,
-      contentTypes.isEmpty ? null : contentTypes.first,
-    );
-  }
-
-  /// Detect existing install
-  ///
-  /// Collect integrity checks and other heuristics about local data.
-  Future<MaintenanceDetectInstallResponseDto?> detectPriorInstall() async {
-    final response = await detectPriorInstallWithHttpInfo();
-    if (response.statusCode >= HttpStatus.badRequest) {
-      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
-    }
-    // When a remote server returns no body with a status of 204, we shall not decode it.
-    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
-    // FormatException when trying to decode an empty string.
-    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'MaintenanceDetectInstallResponseDto',) as MaintenanceDetectInstallResponseDto;
-    
-    }
-    return null;
-  }
-
-  /// Get maintenance mode status
-  ///
-  /// Fetch information about the currently running maintenance action.
-  ///
-  /// Note: This method returns the HTTP [Response].
-  Future<Response> getMaintenanceStatusWithHttpInfo() async {
-    // ignore: prefer_const_declarations
-    final apiPath = r'/admin/maintenance/status';
-
-    // ignore: prefer_final_locals
-    Object? postBody;
-
-    final queryParams = <QueryParam>[];
-    final headerParams = <String, String>{};
-    final formParams = <String, String>{};
-
-    const contentTypes = <String>[];
-
-
-    return apiClient.invokeAPI(
-      apiPath,
-      'GET',
-      queryParams,
-      postBody,
-      headerParams,
-      formParams,
-      contentTypes.isEmpty ? null : contentTypes.first,
-    );
-  }
-
-  /// Get maintenance mode status
-  ///
-  /// Fetch information about the currently running maintenance action.
-  Future<MaintenanceStatusResponseDto?> getMaintenanceStatus() async {
-    final response = await getMaintenanceStatusWithHttpInfo();
-    if (response.statusCode >= HttpStatus.badRequest) {
-      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
-    }
-    // When a remote server returns no body with a status of 204, we shall not decode it.
-    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
-    // FormatException when trying to decode an empty string.
-    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'MaintenanceStatusResponseDto',) as MaintenanceStatusResponseDto;
-    
-    }
-    return null;
-  }
-
   /// Log into maintenance mode
   ///
   /// Login with maintenance token or cookie to receive current information and perform further actions.

mobile/openapi/lib/api_client.dart

@@ -350,12 +350,6 @@ class ApiClient {
           return CropParameters.fromJson(value);
         case 'DatabaseBackupConfig':
           return DatabaseBackupConfig.fromJson(value);
-        case 'DatabaseBackupDeleteDto':
-          return DatabaseBackupDeleteDto.fromJson(value);
-        case 'DatabaseBackupDto':
-          return DatabaseBackupDto.fromJson(value);
-        case 'DatabaseBackupListResponseDto':
-          return DatabaseBackupListResponseDto.fromJson(value);
         case 'DownloadArchiveInfo':
           return DownloadArchiveInfo.fromJson(value);
         case 'DownloadInfoDto':
@@ -414,14 +408,8 @@ class ApiClient {
           return MaintenanceActionTypeTransformer().decode(value);
         case 'MaintenanceAuthDto':
           return MaintenanceAuthDto.fromJson(value);
-        case 'MaintenanceDetectInstallResponseDto':
-          return MaintenanceDetectInstallResponseDto.fromJson(value);
-        case 'MaintenanceDetectInstallStorageFolderDto':
-          return MaintenanceDetectInstallStorageFolderDto.fromJson(value);
         case 'MaintenanceLoginDto':
           return MaintenanceLoginDto.fromJson(value);
-        case 'MaintenanceStatusResponseDto':
-          return MaintenanceStatusResponseDto.fromJson(value);
         case 'ManualJobName':
           return ManualJobNameTypeTransformer().decode(value);
         case 'MapMarkerResponseDto':
@@ -652,8 +640,6 @@ class ApiClient {
           return StackUpdateDto.fromJson(value);
         case 'StatisticsSearchDto':
           return StatisticsSearchDto.fromJson(value);
-        case 'StorageFolder':
-          return StorageFolderTypeTransformer().decode(value);
         case 'SyncAckDeleteDto':
           return SyncAckDeleteDto.fromJson(value);
         case 'SyncAckDto':

mobile/openapi/lib/api_helper.dart

@@ -160,9 +160,6 @@ String parameterToString(dynamic value) {
   if (value is SourceType) {
     return SourceTypeTypeTransformer().encode(value).toString();
   }
-  if (value is StorageFolder) {
-    return StorageFolderTypeTransformer().encode(value).toString();
-  }
   if (value is SyncEntityType) {
     return SyncEntityTypeTypeTransformer().encode(value).toString();
   }

mobile/openapi/lib/model/database_backup_delete_dto.dart

@@ -1,101 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.18
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-class DatabaseBackupDeleteDto {
-  /// Returns a new [DatabaseBackupDeleteDto] instance.
-  DatabaseBackupDeleteDto({
-    this.backups = const [],
-  });
-
-  List<String> backups;
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is DatabaseBackupDeleteDto &&
-    _deepEquality.equals(other.backups, backups);
-
-  @override
-  int get hashCode =>
-    // ignore: unnecessary_parenthesis
-    (backups.hashCode);
-
-  @override
-  String toString() => 'DatabaseBackupDeleteDto[backups=$backups]';
-
-  Map<String, dynamic> toJson() {
-    final json = <String, dynamic>{};
-      json[r'backups'] = this.backups;
-    return json;
-  }
-
-  /// Returns a new [DatabaseBackupDeleteDto] instance and imports its values from
-  /// [value] if it's a [Map], null otherwise.
-  // ignore: prefer_constructors_over_static_methods
-  static DatabaseBackupDeleteDto? fromJson(dynamic value) {
-    upgradeDto(value, "DatabaseBackupDeleteDto");
-    if (value is Map) {
-      final json = value.cast<String, dynamic>();
-
-      return DatabaseBackupDeleteDto(
-        backups: json[r'backups'] is Iterable
-            ? (json[r'backups'] as Iterable).cast<String>().toList(growable: false)
-            : const [],
-      );
-    }
-    return null;
-  }
-
-  static List<DatabaseBackupDeleteDto> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <DatabaseBackupDeleteDto>[];
-    if (json is List && json.isNotEmpty) {
-      for (final row in json) {
-        final value = DatabaseBackupDeleteDto.fromJson(row);
-        if (value != null) {
-          result.add(value);
-        }
-      }
-    }
-    return result.toList(growable: growable);
-  }
-
-  static Map<String, DatabaseBackupDeleteDto> mapFromJson(dynamic json) {
-    final map = <String, DatabaseBackupDeleteDto>{};
-    if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
-      for (final entry in json.entries) {
-        final value = DatabaseBackupDeleteDto.fromJson(entry.value);
-        if (value != null) {
-          map[entry.key] = value;
-        }
-      }
-    }
-    return map;
-  }
-
-  // maps a json object with a list of DatabaseBackupDeleteDto-objects as value to a dart map
-  static Map<String, List<DatabaseBackupDeleteDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
-    final map = <String, List<DatabaseBackupDeleteDto>>{};
-    if (json is Map && json.isNotEmpty) {
-      // ignore: parameter_assignments
-      json = json.cast<String, dynamic>();
-      for (final entry in json.entries) {
-        map[entry.key] = DatabaseBackupDeleteDto.listFromJson(entry.value, growable: growable,);
-      }
-    }
-    return map;
-  }
-
-  /// The list of required keys that must be present in a JSON.
-  static const requiredKeys = <String>{
-    'backups',
-  };
-}
-

mobile/openapi/lib/model/database_backup_dto.dart

@@ -1,107 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.18
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-class DatabaseBackupDto {
-  /// Returns a new [DatabaseBackupDto] instance.
-  DatabaseBackupDto({
-    required this.filename,
-    required this.filesize,
-  });
-
-  String filename;
-
-  num filesize;
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is DatabaseBackupDto &&
-    other.filename == filename &&
-    other.filesize == filesize;
-
-  @override
-  int get hashCode =>
-    // ignore: unnecessary_parenthesis
-    (filename.hashCode) +
-    (filesize.hashCode);
-
-  @override
-  String toString() => 'DatabaseBackupDto[filename=$filename, filesize=$filesize]';
-
-  Map<String, dynamic> toJson() {
-    final json = <String, dynamic>{};
-      json[r'filename'] = this.filename;
-      json[r'filesize'] = this.filesize;
-    return json;
-  }
-
-  /// Returns a new [DatabaseBackupDto] instance and imports its values from
-  /// [value] if it's a [Map], null otherwise.
-  // ignore: prefer_constructors_over_static_methods
-  static DatabaseBackupDto? fromJson(dynamic value) {
-    upgradeDto(value, "DatabaseBackupDto");
-    if (value is Map) {
-      final json = value.cast<String, dynamic>();
-
-      return DatabaseBackupDto(
-        filename: mapValueOfType<String>(json, r'filename')!,
-        filesize: num.parse('${json[r'filesize']}'),
-      );
-    }
-    return null;
-  }
-
-  static List<DatabaseBackupDto> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <DatabaseBackupDto>[];
-    if (json is List && json.isNotEmpty) {
-      for (final row in json) {
-        final value = DatabaseBackupDto.fromJson(row);
-        if (value != null) {
-          result.add(value);
-        }
-      }
-    }
-    return result.toList(growable: growable);
-  }
-
-  static Map<String, DatabaseBackupDto> mapFromJson(dynamic json) {
-    final map = <String, DatabaseBackupDto>{};
-    if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
-      for (final entry in json.entries) {
-        final value = DatabaseBackupDto.fromJson(entry.value);
-        if (value != null) {
-          map[entry.key] = value;
-        }
-      }
-    }
-    return map;
-  }
-
-  // maps a json object with a list of DatabaseBackupDto-objects as value to a dart map
-  static Map<String, List<DatabaseBackupDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
-    final map = <String, List<DatabaseBackupDto>>{};
-    if (json is Map && json.isNotEmpty) {
-      // ignore: parameter_assignments
-      json = json.cast<String, dynamic>();
-      for (final entry in json.entries) {
-        map[entry.key] = DatabaseBackupDto.listFromJson(entry.value, growable: growable,);
-      }
-    }
-    return map;
-  }
-
-  /// The list of required keys that must be present in a JSON.
-  static const requiredKeys = <String>{
-    'filename',
-    'filesize',
-  };
-}
-

mobile/openapi/lib/model/database_backup_list_response_dto.dart

@@ -1,99 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.18
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-class DatabaseBackupListResponseDto {
-  /// Returns a new [DatabaseBackupListResponseDto] instance.
-  DatabaseBackupListResponseDto({
-    this.backups = const [],
-  });
-
-  List<DatabaseBackupDto> backups;
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is DatabaseBackupListResponseDto &&
-    _deepEquality.equals(other.backups, backups);
-
-  @override
-  int get hashCode =>
-    // ignore: unnecessary_parenthesis
-    (backups.hashCode);
-
-  @override
-  String toString() => 'DatabaseBackupListResponseDto[backups=$backups]';
-
-  Map<String, dynamic> toJson() {
-    final json = <String, dynamic>{};
-      json[r'backups'] = this.backups;
-    return json;
-  }
-
-  /// Returns a new [DatabaseBackupListResponseDto] instance and imports its values from
-  /// [value] if it's a [Map], null otherwise.
-  // ignore: prefer_constructors_over_static_methods
-  static DatabaseBackupListResponseDto? fromJson(dynamic value) {
-    upgradeDto(value, "DatabaseBackupListResponseDto");
-    if (value is Map) {
-      final json = value.cast<String, dynamic>();
-
-      return DatabaseBackupListResponseDto(
-        backups: DatabaseBackupDto.listFromJson(json[r'backups']),
-      );
-    }
-    return null;
-  }
-
-  static List<DatabaseBackupListResponseDto> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <DatabaseBackupListResponseDto>[];
-    if (json is List && json.isNotEmpty) {
-      for (final row in json) {
-        final value = DatabaseBackupListResponseDto.fromJson(row);
-        if (value != null) {
-          result.add(value);
-        }
-      }
-    }
-    return result.toList(growable: growable);
-  }
-
-  static Map<String, DatabaseBackupListResponseDto> mapFromJson(dynamic json) {
-    final map = <String, DatabaseBackupListResponseDto>{};
-    if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
-      for (final entry in json.entries) {
-        final value = DatabaseBackupListResponseDto.fromJson(entry.value);
-        if (value != null) {
-          map[entry.key] = value;
-        }
-      }
-    }
-    return map;
-  }
-
-  // maps a json object with a list of DatabaseBackupListResponseDto-objects as value to a dart map
-  static Map<String, List<DatabaseBackupListResponseDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
-    final map = <String, List<DatabaseBackupListResponseDto>>{};
-    if (json is Map && json.isNotEmpty) {
-      // ignore: parameter_assignments
-      json = json.cast<String, dynamic>();
-      for (final entry in json.entries) {
-        map[entry.key] = DatabaseBackupListResponseDto.listFromJson(entry.value, growable: growable,);
-      }
-    }
-    return map;
-  }
-
-  /// The list of required keys that must be present in a JSON.
-  static const requiredKeys = <String>{
-    'backups',
-  };
-}
-

mobile/openapi/lib/model/maintenance_action.dart

@@ -25,15 +25,11 @@ class MaintenanceAction {
 
   static const start = MaintenanceAction._(r'start');
   static const end = MaintenanceAction._(r'end');
-  static const selectDatabaseRestore = MaintenanceAction._(r'select_database_restore');
-  static const restoreDatabase = MaintenanceAction._(r'restore_database');
 
   /// List of all possible values in this [enum][MaintenanceAction].
   static const values = <MaintenanceAction>[
     start,
     end,
-    selectDatabaseRestore,
-    restoreDatabase,
   ];
 
   static MaintenanceAction? fromJson(dynamic value) => MaintenanceActionTypeTransformer().decode(value);
@@ -74,8 +70,6 @@ class MaintenanceActionTypeTransformer {
       switch (data) {
         case r'start': return MaintenanceAction.start;
         case r'end': return MaintenanceAction.end;
-        case r'select_database_restore': return MaintenanceAction.selectDatabaseRestore;
-        case r'restore_database': return MaintenanceAction.restoreDatabase;
         default:
           if (!allowNull) {
             throw ArgumentError('Unknown enum value to decode: $data');

mobile/openapi/lib/model/maintenance_detect_install_response_dto.dart

@@ -1,99 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.18
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-class MaintenanceDetectInstallResponseDto {
-  /// Returns a new [MaintenanceDetectInstallResponseDto] instance.
-  MaintenanceDetectInstallResponseDto({
-    this.storage = const [],
-  });
-
-  List<MaintenanceDetectInstallStorageFolderDto> storage;
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is MaintenanceDetectInstallResponseDto &&
-    _deepEquality.equals(other.storage, storage);
-
-  @override
-  int get hashCode =>
-    // ignore: unnecessary_parenthesis
-    (storage.hashCode);
-
-  @override
-  String toString() => 'MaintenanceDetectInstallResponseDto[storage=$storage]';
-
-  Map<String, dynamic> toJson() {
-    final json = <String, dynamic>{};
-      json[r'storage'] = this.storage;
-    return json;
-  }
-
-  /// Returns a new [MaintenanceDetectInstallResponseDto] instance and imports its values from
-  /// [value] if it's a [Map], null otherwise.
-  // ignore: prefer_constructors_over_static_methods
-  static MaintenanceDetectInstallResponseDto? fromJson(dynamic value) {
-    upgradeDto(value, "MaintenanceDetectInstallResponseDto");
-    if (value is Map) {
-      final json = value.cast<String, dynamic>();
-
-      return MaintenanceDetectInstallResponseDto(
-        storage: MaintenanceDetectInstallStorageFolderDto.listFromJson(json[r'storage']),
-      );
-    }
-    return null;
-  }
-
-  static List<MaintenanceDetectInstallResponseDto> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <MaintenanceDetectInstallResponseDto>[];
-    if (json is List && json.isNotEmpty) {
-      for (final row in json) {
-        final value = MaintenanceDetectInstallResponseDto.fromJson(row);
-        if (value != null) {
-          result.add(value);
-        }
-      }
-    }
-    return result.toList(growable: growable);
-  }
-
-  static Map<String, MaintenanceDetectInstallResponseDto> mapFromJson(dynamic json) {
-    final map = <String, MaintenanceDetectInstallResponseDto>{};
-    if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
-      for (final entry in json.entries) {
-        final value = MaintenanceDetectInstallResponseDto.fromJson(entry.value);
-        if (value != null) {
-          map[entry.key] = value;
-        }
-      }
-    }
-    return map;
-  }
-
-  // maps a json object with a list of MaintenanceDetectInstallResponseDto-objects as value to a dart map
-  static Map<String, List<MaintenanceDetectInstallResponseDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
-    final map = <String, List<MaintenanceDetectInstallResponseDto>>{};
-    if (json is Map && json.isNotEmpty) {
-      // ignore: parameter_assignments
-      json = json.cast<String, dynamic>();
-      for (final entry in json.entries) {
-        map[entry.key] = MaintenanceDetectInstallResponseDto.listFromJson(entry.value, growable: growable,);
-      }
-    }
-    return map;
-  }
-
-  /// The list of required keys that must be present in a JSON.
-  static const requiredKeys = <String>{
-    'storage',
-  };
-}
-

mobile/openapi/lib/model/maintenance_detect_install_storage_folder_dto.dart

@@ -1,123 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.18
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-class MaintenanceDetectInstallStorageFolderDto {
-  /// Returns a new [MaintenanceDetectInstallStorageFolderDto] instance.
-  MaintenanceDetectInstallStorageFolderDto({
-    required this.files,
-    required this.folder,
-    required this.readable,
-    required this.writable,
-  });
-
-  num files;
-
-  StorageFolder folder;
-
-  bool readable;
-
-  bool writable;
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is MaintenanceDetectInstallStorageFolderDto &&
-    other.files == files &&
-    other.folder == folder &&
-    other.readable == readable &&
-    other.writable == writable;
-
-  @override
-  int get hashCode =>
-    // ignore: unnecessary_parenthesis
-    (files.hashCode) +
-    (folder.hashCode) +
-    (readable.hashCode) +
-    (writable.hashCode);
-
-  @override
-  String toString() => 'MaintenanceDetectInstallStorageFolderDto[files=$files, folder=$folder, readable=$readable, writable=$writable]';
-
-  Map<String, dynamic> toJson() {
-    final json = <String, dynamic>{};
-      json[r'files'] = this.files;
-      json[r'folder'] = this.folder;
-      json[r'readable'] = this.readable;
-      json[r'writable'] = this.writable;
-    return json;
-  }
-
-  /// Returns a new [MaintenanceDetectInstallStorageFolderDto] instance and imports its values from
-  /// [value] if it's a [Map], null otherwise.
-  // ignore: prefer_constructors_over_static_methods
-  static MaintenanceDetectInstallStorageFolderDto? fromJson(dynamic value) {
-    upgradeDto(value, "MaintenanceDetectInstallStorageFolderDto");
-    if (value is Map) {
-      final json = value.cast<String, dynamic>();
-
-      return MaintenanceDetectInstallStorageFolderDto(
-        files: num.parse('${json[r'files']}'),
-        folder: StorageFolder.fromJson(json[r'folder'])!,
-        readable: mapValueOfType<bool>(json, r'readable')!,
-        writable: mapValueOfType<bool>(json, r'writable')!,
-      );
-    }
-    return null;
-  }
-
-  static List<MaintenanceDetectInstallStorageFolderDto> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <MaintenanceDetectInstallStorageFolderDto>[];
-    if (json is List && json.isNotEmpty) {
-      for (final row in json) {
-        final value = MaintenanceDetectInstallStorageFolderDto.fromJson(row);
-        if (value != null) {
-          result.add(value);
-        }
-      }
-    }
-    return result.toList(growable: growable);
-  }
-
-  static Map<String, MaintenanceDetectInstallStorageFolderDto> mapFromJson(dynamic json) {
-    final map = <String, MaintenanceDetectInstallStorageFolderDto>{};
-    if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
-      for (final entry in json.entries) {
-        final value = MaintenanceDetectInstallStorageFolderDto.fromJson(entry.value);
-        if (value != null) {
-          map[entry.key] = value;
-        }
-      }
-    }
-    return map;
-  }
-
-  // maps a json object with a list of MaintenanceDetectInstallStorageFolderDto-objects as value to a dart map
-  static Map<String, List<MaintenanceDetectInstallStorageFolderDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
-    final map = <String, List<MaintenanceDetectInstallStorageFolderDto>>{};
-    if (json is Map && json.isNotEmpty) {
-      // ignore: parameter_assignments
-      json = json.cast<String, dynamic>();
-      for (final entry in json.entries) {
-        map[entry.key] = MaintenanceDetectInstallStorageFolderDto.listFromJson(entry.value, growable: growable,);
-      }
-    }
-    return map;
-  }
-
-  /// The list of required keys that must be present in a JSON.
-  static const requiredKeys = <String>{
-    'files',
-    'folder',
-    'readable',
-    'writable',
-  };
-}
-

mobile/openapi/lib/model/maintenance_status_response_dto.dart

@@ -1,158 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.18
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-class MaintenanceStatusResponseDto {
-  /// Returns a new [MaintenanceStatusResponseDto] instance.
-  MaintenanceStatusResponseDto({
-    required this.action,
-    required this.active,
-    this.error,
-    this.progress,
-    this.task,
-  });
-
-  MaintenanceAction action;
-
-  bool active;
-
-  ///
-  /// Please note: This property should have been non-nullable! Since the specification file
-  /// does not include a default value (using the "default:" property), however, the generated
-  /// source code must fall back to having a nullable type.
-  /// Consider adding a "default:" property in the specification file to hide this note.
-  ///
-  String? error;
-
-  ///
-  /// Please note: This property should have been non-nullable! Since the specification file
-  /// does not include a default value (using the "default:" property), however, the generated
-  /// source code must fall back to having a nullable type.
-  /// Consider adding a "default:" property in the specification file to hide this note.
-  ///
-  num? progress;
-
-  ///
-  /// Please note: This property should have been non-nullable! Since the specification file
-  /// does not include a default value (using the "default:" property), however, the generated
-  /// source code must fall back to having a nullable type.
-  /// Consider adding a "default:" property in the specification file to hide this note.
-  ///
-  String? task;
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is MaintenanceStatusResponseDto &&
-    other.action == action &&
-    other.active == active &&
-    other.error == error &&
-    other.progress == progress &&
-    other.task == task;
-
-  @override
-  int get hashCode =>
-    // ignore: unnecessary_parenthesis
-    (action.hashCode) +
-    (active.hashCode) +
-    (error == null ? 0 : error!.hashCode) +
-    (progress == null ? 0 : progress!.hashCode) +
-    (task == null ? 0 : task!.hashCode);
-
-  @override
-  String toString() => 'MaintenanceStatusResponseDto[action=$action, active=$active, error=$error, progress=$progress, task=$task]';
-
-  Map<String, dynamic> toJson() {
-    final json = <String, dynamic>{};
-      json[r'action'] = this.action;
-      json[r'active'] = this.active;
-    if (this.error != null) {
-      json[r'error'] = this.error;
-    } else {
-    //  json[r'error'] = null;
-    }
-    if (this.progress != null) {
-      json[r'progress'] = this.progress;
-    } else {
-    //  json[r'progress'] = null;
-    }
-    if (this.task != null) {
-      json[r'task'] = this.task;
-    } else {
-    //  json[r'task'] = null;
-    }
-    return json;
-  }
-
-  /// Returns a new [MaintenanceStatusResponseDto] instance and imports its values from
-  /// [value] if it's a [Map], null otherwise.
-  // ignore: prefer_constructors_over_static_methods
-  static MaintenanceStatusResponseDto? fromJson(dynamic value) {
-    upgradeDto(value, "MaintenanceStatusResponseDto");
-    if (value is Map) {
-      final json = value.cast<String, dynamic>();
-
-      return MaintenanceStatusResponseDto(
-        action: MaintenanceAction.fromJson(json[r'action'])!,
-        active: mapValueOfType<bool>(json, r'active')!,
-        error: mapValueOfType<String>(json, r'error'),
-        progress: num.parse('${json[r'progress']}'),
-        task: mapValueOfType<String>(json, r'task'),
-      );
-    }
-    return null;
-  }
-
-  static List<MaintenanceStatusResponseDto> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <MaintenanceStatusResponseDto>[];
-    if (json is List && json.isNotEmpty) {
-      for (final row in json) {
-        final value = MaintenanceStatusResponseDto.fromJson(row);
-        if (value != null) {
-          result.add(value);
-        }
-      }
-    }
-    return result.toList(growable: growable);
-  }
-
-  static Map<String, MaintenanceStatusResponseDto> mapFromJson(dynamic json) {
-    final map = <String, MaintenanceStatusResponseDto>{};
-    if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
-      for (final entry in json.entries) {
-        final value = MaintenanceStatusResponseDto.fromJson(entry.value);
-        if (value != null) {
-          map[entry.key] = value;
-        }
-      }
-    }
-    return map;
-  }
-
-  // maps a json object with a list of MaintenanceStatusResponseDto-objects as value to a dart map
-  static Map<String, List<MaintenanceStatusResponseDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
-    final map = <String, List<MaintenanceStatusResponseDto>>{};
-    if (json is Map && json.isNotEmpty) {
-      // ignore: parameter_assignments
-      json = json.cast<String, dynamic>();
-      for (final entry in json.entries) {
-        map[entry.key] = MaintenanceStatusResponseDto.listFromJson(entry.value, growable: growable,);
-      }
-    }
-    return map;
-  }
-
-  /// The list of required keys that must be present in a JSON.
-  static const requiredKeys = <String>{
-    'action',
-    'active',
-  };
-}
-

mobile/openapi/lib/model/permission.dart

@@ -62,10 +62,6 @@ class Permission {
   static const authPeriodChangePassword = Permission._(r'auth.changePassword');
   static const authDevicePeriodDelete = Permission._(r'authDevice.delete');
   static const archivePeriodRead = Permission._(r'archive.read');
-  static const backupPeriodList = Permission._(r'backup.list');
-  static const backupPeriodDownload = Permission._(r'backup.download');
-  static const backupPeriodUpload = Permission._(r'backup.upload');
-  static const backupPeriodDelete = Permission._(r'backup.delete');
   static const duplicatePeriodRead = Permission._(r'duplicate.read');
   static const duplicatePeriodDelete = Permission._(r'duplicate.delete');
   static const facePeriodCreate = Permission._(r'face.create');
@@ -218,10 +214,6 @@ class Permission {
     authPeriodChangePassword,
     authDevicePeriodDelete,
     archivePeriodRead,
-    backupPeriodList,
-    backupPeriodDownload,
-    backupPeriodUpload,
-    backupPeriodDelete,
     duplicatePeriodRead,
     duplicatePeriodDelete,
     facePeriodCreate,
@@ -409,10 +401,6 @@ class PermissionTypeTransformer {
         case r'auth.changePassword': return Permission.authPeriodChangePassword;
         case r'authDevice.delete': return Permission.authDevicePeriodDelete;
         case r'archive.read': return Permission.archivePeriodRead;
-        case r'backup.list': return Permission.backupPeriodList;
-        case r'backup.download': return Permission.backupPeriodDownload;
-        case r'backup.upload': return Permission.backupPeriodUpload;
-        case r'backup.delete': return Permission.backupPeriodDelete;
         case r'duplicate.read': return Permission.duplicatePeriodRead;
         case r'duplicate.delete': return Permission.duplicatePeriodDelete;
         case r'face.create': return Permission.facePeriodCreate;

mobile/openapi/lib/model/set_maintenance_mode_dto.dart

@@ -14,41 +14,25 @@ class SetMaintenanceModeDto {
   /// Returns a new [SetMaintenanceModeDto] instance.
   SetMaintenanceModeDto({
     required this.action,
-    this.restoreBackupFilename,
   });
 
   MaintenanceAction action;
 
-  ///
-  /// Please note: This property should have been non-nullable! Since the specification file
-  /// does not include a default value (using the "default:" property), however, the generated
-  /// source code must fall back to having a nullable type.
-  /// Consider adding a "default:" property in the specification file to hide this note.
-  ///
-  String? restoreBackupFilename;
-
   @override
   bool operator ==(Object other) => identical(this, other) || other is SetMaintenanceModeDto &&
-    other.action == action &&
-    other.restoreBackupFilename == restoreBackupFilename;
+    other.action == action;
 
   @override
   int get hashCode =>
     // ignore: unnecessary_parenthesis
-    (action.hashCode) +
-    (restoreBackupFilename == null ? 0 : restoreBackupFilename!.hashCode);
+    (action.hashCode);
 
   @override
-  String toString() => 'SetMaintenanceModeDto[action=$action, restoreBackupFilename=$restoreBackupFilename]';
+  String toString() => 'SetMaintenanceModeDto[action=$action]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
       json[r'action'] = this.action;
-    if (this.restoreBackupFilename != null) {
-      json[r'restoreBackupFilename'] = this.restoreBackupFilename;
-    } else {
-    //  json[r'restoreBackupFilename'] = null;
-    }
     return json;
   }
 
@@ -62,7 +46,6 @@ class SetMaintenanceModeDto {
 
       return SetMaintenanceModeDto(
         action: MaintenanceAction.fromJson(json[r'action'])!,
-        restoreBackupFilename: mapValueOfType<String>(json, r'restoreBackupFilename'),
       );
     }
     return null;

mobile/openapi/lib/model/storage_folder.dart

@@ -1,97 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.18
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-
-class StorageFolder {
-  /// Instantiate a new enum with the provided [value].
-  const StorageFolder._(this.value);
-
-  /// The underlying value of this enum member.
-  final String value;
-
-  @override
-  String toString() => value;
-
-  String toJson() => value;
-
-  static const encodedVideo = StorageFolder._(r'encoded-video');
-  static const library_ = StorageFolder._(r'library');
-  static const upload = StorageFolder._(r'upload');
-  static const profile = StorageFolder._(r'profile');
-  static const thumbs = StorageFolder._(r'thumbs');
-  static const backups = StorageFolder._(r'backups');
-
-  /// List of all possible values in this [enum][StorageFolder].
-  static const values = <StorageFolder>[
-    encodedVideo,
-    library_,
-    upload,
-    profile,
-    thumbs,
-    backups,
-  ];
-
-  static StorageFolder? fromJson(dynamic value) => StorageFolderTypeTransformer().decode(value);
-
-  static List<StorageFolder> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <StorageFolder>[];
-    if (json is List && json.isNotEmpty) {
-      for (final row in json) {
-        final value = StorageFolder.fromJson(row);
-        if (value != null) {
-          result.add(value);
-        }
-      }
-    }
-    return result.toList(growable: growable);
-  }
-}
-
-/// Transformation class that can [encode] an instance of [StorageFolder] to String,
-/// and [decode] dynamic data back to [StorageFolder].
-class StorageFolderTypeTransformer {
-  factory StorageFolderTypeTransformer() => _instance ??= const StorageFolderTypeTransformer._();
-
-  const StorageFolderTypeTransformer._();
-
-  String encode(StorageFolder data) => data.value;
-
-  /// Decodes a [dynamic value][data] to a StorageFolder.
-  ///
-  /// If [allowNull] is true and the [dynamic value][data] cannot be decoded successfully,
-  /// then null is returned. However, if [allowNull] is false and the [dynamic value][data]
-  /// cannot be decoded successfully, then an [UnimplementedError] is thrown.
-  ///
-  /// The [allowNull] is very handy when an API changes and a new enum value is added or removed,
-  /// and users are still using an old app with the old code.
-  StorageFolder? decode(dynamic data, {bool allowNull = true}) {
-    if (data != null) {
-      switch (data) {
-        case r'encoded-video': return StorageFolder.encodedVideo;
-        case r'library': return StorageFolder.library_;
-        case r'upload': return StorageFolder.upload;
-        case r'profile': return StorageFolder.profile;
-        case r'thumbs': return StorageFolder.thumbs;
-        case r'backups': return StorageFolder.backups;
-        default:
-          if (!allowNull) {
-            throw ArgumentError('Unknown enum value to decode: $data');
-          }
-      }
-    }
-    return null;
-  }
-
-  /// Singleton [StorageFolderTypeTransformer] instance.
-  static StorageFolderTypeTransformer? _instance;
-}
-

open-api/immich-openapi-specs.json

@@ -322,237 +322,6 @@
         "x-immich-state": "Stable"
       }
     },
-    "/admin/database-backups": {
-      "delete": {
-        "description": "Delete a backup by its filename",
-        "operationId": "deleteDatabaseBackup",
-        "parameters": [],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/DatabaseBackupDeleteDto"
-              }
-            }
-          },
-          "required": true
-        },
-        "responses": {
-          "200": {
-            "description": ""
-          }
-        },
-        "security": [
-          {
-            "bearer": []
-          },
-          {
-            "cookie": []
-          },
-          {
-            "api_key": []
-          }
-        ],
-        "summary": "Delete database backup",
-        "tags": [
-          "Database Backups (admin)"
-        ],
-        "x-immich-admin-only": true,
-        "x-immich-history": [
-          {
-            "version": "v2.5.0",
-            "state": "Added"
-          },
-          {
-            "version": "v2.5.0",
-            "state": "Alpha"
-          }
-        ],
-        "x-immich-permission": "backup.delete",
-        "x-immich-state": "Alpha"
-      },
-      "get": {
-        "description": "Get the list of the successful and failed backups",
-        "operationId": "listDatabaseBackups",
-        "parameters": [],
-        "responses": {
-          "200": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/DatabaseBackupListResponseDto"
-                }
-              }
-            },
-            "description": ""
-          }
-        },
-        "security": [
-          {
-            "bearer": []
-          },
-          {
-            "cookie": []
-          },
-          {
-            "api_key": []
-          }
-        ],
-        "summary": "List database backups",
-        "tags": [
-          "Database Backups (admin)"
-        ],
-        "x-immich-admin-only": true,
-        "x-immich-history": [
-          {
-            "version": "v2.5.0",
-            "state": "Added"
-          },
-          {
-            "version": "v2.5.0",
-            "state": "Alpha"
-          }
-        ],
-        "x-immich-permission": "maintenance",
-        "x-immich-state": "Alpha"
-      }
-    },
-    "/admin/database-backups/start-restore": {
-      "post": {
-        "description": "Put Immich into maintenance mode to restore a backup (Immich must not be configured)",
-        "operationId": "startDatabaseRestoreFlow",
-        "parameters": [],
-        "responses": {
-          "201": {
-            "description": ""
-          }
-        },
-        "summary": "Start database backup restore flow",
-        "tags": [
-          "Database Backups (admin)"
-        ],
-        "x-immich-history": [
-          {
-            "version": "v2.5.0",
-            "state": "Added"
-          },
-          {
-            "version": "v2.5.0",
-            "state": "Alpha"
-          }
-        ],
-        "x-immich-state": "Alpha"
-      }
-    },
-    "/admin/database-backups/upload": {
-      "post": {
-        "description": "Uploads .sql/.sql.gz file to restore backup from",
-        "operationId": "uploadDatabaseBackup",
-        "parameters": [],
-        "requestBody": {
-          "content": {
-            "multipart/form-data": {
-              "schema": {
-                "$ref": "#/components/schemas/DatabaseBackupUploadDto"
-              }
-            }
-          },
-          "description": "Backup Upload",
-          "required": true
-        },
-        "responses": {
-          "201": {
-            "description": ""
-          }
-        },
-        "security": [
-          {
-            "bearer": []
-          },
-          {
-            "cookie": []
-          },
-          {
-            "api_key": []
-          }
-        ],
-        "summary": "Upload database backup",
-        "tags": [
-          "Database Backups (admin)"
-        ],
-        "x-immich-admin-only": true,
-        "x-immich-history": [
-          {
-            "version": "v2.5.0",
-            "state": "Added"
-          },
-          {
-            "version": "v2.5.0",
-            "state": "Alpha"
-          }
-        ],
-        "x-immich-permission": "backup.upload",
-        "x-immich-state": "Alpha"
-      }
-    },
-    "/admin/database-backups/{filename}": {
-      "get": {
-        "description": "Downloads the database backup file",
-        "operationId": "downloadDatabaseBackup",
-        "parameters": [
-          {
-            "name": "filename",
-            "required": true,
-            "in": "path",
-            "schema": {
-              "format": "string",
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "content": {
-              "application/octet-stream": {
-                "schema": {
-                  "format": "binary",
-                  "type": "string"
-                }
-              }
-            },
-            "description": ""
-          }
-        },
-        "security": [
-          {
-            "bearer": []
-          },
-          {
-            "cookie": []
-          },
-          {
-            "api_key": []
-          }
-        ],
-        "summary": "Download database backup",
-        "tags": [
-          "Database Backups (admin)"
-        ],
-        "x-immich-admin-only": true,
-        "x-immich-history": [
-          {
-            "version": "v2.5.0",
-            "state": "Added"
-          },
-          {
-            "version": "v2.5.0",
-            "state": "Alpha"
-          }
-        ],
-        "x-immich-permission": "backup.download",
-        "x-immich-state": "Alpha"
-      }
-    },
     "/admin/maintenance": {
       "post": {
         "description": "Put Immich into or take it out of maintenance mode",
@@ -603,53 +372,6 @@
         "x-immich-state": "Alpha"
       }
     },
-    "/admin/maintenance/detect-install": {
-      "get": {
-        "description": "Collect integrity checks and other heuristics about local data.",
-        "operationId": "detectPriorInstall",
-        "parameters": [],
-        "responses": {
-          "200": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/MaintenanceDetectInstallResponseDto"
-                }
-              }
-            },
-            "description": ""
-          }
-        },
-        "security": [
-          {
-            "bearer": []
-          },
-          {
-            "cookie": []
-          },
-          {
-            "api_key": []
-          }
-        ],
-        "summary": "Detect existing install",
-        "tags": [
-          "Maintenance (admin)"
-        ],
-        "x-immich-admin-only": true,
-        "x-immich-history": [
-          {
-            "version": "v2.5.0",
-            "state": "Added"
-          },
-          {
-            "version": "v2.5.0",
-            "state": "Alpha"
-          }
-        ],
-        "x-immich-permission": "maintenance",
-        "x-immich-state": "Alpha"
-      }
-    },
     "/admin/maintenance/login": {
       "post": {
         "description": "Login with maintenance token or cookie to receive current information and perform further actions.",
@@ -694,40 +416,6 @@
         "x-immich-state": "Alpha"
       }
     },
-    "/admin/maintenance/status": {
-      "get": {
-        "description": "Fetch information about the currently running maintenance action.",
-        "operationId": "getMaintenanceStatus",
-        "parameters": [],
-        "responses": {
-          "200": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/MaintenanceStatusResponseDto"
-                }
-              }
-            },
-            "description": ""
-          }
-        },
-        "summary": "Get maintenance mode status",
-        "tags": [
-          "Maintenance (admin)"
-        ],
-        "x-immich-history": [
-          {
-            "version": "v2.5.0",
-            "state": "Added"
-          },
-          {
-            "version": "v2.5.0",
-            "state": "Alpha"
-          }
-        ],
-        "x-immich-state": "Alpha"
-      }
-    },
     "/admin/notifications": {
       "post": {
         "description": "Create a new notification for a specific user.",
@@ -14973,10 +14661,6 @@
       "name": "Authentication (admin)",
       "description": "Administrative endpoints related to authentication."
     },
-    {
-      "name": "Database Backups (admin)",
-      "description": "Manage backups of the Immich database."
-    },
     {
       "name": "Deprecated",
       "description": "Deprecated endpoints that are planned for removal in the next major release."
@@ -17165,58 +16849,6 @@
         ],
         "type": "object"
       },
-      "DatabaseBackupDeleteDto": {
-        "properties": {
-          "backups": {
-            "items": {
-              "type": "string"
-            },
-            "type": "array"
-          }
-        },
-        "required": [
-          "backups"
-        ],
-        "type": "object"
-      },
-      "DatabaseBackupDto": {
-        "properties": {
-          "filename": {
-            "type": "string"
-          },
-          "filesize": {
-            "type": "number"
-          }
-        },
-        "required": [
-          "filename",
-          "filesize"
-        ],
-        "type": "object"
-      },
-      "DatabaseBackupListResponseDto": {
-        "properties": {
-          "backups": {
-            "items": {
-              "$ref": "#/components/schemas/DatabaseBackupDto"
-            },
-            "type": "array"
-          }
-        },
-        "required": [
-          "backups"
-        ],
-        "type": "object"
-      },
-      "DatabaseBackupUploadDto": {
-        "properties": {
-          "file": {
-            "format": "binary",
-            "type": "string"
-          }
-        },
-        "type": "object"
-      },
       "DownloadArchiveInfo": {
         "properties": {
           "assetIds": {
@@ -17884,9 +17516,7 @@
       "MaintenanceAction": {
         "enum": [
           "start",
-          "end",
-          "select_database_restore",
-          "restore_database"
+          "end"
         ],
         "type": "string"
       },
@@ -17901,47 +17531,6 @@
         ],
         "type": "object"
       },
-      "MaintenanceDetectInstallResponseDto": {
-        "properties": {
-          "storage": {
-            "items": {
-              "$ref": "#/components/schemas/MaintenanceDetectInstallStorageFolderDto"
-            },
-            "type": "array"
-          }
-        },
-        "required": [
-          "storage"
-        ],
-        "type": "object"
-      },
-      "MaintenanceDetectInstallStorageFolderDto": {
-        "properties": {
-          "files": {
-            "type": "number"
-          },
-          "folder": {
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/StorageFolder"
-              }
-            ]
-          },
-          "readable": {
-            "type": "boolean"
-          },
-          "writable": {
-            "type": "boolean"
-          }
-        },
-        "required": [
-          "files",
-          "folder",
-          "readable",
-          "writable"
-        ],
-        "type": "object"
-      },
       "MaintenanceLoginDto": {
         "properties": {
           "token": {
@@ -17950,34 +17539,6 @@
         },
         "type": "object"
       },
-      "MaintenanceStatusResponseDto": {
-        "properties": {
-          "action": {
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/MaintenanceAction"
-              }
-            ]
-          },
-          "active": {
-            "type": "boolean"
-          },
-          "error": {
-            "type": "string"
-          },
-          "progress": {
-            "type": "number"
-          },
-          "task": {
-            "type": "string"
-          }
-        },
-        "required": [
-          "action",
-          "active"
-        ],
-        "type": "object"
-      },
       "ManualJobName": {
         "enum": [
           "person-cleanup",
@@ -18946,10 +18507,6 @@
           "auth.changePassword",
           "authDevice.delete",
           "archive.read",
-          "backup.list",
-          "backup.download",
-          "backup.upload",
-          "backup.delete",
           "duplicate.read",
           "duplicate.delete",
           "face.create",
@@ -20728,9 +20285,6 @@
                 "$ref": "#/components/schemas/MaintenanceAction"
               }
             ]
-          },
-          "restoreBackupFilename": {
-            "type": "string"
           }
         },
         "required": [
@@ -21303,17 +20857,6 @@
         },
         "type": "object"
       },
-      "StorageFolder": {
-        "enum": [
-          "encoded-video",
-          "library",
-          "upload",
-          "profile",
-          "thumbs",
-          "backups"
-        ],
-        "type": "string"
-      },
       "SyncAckDeleteDto": {
         "properties": {
           "types": {

open-api/typescript-sdk/package.json

@@ -19,7 +19,7 @@
     "@oazapfts/runtime": "^1.0.2"
   },
   "devDependencies": {
-    "@types/node": "^24.10.8",
+    "@types/node": "^24.10.4",
     "typescript": "^5.3.3"
   },
   "repository": {

open-api/typescript-sdk/src/fetch-client.ts

@@ -40,31 +40,8 @@ export type ActivityStatisticsResponseDto = {
     comments: number;
     likes: number;
 };
-export type DatabaseBackupDeleteDto = {
-    backups: string[];
-};
-export type DatabaseBackupDto = {
-    filename: string;
-    filesize: number;
-};
-export type DatabaseBackupListResponseDto = {
-    backups: DatabaseBackupDto[];
-};
-export type DatabaseBackupUploadDto = {
-    file?: Blob;
-};
 export type SetMaintenanceModeDto = {
     action: MaintenanceAction;
-    restoreBackupFilename?: string;
-};
-export type MaintenanceDetectInstallStorageFolderDto = {
-    files: number;
-    folder: StorageFolder;
-    readable: boolean;
-    writable: boolean;
-};
-export type MaintenanceDetectInstallResponseDto = {
-    storage: MaintenanceDetectInstallStorageFolderDto[];
 };
 export type MaintenanceLoginDto = {
     token?: string;
@@ -72,13 +49,6 @@ export type MaintenanceLoginDto = {
 export type MaintenanceAuthDto = {
     username: string;
 };
-export type MaintenanceStatusResponseDto = {
-    action: MaintenanceAction;
-    active: boolean;
-    error?: string;
-    progress?: number;
-    task?: string;
-};
 export type NotificationCreateDto = {
     data?: object;
     description?: string | null;
@@ -1950,63 +1920,6 @@ export function unlinkAllOAuthAccountsAdmin(opts?: Oazapfts.RequestOpts) {
         method: "POST"
     }));
 }
-/**
- * Delete database backup
- */
-export function deleteDatabaseBackup({ databaseBackupDeleteDto }: {
-    databaseBackupDeleteDto: DatabaseBackupDeleteDto;
-}, opts?: Oazapfts.RequestOpts) {
-    return oazapfts.ok(oazapfts.fetchText("/admin/database-backups", oazapfts.json({
-        ...opts,
-        method: "DELETE",
-        body: databaseBackupDeleteDto
-    })));
-}
-/**
- * List database backups
- */
-export function listDatabaseBackups(opts?: Oazapfts.RequestOpts) {
-    return oazapfts.ok(oazapfts.fetchJson<{
-        status: 200;
-        data: DatabaseBackupListResponseDto;
-    }>("/admin/database-backups", {
-        ...opts
-    }));
-}
-/**
- * Start database backup restore flow
- */
-export function startDatabaseRestoreFlow(opts?: Oazapfts.RequestOpts) {
-    return oazapfts.ok(oazapfts.fetchText("/admin/database-backups/start-restore", {
-        ...opts,
-        method: "POST"
-    }));
-}
-/**
- * Upload database backup
- */
-export function uploadDatabaseBackup({ databaseBackupUploadDto }: {
-    databaseBackupUploadDto: DatabaseBackupUploadDto;
-}, opts?: Oazapfts.RequestOpts) {
-    return oazapfts.ok(oazapfts.fetchText("/admin/database-backups/upload", oazapfts.multipart({
-        ...opts,
-        method: "POST",
-        body: databaseBackupUploadDto
-    })));
-}
-/**
- * Download database backup
- */
-export function downloadDatabaseBackup({ filename }: {
-    filename: string;
-}, opts?: Oazapfts.RequestOpts) {
-    return oazapfts.ok(oazapfts.fetchBlob<{
-        status: 200;
-        data: Blob;
-    }>(`/admin/database-backups/${encodeURIComponent(filename)}`, {
-        ...opts
-    }));
-}
 /**
  * Set maintenance mode
  */
@@ -2019,17 +1932,6 @@ export function setMaintenanceMode({ setMaintenanceModeDto }: {
         body: setMaintenanceModeDto
     })));
 }
-/**
- * Detect existing install
- */
-export function detectPriorInstall(opts?: Oazapfts.RequestOpts) {
-    return oazapfts.ok(oazapfts.fetchJson<{
-        status: 200;
-        data: MaintenanceDetectInstallResponseDto;
-    }>("/admin/maintenance/detect-install", {
-        ...opts
-    }));
-}
 /**
  * Log into maintenance mode
  */
@@ -2045,17 +1947,6 @@ export function maintenanceLogin({ maintenanceLoginDto }: {
         body: maintenanceLoginDto
     })));
 }
-/**
- * Get maintenance mode status
- */
-export function getMaintenanceStatus(opts?: Oazapfts.RequestOpts) {
-    return oazapfts.ok(oazapfts.fetchJson<{
-        status: 200;
-        data: MaintenanceStatusResponseDto;
-    }>("/admin/maintenance/status", {
-        ...opts
-    }));
-}
 /**
  * Create a notification
  */
@@ -5406,17 +5297,7 @@ export enum UserAvatarColor {
 }
 export enum MaintenanceAction {
     Start = "start",
-    End = "end",
-    SelectDatabaseRestore = "select_database_restore",
-    RestoreDatabase = "restore_database"
-}
-export enum StorageFolder {
-    EncodedVideo = "encoded-video",
-    Library = "library",
-    Upload = "upload",
-    Profile = "profile",
-    Thumbs = "thumbs",
-    Backups = "backups"
+    End = "end"
 }
 export enum NotificationLevel {
     Success = "success",
@@ -5514,10 +5395,6 @@ export enum Permission {
     AuthChangePassword = "auth.changePassword",
     AuthDeviceDelete = "authDevice.delete",
     ArchiveRead = "archive.read",
-    BackupList = "backup.list",
-    BackupDownload = "backup.download",
-    BackupUpload = "backup.upload",
-    BackupDelete = "backup.delete",
     DuplicateRead = "duplicate.read",
     DuplicateDelete = "duplicate.delete",
     FaceCreate = "face.create",

package.json

@@ -3,7 +3,7 @@
   "version": "0.0.1",
   "description": "Monorepo for Immich",
   "private": true,
-  "packageManager": "pnpm@10.28.0+sha512.05df71d1421f21399e053fde567cea34d446fa02c76571441bfc1c7956e98e363088982d940465fd34480d4d90a0668bc12362f8aa88000a64e83d0b0e47be48",
+  "packageManager": "pnpm@10.27.0+sha512.72d699da16b1179c14ba9e64dc71c9a40988cbdc65c264cb0e489db7de917f20dcf4d64d8723625f2969ba52d4b7e2a1170682d9ac2a5dcaeaab732b7e16f04a",
   "engines": {
     "pnpm": ">=10.0.0"
   }

server/package.json

@@ -45,14 +45,14 @@
     "@nestjs/websockets": "^11.0.4",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/context-async-hooks": "^2.0.0",
-    "@opentelemetry/exporter-prometheus": "^0.210.0",
-    "@opentelemetry/instrumentation-http": "^0.210.0",
-    "@opentelemetry/instrumentation-ioredis": "^0.58.0",
-    "@opentelemetry/instrumentation-nestjs-core": "^0.56.0",
-    "@opentelemetry/instrumentation-pg": "^0.62.0",
+    "@opentelemetry/exporter-prometheus": "^0.208.0",
+    "@opentelemetry/instrumentation-http": "^0.208.0",
+    "@opentelemetry/instrumentation-ioredis": "^0.57.0",
+    "@opentelemetry/instrumentation-nestjs-core": "^0.55.0",
+    "@opentelemetry/instrumentation-pg": "^0.61.0",
     "@opentelemetry/resources": "^2.0.1",
     "@opentelemetry/sdk-metrics": "^2.0.1",
-    "@opentelemetry/sdk-node": "^0.210.0",
+    "@opentelemetry/sdk-node": "^0.208.0",
     "@opentelemetry/semantic-conventions": "^1.34.0",
     "@react-email/components": "^0.5.0",
     "@react-email/render": "^1.1.2",
@@ -135,7 +135,7 @@
     "@types/luxon": "^3.6.2",
     "@types/mock-fs": "^4.13.1",
     "@types/multer": "^2.0.0",
-    "@types/node": "^24.10.8",
+    "@types/node": "^24.10.4",
     "@types/nodemailer": "^7.0.0",
     "@types/picomatch": "^4.0.0",
     "@types/pngjs": "^6.0.5",

server/src/app.module.ts

@@ -10,7 +10,6 @@ import { IWorker } from 'src/constants';
 import { controllers } from 'src/controllers';
 import { ImmichWorker } from 'src/enum';
 import { MaintenanceAuthGuard } from 'src/maintenance/maintenance-auth.guard';
-import { MaintenanceHealthRepository } from 'src/maintenance/maintenance-health.repository';
 import { MaintenanceWebsocketRepository } from 'src/maintenance/maintenance-websocket.repository';
 import { MaintenanceWorkerController } from 'src/maintenance/maintenance-worker.controller';
 import { MaintenanceWorkerService } from 'src/maintenance/maintenance-worker.service';
@@ -22,11 +21,8 @@ import { LoggingInterceptor } from 'src/middleware/logging.interceptor';
 import { repositories } from 'src/repositories';
 import { AppRepository } from 'src/repositories/app.repository';
 import { ConfigRepository } from 'src/repositories/config.repository';
-import { DatabaseRepository } from 'src/repositories/database.repository';
 import { EventRepository } from 'src/repositories/event.repository';
 import { LoggingRepository } from 'src/repositories/logging.repository';
-import { ProcessRepository } from 'src/repositories/process.repository';
-import { StorageRepository } from 'src/repositories/storage.repository';
 import { SystemMetadataRepository } from 'src/repositories/system-metadata.repository';
 import { teardownTelemetry, TelemetryRepository } from 'src/repositories/telemetry.repository';
 import { WebsocketRepository } from 'src/repositories/websocket.repository';
@@ -107,12 +103,8 @@ export class ApiModule extends BaseModule {}
   providers: [
     ConfigRepository,
     LoggingRepository,
-    StorageRepository,
-    ProcessRepository,
-    DatabaseRepository,
     SystemMetadataRepository,
     AppRepository,
-    MaintenanceHealthRepository,
     MaintenanceWebsocketRepository,
     MaintenanceWorkerService,
     ...commonMiddleware,
@@ -124,14 +116,9 @@ export class MaintenanceModule {
   constructor(
     @Inject(IWorker) private worker: ImmichWorker,
     logger: LoggingRepository,
-    private maintenanceWorkerService: MaintenanceWorkerService,
   ) {
     logger.setAppName(this.worker);
   }
-
-  async onModuleInit() {
-    await this.maintenanceWorkerService.init();
-  }
 }
 
 @Module({

server/src/constants.ts

@@ -141,7 +141,6 @@ export const endpointTags: Record<ApiTag, string> = {
   [ApiTag.Assets]: 'An asset is an image or video that has been uploaded to Immich.',
   [ApiTag.Authentication]: 'Endpoints related to user authentication, including OAuth.',
   [ApiTag.AuthenticationAdmin]: 'Administrative endpoints related to authentication.',
-  [ApiTag.DatabaseBackups]: 'Manage backups of the Immich database.',
   [ApiTag.Deprecated]: 'Deprecated endpoints that are planned for removal in the next major release.',
   [ApiTag.Download]: 'Endpoints for downloading assets or collections of assets.',
   [ApiTag.Duplicates]: 'Endpoints for managing and identifying duplicate assets.',

server/src/controllers/database-backup.controller.ts

@@ -1,101 +0,0 @@
-import { Body, Controller, Delete, Get, Next, Param, Post, Res, UploadedFile, UseInterceptors } from '@nestjs/common';
-import { FileInterceptor } from '@nestjs/platform-express';
-import { ApiBody, ApiConsumes, ApiTags } from '@nestjs/swagger';
-import { NextFunction, Response } from 'express';
-import { Endpoint, HistoryBuilder } from 'src/decorators';
-import {
-  DatabaseBackupDeleteDto,
-  DatabaseBackupListResponseDto,
-  DatabaseBackupUploadDto,
-} from 'src/dtos/database-backup.dto';
-import { ApiTag, ImmichCookie, Permission } from 'src/enum';
-import { Authenticated, FileResponse, GetLoginDetails } from 'src/middleware/auth.guard';
-import { LoggingRepository } from 'src/repositories/logging.repository';
-import { LoginDetails } from 'src/services/auth.service';
-import { DatabaseBackupService } from 'src/services/database-backup.service';
-import { MaintenanceService } from 'src/services/maintenance.service';
-import { sendFile } from 'src/utils/file';
-import { respondWithCookie } from 'src/utils/response';
-import { FilenameParamDto } from 'src/validation';
-
-@ApiTags(ApiTag.DatabaseBackups)
-@Controller('admin/database-backups')
-export class DatabaseBackupController {
-  constructor(
-    private logger: LoggingRepository,
-    private service: DatabaseBackupService,
-    private maintenanceService: MaintenanceService,
-  ) {}
-
-  @Get()
-  @Endpoint({
-    summary: 'List database backups',
-    description: 'Get the list of the successful and failed backups',
-    history: new HistoryBuilder().added('v2.5.0').alpha('v2.5.0'),
-  })
-  @Authenticated({ permission: Permission.Maintenance, admin: true })
-  listDatabaseBackups(): Promise<DatabaseBackupListResponseDto> {
-    return this.service.listBackups();
-  }
-
-  @Get(':filename')
-  @FileResponse()
-  @Endpoint({
-    summary: 'Download database backup',
-    description: 'Downloads the database backup file',
-    history: new HistoryBuilder().added('v2.5.0').alpha('v2.5.0'),
-  })
-  @Authenticated({ permission: Permission.BackupDownload, admin: true })
-  async downloadDatabaseBackup(
-    @Param() { filename }: FilenameParamDto,
-    @Res() res: Response,
-    @Next() next: NextFunction,
-  ): Promise<void> {
-    await sendFile(res, next, () => this.service.downloadBackup(filename), this.logger);
-  }
-
-  @Delete()
-  @Endpoint({
-    summary: 'Delete database backup',
-    description: 'Delete a backup by its filename',
-    history: new HistoryBuilder().added('v2.5.0').alpha('v2.5.0'),
-  })
-  @Authenticated({ permission: Permission.BackupDelete, admin: true })
-  async deleteDatabaseBackup(@Body() dto: DatabaseBackupDeleteDto): Promise<void> {
-    return this.service.deleteBackup(dto.backups);
-  }
-
-  @Post('start-restore')
-  @Endpoint({
-    summary: 'Start database backup restore flow',
-    description: 'Put Immich into maintenance mode to restore a backup (Immich must not be configured)',
-    history: new HistoryBuilder().added('v2.5.0').alpha('v2.5.0'),
-  })
-  async startDatabaseRestoreFlow(
-    @GetLoginDetails() loginDetails: LoginDetails,
-    @Res({ passthrough: true }) res: Response,
-  ): Promise<void> {
-    const { jwt } = await this.maintenanceService.startRestoreFlow();
-    return respondWithCookie(res, undefined, {
-      isSecure: loginDetails.isSecure,
-      values: [{ key: ImmichCookie.MaintenanceToken, value: jwt }],
-    });
-  }
-
-  @Post('upload')
-  @Authenticated({ permission: Permission.BackupUpload, admin: true })
-  @ApiConsumes('multipart/form-data')
-  @ApiBody({ description: 'Backup Upload', type: DatabaseBackupUploadDto })
-  @Endpoint({
-    summary: 'Upload database backup',
-    description: 'Uploads .sql/.sql.gz file to restore backup from',
-    history: new HistoryBuilder().added('v2.5.0').alpha('v2.5.0'),
-  })
-  @UseInterceptors(FileInterceptor('file'))
-  uploadDatabaseBackup(
-    @UploadedFile()
-    file: Express.Multer.File,
-  ): Promise<void> {
-    return this.service.uploadBackup(file);
-  }
-}

server/src/controllers/index.ts

@@ -6,7 +6,6 @@ import { AssetMediaController } from 'src/controllers/asset-media.controller';
 import { AssetController } from 'src/controllers/asset.controller';
 import { AuthAdminController } from 'src/controllers/auth-admin.controller';
 import { AuthController } from 'src/controllers/auth.controller';
-import { DatabaseBackupController } from 'src/controllers/database-backup.controller';
 import { DownloadController } from 'src/controllers/download.controller';
 import { DuplicateController } from 'src/controllers/duplicate.controller';
 import { FaceController } from 'src/controllers/face.controller';
@@ -47,7 +46,6 @@ export const controllers = [
   AssetMediaController,
   AuthController,
   AuthAdminController,
-  DatabaseBackupController,
   DownloadController,
   DuplicateController,
   FaceController,

server/src/controllers/maintenance.controller.ts

@@ -1,15 +1,9 @@
-import { BadRequestException, Body, Controller, Get, Post, Res } from '@nestjs/common';
+import { BadRequestException, Body, Controller, Post, Res } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
 import { Response } from 'express';
 import { Endpoint, HistoryBuilder } from 'src/decorators';
 import { AuthDto } from 'src/dtos/auth.dto';
-import {
-  MaintenanceAuthDto,
-  MaintenanceDetectInstallResponseDto,
-  MaintenanceLoginDto,
-  MaintenanceStatusResponseDto,
-  SetMaintenanceModeDto,
-} from 'src/dtos/maintenance.dto';
+import { MaintenanceAuthDto, MaintenanceLoginDto, SetMaintenanceModeDto } from 'src/dtos/maintenance.dto';
 import { ApiTag, ImmichCookie, MaintenanceAction, Permission } from 'src/enum';
 import { Auth, Authenticated, GetLoginDetails } from 'src/middleware/auth.guard';
 import { LoginDetails } from 'src/services/auth.service';
@@ -21,27 +15,6 @@ import { respondWithCookie } from 'src/utils/response';
 export class MaintenanceController {
   constructor(private service: MaintenanceService) {}
 
-  @Get('status')
-  @Endpoint({
-    summary: 'Get maintenance mode status',
-    description: 'Fetch information about the currently running maintenance action.',
-    history: new HistoryBuilder().added('v2.5.0').alpha('v2.5.0'),
-  })
-  getMaintenanceStatus(): MaintenanceStatusResponseDto {
-    return this.service.getMaintenanceStatus();
-  }
-
-  @Get('detect-install')
-  @Endpoint({
-    summary: 'Detect existing install',
-    description: 'Collect integrity checks and other heuristics about local data.',
-    history: new HistoryBuilder().added('v2.5.0').alpha('v2.5.0'),
-  })
-  @Authenticated({ permission: Permission.Maintenance, admin: true })
-  detectPriorInstall(): Promise<MaintenanceDetectInstallResponseDto> {
-    return this.service.detectPriorInstall();
-  }
-
   @Post('login')
   @Endpoint({
     summary: 'Log into maintenance mode',
@@ -65,8 +38,8 @@ export class MaintenanceController {
     @GetLoginDetails() loginDetails: LoginDetails,
     @Res({ passthrough: true }) res: Response,
   ): Promise<void> {
-    if (dto.action !== MaintenanceAction.End) {
-      const { jwt } = await this.service.startMaintenance(dto, auth.user.name);
+    if (dto.action === MaintenanceAction.Start) {
+      const { jwt } = await this.service.startMaintenance(auth.user.name);
       return respondWithCookie(res, undefined, {
         isSecure: loginDetails.isSecure,
         values: [{ key: ImmichCookie.MaintenanceToken, value: jwt }],

server/src/cores/storage.core.ts

@@ -1,15 +1,7 @@
 import { randomUUID } from 'node:crypto';
 import { dirname, join, resolve } from 'node:path';
 import { StorageAsset } from 'src/database';
-import {
-  AssetFileType,
-  AssetPathType,
-  ImageFormat,
-  PathType,
-  PersonPathType,
-  RawExtractedFormat,
-  StorageFolder,
-} from 'src/enum';
+import { AssetFileType, AssetPathType, ImageFormat, PathType, PersonPathType, StorageFolder } from 'src/enum';
 import { AssetRepository } from 'src/repositories/asset.repository';
 import { ConfigRepository } from 'src/repositories/config.repository';
 import { CryptoRepository } from 'src/repositories/crypto.repository';
@@ -32,6 +24,15 @@ export interface MoveRequest {
   };
 }
 
+export type GeneratedImageType =
+  | AssetPathType.Preview
+  | AssetPathType.Thumbnail
+  | AssetPathType.FullSize
+  | AssetPathType.EditedPreview
+  | AssetPathType.EditedThumbnail
+  | AssetPathType.EditedFullSize;
+export type GeneratedAssetType = GeneratedImageType | AssetPathType.EncodedVideo;
+
 export type ThumbnailPathEntity = { id: string; ownerId: string };
 
 let instance: StorageCore | null;
@@ -110,19 +111,8 @@ export class StorageCore {
     return StorageCore.getNestedPath(StorageFolder.Thumbnails, person.ownerId, `${person.id}.jpeg`);
   }
 
-  static getImagePath(
-    asset: ThumbnailPathEntity,
-    {
-      fileType,
-      format,
-      isEdited,
-    }: { fileType: AssetFileType; format: ImageFormat | RawExtractedFormat; isEdited: boolean },
-  ) {
-    return StorageCore.getNestedPath(
-      StorageFolder.Thumbnails,
-      asset.ownerId,
-      `${asset.id}_${fileType}${isEdited ? '_edited' : ''}.${format}`,
-    );
+  static getImagePath(asset: ThumbnailPathEntity, type: GeneratedImageType, format: 'jpeg' | 'webp') {
+    return StorageCore.getNestedPath(StorageFolder.Thumbnails, asset.ownerId, `${asset.id}-${type}.${format}`);
   }
 
   static getEncodedVideoPath(asset: ThumbnailPathEntity) {
@@ -147,14 +137,14 @@ export class StorageCore {
     return normalizedPath.startsWith(normalizedAppMediaLocation);
   }
 
-  async moveAssetImage(asset: StorageAsset, fileType: AssetFileType, format: ImageFormat) {
+  async moveAssetImage(asset: StorageAsset, pathType: GeneratedImageType, format: ImageFormat) {
     const { id: entityId, files } = asset;
-    const oldFile = getAssetFile(files, fileType, { isEdited: false });
+    const oldFile = getAssetFile(files, pathType);
     return this.moveFile({
       entityId,
-      pathType: fileType,
+      pathType,
       oldPath: oldFile?.path || null,
-      newPath: StorageCore.getImagePath(asset, { fileType, format, isEdited: false }),
+      newPath: StorageCore.getImagePath(asset, pathType, format),
     });
   }
 
@@ -308,19 +298,19 @@ export class StorageCore {
       case AssetPathType.Original: {
         return this.assetRepository.update({ id, originalPath: newPath });
       }
-      case AssetFileType.FullSize: {
+      case AssetPathType.FullSize: {
         return this.assetRepository.upsertFile({ assetId: id, type: AssetFileType.FullSize, path: newPath });
       }
-      case AssetFileType.Preview: {
+      case AssetPathType.Preview: {
         return this.assetRepository.upsertFile({ assetId: id, type: AssetFileType.Preview, path: newPath });
       }
-      case AssetFileType.Thumbnail: {
+      case AssetPathType.Thumbnail: {
         return this.assetRepository.upsertFile({ assetId: id, type: AssetFileType.Thumbnail, path: newPath });
       }
       case AssetPathType.EncodedVideo: {
         return this.assetRepository.update({ id, encodedVideoPath: newPath });
       }
-      case AssetFileType.Sidecar: {
+      case AssetPathType.Sidecar: {
         return this.assetRepository.upsertFile({ assetId: id, type: AssetFileType.Sidecar, path: newPath });
       }
       case PersonPathType.Face: {

server/src/database.ts

@@ -39,7 +39,6 @@ export type AssetFile = {
   id: string;
   type: AssetFileType;
   path: string;
-  isEdited: boolean;
 };
 
 export type Library = {
@@ -345,7 +344,7 @@ export const columns = {
     'asset.width',
     'asset.height',
   ],
-  assetFiles: ['asset_file.id', 'asset_file.path', 'asset_file.type', 'asset_file.isEdited'],
+  assetFiles: ['asset_file.id', 'asset_file.path', 'asset_file.type'],
   authUser: ['user.id', 'user.name', 'user.email', 'user.isAdmin', 'user.quotaUsageInBytes', 'user.quotaSizeInBytes'],
   authApiKey: ['api_key.id', 'api_key.permissions'],
   authSession: ['session.id', 'session.updatedAt', 'session.pinExpiresAt', 'session.appVersion'],
@@ -458,7 +457,6 @@ export const columns = {
     'asset_exif.projectionType',
     'asset_exif.rating',
     'asset_exif.state',
-    'asset_exif.tags',
     'asset_exif.timeZone',
   ],
   plugin: [
@@ -482,5 +480,4 @@ export const lockableProperties = [
   'longitude',
   'rating',
   'timeZone',
-  'tags',
 ] as const;

server/src/dtos/database-backup.dto.ts

@@ -1,21 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { IsString } from 'class-validator';
-
-export class DatabaseBackupDto {
-  filename!: string;
-  filesize!: number;
-}
-
-export class DatabaseBackupListResponseDto {
-  backups!: DatabaseBackupDto[];
-}
-
-export class DatabaseBackupUploadDto {
-  @ApiProperty({ type: 'string', format: 'binary', required: false })
-  file?: any;
-}
-
-export class DatabaseBackupDeleteDto {
-  @IsString({ each: true })
-  backups!: string[];
-}

server/src/dtos/maintenance.dto.ts

@@ -1,14 +1,9 @@
-import { ValidateIf } from 'class-validator';
-import { MaintenanceAction, StorageFolder } from 'src/enum';
+import { MaintenanceAction } from 'src/enum';
 import { ValidateEnum, ValidateString } from 'src/validation';
 
 export class SetMaintenanceModeDto {
   @ValidateEnum({ enum: MaintenanceAction, name: 'MaintenanceAction' })
   action!: MaintenanceAction;
-
-  @ValidateIf((o) => o.action === MaintenanceAction.RestoreDatabase)
-  @ValidateString()
-  restoreBackupFilename?: string;
 }
 
 export class MaintenanceLoginDto {
@@ -19,26 +14,3 @@ export class MaintenanceLoginDto {
 export class MaintenanceAuthDto {
   username!: string;
 }
-
-export class MaintenanceStatusResponseDto {
-  active!: boolean;
-
-  @ValidateEnum({ enum: MaintenanceAction, name: 'MaintenanceAction' })
-  action!: MaintenanceAction;
-
-  progress?: number;
-  task?: string;
-  error?: string;
-}
-
-export class MaintenanceDetectInstallStorageFolderDto {
-  @ValidateEnum({ enum: StorageFolder, name: 'StorageFolder' })
-  folder!: StorageFolder;
-  readable!: boolean;
-  writable!: boolean;
-  files!: number;
-}
-
-export class MaintenanceDetectInstallResponseDto {
-  storage!: MaintenanceDetectInstallStorageFolderDto[];
-}

server/src/enum.ts

@@ -45,6 +45,9 @@ export enum AssetFileType {
   Preview = 'preview',
   Thumbnail = 'thumbnail',
   Sidecar = 'sidecar',
+  FullSizeEdited = 'fullsize_edited',
+  PreviewEdited = 'preview_edited',
+  ThumbnailEdited = 'thumbnail_edited',
 }
 
 export enum AlbumUserRole {
@@ -133,11 +136,6 @@ export enum Permission {
 
   ArchiveRead = 'archive.read',
 
-  BackupList = 'backup.list',
-  BackupDownload = 'backup.download',
-  BackupUpload = 'backup.upload',
-  BackupDelete = 'backup.delete',
-
   DuplicateRead = 'duplicate.read',
   DuplicateDelete = 'duplicate.delete',
 
@@ -366,7 +364,14 @@ export enum ManualJobName {
 
 export enum AssetPathType {
   Original = 'original',
+  FullSize = 'fullsize',
+  Preview = 'preview',
+  EditedFullSize = 'edited_fullsize',
+  EditedPreview = 'edited_preview',
+  EditedThumbnail = 'edited_thumbnail',
+  Thumbnail = 'thumbnail',
   EncodedVideo = 'encoded_video',
+  Sidecar = 'sidecar',
 }
 
 export enum PersonPathType {
@@ -377,7 +382,7 @@ export enum UserPathType {
   Profile = 'profile',
 }
 
-export type PathType = AssetFileType | AssetPathType | PersonPathType | UserPathType;
+export type PathType = AssetPathType | PersonPathType | UserPathType;
 
 export enum TranscodePolicy {
   All = 'all',
@@ -692,15 +697,12 @@ export enum DatabaseLock {
   MediaLocation = 700,
   GetSystemConfig = 69,
   BackupDatabase = 42,
-  MaintenanceOperation = 621,
   MemoryCreation = 777,
 }
 
 export enum MaintenanceAction {
   Start = 'start',
   End = 'end',
-  SelectDatabaseRestore = 'select_database_restore',
-  RestoreDatabase = 'restore_database',
 }
 
 export enum ExitCode {
@@ -847,7 +849,6 @@ export enum ApiTag {
   Authentication = 'Authentication',
   AuthenticationAdmin = 'Authentication (admin)',
   Assets = 'Assets',
-  DatabaseBackups = 'Database Backups (admin)',
   Deprecated = 'Deprecated',
   Download = 'Download',
   Duplicates = 'Duplicates',

server/src/main.ts

@@ -1,11 +1,11 @@
-import { Kysely, sql } from 'kysely';
+import { Kysely } from 'kysely';
 import { CommandFactory } from 'nest-commander';
 import { ChildProcess, fork } from 'node:child_process';
 import { dirname, join } from 'node:path';
 import { Worker } from 'node:worker_threads';
 import { PostgresError } from 'postgres';
 import { ImmichAdminModule } from 'src/app.module';
-import { DatabaseLock, ExitCode, ImmichWorker, LogLevel, SystemMetadataKey } from 'src/enum';
+import { ExitCode, ImmichWorker, LogLevel, SystemMetadataKey } from 'src/enum';
 import { ConfigRepository } from 'src/repositories/config.repository';
 import { SystemMetadataRepository } from 'src/repositories/system-metadata.repository';
 import { type DB } from 'src/schema';
@@ -35,18 +35,19 @@ class Workers {
     if (isMaintenanceMode) {
       this.startWorker(ImmichWorker.Maintenance);
     } else {
-      await this.waitForFreeLock();
-
       for (const worker of workers) {
         this.startWorker(worker);
       }
     }
   }
 
+  /**
+   * Initialise a short-lived Nest application to build configuration
+   * @returns System configuration
+   */
   private async isMaintenanceMode(): Promise<boolean> {
     const { database } = new ConfigRepository().getEnv();
-    const { log: _, ...kyselyConfig } = getKyselyConfig(database.config);
-    const kysely = new Kysely<DB>(kyselyConfig);
+    const kysely = new Kysely<DB>(getKyselyConfig(database.config));
     const systemMetadataRepository = new SystemMetadataRepository(kysely);
 
     try {
@@ -64,32 +65,6 @@ class Workers {
     }
   }
 
-  private async waitForFreeLock() {
-    const { database } = new ConfigRepository().getEnv();
-    const kysely = new Kysely<DB>(getKyselyConfig(database.config));
-
-    let locked = false;
-    while (!locked) {
-      locked = await kysely.connection().execute(async (conn) => {
-        const { rows } = await sql<{
-          pg_try_advisory_lock: boolean;
-        }>`SELECT pg_try_advisory_lock(${DatabaseLock.MaintenanceOperation})`.execute(conn);
-
-        const isLocked = rows[0].pg_try_advisory_lock;
-
-        if (isLocked) {
-          await sql`SELECT pg_advisory_unlock(${DatabaseLock.MaintenanceOperation})`.execute(conn);
-        }
-
-        return isLocked;
-      });
-
-      await new Promise((resolve) => setTimeout(resolve, 1000));
-    }
-
-    await kysely.destroy();
-  }
-
   /**
    * Start an individual worker
    * @param name Worker

server/src/maintenance/maintenance-health.repository.ts

@@ -1,67 +0,0 @@
-import { Injectable } from '@nestjs/common';
-import { fork } from 'node:child_process';
-import { dirname, join } from 'node:path';
-
-@Injectable()
-export class MaintenanceHealthRepository {
-  checkApiHealth(): Promise<void> {
-    return new Promise<void>((resolve, reject) => {
-      // eslint-disable-next-line unicorn/prefer-module
-      const basePath = dirname(__filename);
-      const workerFile = join(basePath, '..', 'workers', `api.js`);
-
-      const worker = fork(workerFile, [], {
-        execArgv: process.execArgv.filter((arg) => !arg.startsWith('--inspect')),
-        env: {
-          ...process.env,
-          IMMICH_HOST: '127.0.0.1',
-          IMMICH_PORT: '33001',
-        },
-        stdio: ['ignore', 'pipe', 'ignore', 'ipc'],
-      });
-
-      async function checkHealth() {
-        try {
-          const response = await fetch('http://127.0.0.1:33001/api/server/config');
-          const { isOnboarded } = await response.json();
-          if (isOnboarded) {
-            resolve();
-          } else {
-            reject(new Error('Server health check failed, no admin exists.'));
-          }
-        } catch (error) {
-          reject(error);
-        } finally {
-          if (worker.exitCode === null) {
-            worker.kill('SIGTERM');
-          }
-        }
-      }
-
-      let output = '',
-        alive = false;
-
-      worker.stdout?.on('data', (data) => {
-        if (alive) {
-          return;
-        }
-
-        output += data;
-
-        if (output.includes('Immich Server is listening')) {
-          alive = true;
-          void checkHealth();
-        }
-      });
-
-      worker.on('exit', reject);
-      worker.on('error', reject);
-
-      setTimeout(() => {
-        if (worker.exitCode === null) {
-          worker.kill('SIGTERM');
-        }
-      }, 20_000);
-    });
-  }
-}

server/src/maintenance/maintenance-websocket.repository.ts

@@ -7,24 +7,17 @@ import {
   WebSocketServer,
 } from '@nestjs/websockets';
 import { Server, Socket } from 'socket.io';
-import { MaintenanceAuthDto, MaintenanceStatusResponseDto } from 'src/dtos/maintenance.dto';
 import { AppRepository } from 'src/repositories/app.repository';
 import { AppRestartEvent, ArgsOf } from 'src/repositories/event.repository';
 import { LoggingRepository } from 'src/repositories/logging.repository';
 
-interface ServerEventMap {
-  AppRestart: [AppRestartEvent];
-  MaintenanceStatus: [MaintenanceStatusResponseDto];
-}
+export const serverEvents = ['AppRestart'] as const;
+export type ServerEvents = (typeof serverEvents)[number];
 
-interface ClientEventMap {
+export interface ClientEventMap {
   AppRestartV1: [AppRestartEvent];
-  MaintenanceStatusV1: [MaintenanceStatusResponseDto];
 }
 
-type AuthFn = (client: Socket) => Promise<MaintenanceAuthDto>;
-type StatusUpdateFn = (status: MaintenanceStatusResponseDto) => void;
-
 @WebSocketGateway({
   cors: true,
   path: '/api/socket.io',
@@ -32,11 +25,8 @@ type StatusUpdateFn = (status: MaintenanceStatusResponseDto) => void;
 })
 @Injectable()
 export class MaintenanceWebsocketRepository implements OnGatewayConnection, OnGatewayDisconnect, OnGatewayInit {
-  private authFn?: AuthFn;
-  private statusUpdateFn?: StatusUpdateFn;
-
   @WebSocketServer()
-  private server?: Server;
+  private websocketServer?: Server;
 
   constructor(
     private logger: LoggingRepository,
@@ -45,10 +35,10 @@ export class MaintenanceWebsocketRepository implements OnGatewayConnection, OnGa
     this.logger.setContext(MaintenanceWebsocketRepository.name);
   }
 
-  afterInit(server: Server) {
+  afterInit(websocketServer: Server) {
     this.logger.log('Initialized websocket server');
-    server.on('MaintenanceStatus', (status) => this.statusUpdateFn?.(status));
-    server.on('AppRestart', (event: ArgsOf<'AppRestart'>, ack?: (ok: 'ok') => void) => {
+
+    websocketServer.on('AppRestart', (event: ArgsOf<'AppRestart'>, ack?: (ok: 'ok') => void) => {
       this.logger.log(`Restarting due to event... ${JSON.stringify(event)}`);
 
       ack?.('ok');
@@ -56,40 +46,20 @@ export class MaintenanceWebsocketRepository implements OnGatewayConnection, OnGa
     });
   }
 
-  clientSend<T extends keyof ClientEventMap>(event: T, room: string, ...data: ClientEventMap[T]) {
-    this.server?.to(room).emit(event, ...data);
-  }
-
   clientBroadcast<T extends keyof ClientEventMap>(event: T, ...data: ClientEventMap[T]) {
-    this.server?.emit(event, ...data);
+    this.websocketServer?.emit(event, ...data);
   }
 
-  serverSend<T extends keyof ServerEventMap>(event: T, ...args: ServerEventMap[T]): void {
+  serverSend<T extends ServerEvents>(event: T, ...args: ArgsOf<T>): void {
     this.logger.debug(`Server event: ${event} (send)`);
-    this.server?.serverSideEmit(event, ...args);
+    this.websocketServer?.serverSideEmit(event, ...args);
   }
 
-  async handleConnection(client: Socket) {
-    try {
-      await this.authFn!(client);
-      await client.join('private');
-      this.logger.log(`Websocket Connect:    ${client.id} (private)`);
-    } catch {
-      await client.join('public');
-      this.logger.log(`Websocket Connect:    ${client.id} (public)`);
-    }
+  handleConnection(client: Socket) {
+    this.logger.log(`Websocket Connect:    ${client.id}`);
   }
 
-  async handleDisconnect(client: Socket) {
+  handleDisconnect(client: Socket) {
     this.logger.log(`Websocket Disconnect: ${client.id}`);
-    await Promise.allSettled([client.leave('private'), client.leave('public')]);
-  }
-
-  setAuthFn(fn: (client: Socket) => Promise<MaintenanceAuthDto>) {
-    this.authFn = fn;
-  }
-
-  setStatusUpdateFn(fn: (status: MaintenanceStatusResponseDto) => void) {
-    this.statusUpdateFn = fn;
   }
 }

server/src/maintenance/maintenance-worker.controller.ts

@@ -1,114 +1,23 @@
-import {
-  Body,
-  Controller,
-  Delete,
-  Get,
-  Next,
-  Param,
-  Post,
-  Req,
-  Res,
-  UploadedFile,
-  UseInterceptors,
-} from '@nestjs/common';
-import { FileInterceptor } from '@nestjs/platform-express';
-import { NextFunction, Request, Response } from 'express';
-import {
-  MaintenanceAuthDto,
-  MaintenanceDetectInstallResponseDto,
-  MaintenanceLoginDto,
-  MaintenanceStatusResponseDto,
-  SetMaintenanceModeDto,
-} from 'src/dtos/maintenance.dto';
-import { ServerConfigDto, ServerVersionResponseDto } from 'src/dtos/server.dto';
-import { ImmichCookie } from 'src/enum';
+import { Body, Controller, Get, Post, Req, Res } from '@nestjs/common';
+import { Request, Response } from 'express';
+import { MaintenanceAuthDto, MaintenanceLoginDto, SetMaintenanceModeDto } from 'src/dtos/maintenance.dto';
+import { ServerConfigDto } from 'src/dtos/server.dto';
+import { ImmichCookie, MaintenanceAction } from 'src/enum';
 import { MaintenanceRoute } from 'src/maintenance/maintenance-auth.guard';
 import { MaintenanceWorkerService } from 'src/maintenance/maintenance-worker.service';
 import { GetLoginDetails } from 'src/middleware/auth.guard';
-import { LoggingRepository } from 'src/repositories/logging.repository';
 import { LoginDetails } from 'src/services/auth.service';
-import { sendFile } from 'src/utils/file';
 import { respondWithCookie } from 'src/utils/response';
-import { FilenameParamDto } from 'src/validation';
-
-import type { DatabaseBackupController as _DatabaseBackupController } from 'src/controllers/database-backup.controller';
-import type { ServerController as _ServerController } from 'src/controllers/server.controller';
-import { DatabaseBackupDeleteDto, DatabaseBackupListResponseDto } from 'src/dtos/database-backup.dto';
 
 @Controller()
 export class MaintenanceWorkerController {
-  constructor(
-    private logger: LoggingRepository,
-    private service: MaintenanceWorkerService,
-  ) {}
+  constructor(private service: MaintenanceWorkerService) {}
 
-  /**
-   * {@link _ServerController.getServerConfig }
-   */
   @Get('server/config')
-  getServerConfig(): ServerConfigDto {
+  getServerConfig(): Promise<ServerConfigDto> {
     return this.service.getSystemConfig();
   }
 
-  @Get('server/version')
-  getServerVersion(): ServerVersionResponseDto {
-    return this.service.getVersion();
-  }
-
-  /**
-   * {@link _DatabaseBackupController.listDatabaseBackups}
-   */
-  @Get('admin/database-backups')
-  @MaintenanceRoute()
-  listDatabaseBackups(): Promise<DatabaseBackupListResponseDto> {
-    return this.service.listBackups();
-  }
-
-  /**
-   * {@link _DatabaseBackupController.downloadDatabaseBackup}
-   */
-  @Get('admin/database-backups/:filename')
-  @MaintenanceRoute()
-  async downloadDatabaseBackup(
-    @Param() { filename }: FilenameParamDto,
-    @Res() res: Response,
-    @Next() next: NextFunction,
-  ) {
-    await sendFile(res, next, () => this.service.downloadBackup(filename), this.logger);
-  }
-
-  /**
-   * {@link _DatabaseBackupController.deleteDatabaseBackup}
-   */
-  @Delete('admin/database-backups')
-  @MaintenanceRoute()
-  async deleteDatabaseBackup(@Body() dto: DatabaseBackupDeleteDto): Promise<void> {
-    return this.service.deleteBackup(dto.backups);
-  }
-
-  /**
-   * {@link _DatabaseBackupController.uploadDatabaseBackup}
-   */
-  @Post('admin/database-backups/upload')
-  @MaintenanceRoute()
-  @UseInterceptors(FileInterceptor('file'))
-  uploadDatabaseBackup(
-    @UploadedFile()
-    file: Express.Multer.File,
-  ): Promise<void> {
-    return this.service.uploadBackup(file);
-  }
-
-  @Get('admin/maintenance/status')
-  maintenanceStatus(@Req() request: Request): Promise<MaintenanceStatusResponseDto> {
-    return this.service.status(request.cookies[ImmichCookie.MaintenanceToken]);
-  }
-
-  @Get('admin/maintenance/detect-install')
-  detectPriorInstall(): Promise<MaintenanceDetectInstallResponseDto> {
-    return this.service.detectPriorInstall();
-  }
-
   @Post('admin/maintenance/login')
   async maintenanceLogin(
     @Req() request: Request,
@@ -126,7 +35,9 @@ export class MaintenanceWorkerController {
 
   @Post('admin/maintenance')
   @MaintenanceRoute()
-  setMaintenanceMode(@Body() dto: SetMaintenanceModeDto): void {
-    void this.service.setAction(dto);
+  async setMaintenanceMode(@Body() dto: SetMaintenanceModeDto): Promise<void> {
+    if (dto.action === MaintenanceAction.End) {
+      await this.service.endMaintenance();
+    }
   }
 }

server/src/maintenance/maintenance-worker.service.spec.ts

@@ -1,51 +1,25 @@
-import { BadRequestException, UnauthorizedException } from '@nestjs/common';
+import { UnauthorizedException } from '@nestjs/common';
 import { SignJWT } from 'jose';
-import { DateTime } from 'luxon';
-import { PassThrough, Readable } from 'node:stream';
-import { StorageCore } from 'src/cores/storage.core';
-import { MaintenanceAction, StorageFolder, SystemMetadataKey } from 'src/enum';
-import { MaintenanceHealthRepository } from 'src/maintenance/maintenance-health.repository';
+import { SystemMetadataKey } from 'src/enum';
 import { MaintenanceWebsocketRepository } from 'src/maintenance/maintenance-websocket.repository';
 import { MaintenanceWorkerService } from 'src/maintenance/maintenance-worker.service';
-import { automock, AutoMocked, getMocks, mockDuplex, mockSpawn, ServiceMocks } from 'test/utils';
-
-function* mockData() {
-  yield '';
-}
+import { automock, getMocks, ServiceMocks } from 'test/utils';
 
 describe(MaintenanceWorkerService.name, () => {
   let sut: MaintenanceWorkerService;
   let mocks: ServiceMocks;
-  let maintenanceWebsocketRepositoryMock: AutoMocked<MaintenanceWebsocketRepository>;
-  let maintenanceHealthRepositoryMock: AutoMocked<MaintenanceHealthRepository>;
+  let maintenanceWorkerRepositoryMock: MaintenanceWebsocketRepository;
 
   beforeEach(() => {
     mocks = getMocks();
-    maintenanceWebsocketRepositoryMock = automock(MaintenanceWebsocketRepository, {
-      args: [mocks.logger],
-      strict: false,
-    });
-    maintenanceHealthRepositoryMock = automock(MaintenanceHealthRepository, {
-      args: [mocks.logger],
-      strict: false,
-    });
-
+    maintenanceWorkerRepositoryMock = automock(MaintenanceWebsocketRepository, { args: [mocks.logger], strict: false });
     sut = new MaintenanceWorkerService(
       mocks.logger as never,
       mocks.app,
       mocks.config,
       mocks.systemMetadata as never,
-      maintenanceWebsocketRepositoryMock,
-      maintenanceHealthRepositoryMock,
-      mocks.storage as never,
-      mocks.process,
-      mocks.database as never,
+      maintenanceWorkerRepositoryMock,
     );
-
-    sut.mock({
-      active: true,
-      action: MaintenanceAction.Start,
-    });
   });
 
   it('should work', () => {
@@ -53,43 +27,14 @@ describe(MaintenanceWorkerService.name, () => {
   });
 
   describe('getSystemConfig', () => {
-    it('should respond the server is in maintenance mode', () => {
-      expect(sut.getSystemConfig()).toMatchObject(
+    it('should respond the server is in maintenance mode', async () => {
+      await expect(sut.getSystemConfig()).resolves.toMatchObject(
         expect.objectContaining({
           maintenanceMode: true,
         }),
       );
 
-      expect(mocks.systemMetadata.get).toHaveBeenCalledTimes(0);
-    });
-  });
-
-  describe.skip('ssr');
-  describe.skip('detectMediaLocation');
-
-  describe('setStatus', () => {
-    it('should broadcast status', () => {
-      sut.setStatus({
-        active: true,
-        action: MaintenanceAction.Start,
-        task: 'abc',
-        error: 'def',
-      });
-
-      expect(maintenanceWebsocketRepositoryMock.serverSend).toHaveBeenCalled();
-      expect(maintenanceWebsocketRepositoryMock.clientSend).toHaveBeenCalledTimes(2);
-      expect(maintenanceWebsocketRepositoryMock.clientSend).toHaveBeenCalledWith('MaintenanceStatusV1', 'private', {
-        active: true,
-        action: 'start',
-        task: 'abc',
-        error: 'def',
-      });
-      expect(maintenanceWebsocketRepositoryMock.clientSend).toHaveBeenCalledWith('MaintenanceStatusV1', 'public', {
-        active: true,
-        action: 'start',
-        task: 'abc',
-        error: 'Something went wrong, see logs!',
-      });
+      expect(mocks.systemMetadata.get).toHaveBeenCalled();
     });
   });
 
@@ -97,14 +42,7 @@ describe(MaintenanceWorkerService.name, () => {
     const RE_LOGIN_URL = /https:\/\/my.immich.app\/maintenance\?token=([A-Za-z0-9-_]*\.[A-Za-z0-9-_]*\.[A-Za-z0-9-_]*)/;
 
     it('should log a valid login URL', async () => {
-      mocks.systemMetadata.get.mockResolvedValue({
-        isMaintenanceMode: true,
-        secret: 'secret',
-        action: {
-          action: MaintenanceAction.Start,
-        },
-      });
-
+      mocks.systemMetadata.get.mockResolvedValue({ isMaintenanceMode: true, secret: 'secret' });
       await expect(sut.logSecret()).resolves.toBeUndefined();
       expect(mocks.logger.log).toHaveBeenCalledWith(expect.stringMatching(RE_LOGIN_URL));
 
@@ -125,13 +63,7 @@ describe(MaintenanceWorkerService.name, () => {
     });
 
     it('should parse cookie properly', async () => {
-      mocks.systemMetadata.get.mockResolvedValue({
-        isMaintenanceMode: true,
-        secret: 'secret',
-        action: {
-          action: MaintenanceAction.Start,
-        },
-      });
+      mocks.systemMetadata.get.mockResolvedValue({ isMaintenanceMode: true, secret: 'secret' });
 
       await expect(
         sut.authenticate({
@@ -141,102 +73,13 @@ describe(MaintenanceWorkerService.name, () => {
     });
   });
 
-  describe('status', () => {
-    beforeEach(() => {
-      sut.mock({
-        active: true,
-        action: MaintenanceAction.Start,
-        error: 'secret value!',
-      });
-    });
-
-    it('generates private status', async () => {
-      const jwt = await new SignJWT({ _mockValue: true })
-        .setProtectedHeader({ alg: 'HS256' })
-        .setIssuedAt()
-        .setExpirationTime('4h')
-        .sign(new TextEncoder().encode('secret'));
-
-      await expect(sut.status(jwt)).resolves.toEqual(
-        expect.objectContaining({
-          error: 'secret value!',
-        }),
-      );
-    });
-
-    it('generates public status', async () => {
-      await expect(sut.status()).resolves.toEqual(
-        expect.objectContaining({
-          error: 'Something went wrong, see logs!',
-        }),
-      );
-    });
-  });
-
-  describe('detectPriorInstall', () => {
-    it('generate report about prior installation', async () => {
-      mocks.storage.readdir.mockResolvedValue(['.immich', 'file1', 'file2']);
-      mocks.storage.readFile.mockResolvedValue(undefined as never);
-      mocks.storage.overwriteFile.mockRejectedValue(undefined as never);
-
-      await expect(sut.detectPriorInstall()).resolves.toMatchInlineSnapshot(`
-        {
-          "storage": [
-            {
-              "files": 2,
-              "folder": "encoded-video",
-              "readable": true,
-              "writable": false,
-            },
-            {
-              "files": 2,
-              "folder": "library",
-              "readable": true,
-              "writable": false,
-            },
-            {
-              "files": 2,
-              "folder": "upload",
-              "readable": true,
-              "writable": false,
-            },
-            {
-              "files": 2,
-              "folder": "profile",
-              "readable": true,
-              "writable": false,
-            },
-            {
-              "files": 2,
-              "folder": "thumbs",
-              "readable": true,
-              "writable": false,
-            },
-            {
-              "files": 2,
-              "folder": "backups",
-              "readable": true,
-              "writable": false,
-            },
-          ],
-        }
-      `);
-    });
-  });
-
   describe('login', () => {
     it('should fail without token', async () => {
       await expect(sut.login()).rejects.toThrowError(new UnauthorizedException('Missing JWT Token'));
     });
 
     it('should fail with expired JWT', async () => {
-      mocks.systemMetadata.get.mockResolvedValue({
-        isMaintenanceMode: true,
-        secret: 'secret',
-        action: {
-          action: MaintenanceAction.Start,
-        },
-      });
+      mocks.systemMetadata.get.mockResolvedValue({ isMaintenanceMode: true, secret: 'secret' });
 
       const jwt = await new SignJWT({})
         .setProtectedHeader({ alg: 'HS256' })
@@ -248,13 +91,7 @@ describe(MaintenanceWorkerService.name, () => {
     });
 
     it('should succeed with valid JWT', async () => {
-      mocks.systemMetadata.get.mockResolvedValue({
-        isMaintenanceMode: true,
-        secret: 'secret',
-        action: {
-          action: MaintenanceAction.Start,
-        },
-      });
+      mocks.systemMetadata.get.mockResolvedValue({ isMaintenanceMode: true, secret: 'secret' });
 
       const jwt = await new SignJWT({ _mockValue: true })
         .setProtectedHeader({ alg: 'HS256' })
@@ -270,275 +107,22 @@ describe(MaintenanceWorkerService.name, () => {
     });
   });
 
-  describe.skip('setAction'); // just calls setStatus+runAction
-
-  /**
-   * Actions
-   */
-
-  describe('action: start', () => {
-    it('should not do anything', async () => {
-      await sut.runAction({
-        action: MaintenanceAction.Start,
-      });
-
-      expect(mocks.logger.log).toHaveBeenCalledTimes(0);
-    });
-  });
-
-  describe('action: end', () => {
+  describe('endMaintenance', () => {
     it('should set maintenance mode', async () => {
       mocks.systemMetadata.get.mockResolvedValue({ isMaintenanceMode: false });
-      await sut.runAction({
-        action: MaintenanceAction.End,
-      });
+      await expect(sut.endMaintenance()).resolves.toBeUndefined();
 
       expect(mocks.systemMetadata.set).toHaveBeenCalledWith(SystemMetadataKey.MaintenanceMode, {
         isMaintenanceMode: false,
       });
 
-      expect(maintenanceWebsocketRepositoryMock.clientBroadcast).toHaveBeenCalledWith('AppRestartV1', {
+      expect(maintenanceWorkerRepositoryMock.clientBroadcast).toHaveBeenCalledWith('AppRestartV1', {
         isMaintenanceMode: false,
       });
 
-      expect(maintenanceWebsocketRepositoryMock.serverSend).toHaveBeenCalledWith('AppRestart', {
+      expect(maintenanceWorkerRepositoryMock.serverSend).toHaveBeenCalledWith('AppRestart', {
         isMaintenanceMode: false,
       });
     });
   });
-
-  describe('action: restore database', () => {
-    beforeEach(() => {
-      mocks.database.tryLock.mockResolvedValueOnce(true);
-
-      mocks.storage.readdir.mockResolvedValue([]);
-      mocks.process.spawn.mockReturnValue(mockSpawn(0, 'data', ''));
-      mocks.process.spawnDuplexStream.mockImplementation(() => mockDuplex('command', 0, 'data', ''));
-      mocks.process.fork.mockImplementation(() => mockSpawn(0, 'Immich Server is listening', ''));
-      mocks.storage.rename.mockResolvedValue();
-      mocks.storage.unlink.mockResolvedValue();
-      mocks.storage.createPlainReadStream.mockReturnValue(Readable.from(mockData()));
-      mocks.storage.createWriteStream.mockReturnValue(new PassThrough());
-      mocks.storage.createGzip.mockReturnValue(new PassThrough());
-      mocks.storage.createGunzip.mockReturnValue(new PassThrough());
-    });
-
-    it('should update maintenance mode state', async () => {
-      await sut.runAction({
-        action: MaintenanceAction.RestoreDatabase,
-        restoreBackupFilename: 'filename',
-      });
-
-      expect(mocks.database.tryLock).toHaveBeenCalled();
-      expect(mocks.logger.log).toHaveBeenCalledWith('Running maintenance action restore_database');
-
-      expect(mocks.systemMetadata.set).toHaveBeenCalledWith(SystemMetadataKey.MaintenanceMode, {
-        isMaintenanceMode: true,
-        secret: 'secret',
-        action: {
-          action: 'start',
-        },
-      });
-    });
-
-    it('should fail to restore invalid backup', async () => {
-      await sut.runAction({
-        action: MaintenanceAction.RestoreDatabase,
-        restoreBackupFilename: 'filename',
-      });
-
-      expect(maintenanceWebsocketRepositoryMock.clientSend).toHaveBeenCalledWith('MaintenanceStatusV1', 'private', {
-        active: true,
-        action: MaintenanceAction.RestoreDatabase,
-        error: 'Error: Invalid backup file format!',
-        task: 'error',
-      });
-    });
-
-    it('should successfully run a backup', async () => {
-      await sut.runAction({
-        action: MaintenanceAction.RestoreDatabase,
-        restoreBackupFilename: 'development-filename.sql',
-      });
-
-      expect(maintenanceWebsocketRepositoryMock.clientSend).toHaveBeenCalledWith(
-        'MaintenanceStatusV1',
-        expect.any(String),
-        {
-          active: true,
-          action: MaintenanceAction.RestoreDatabase,
-          task: 'ready',
-          progress: expect.any(Number),
-        },
-      );
-
-      expect(maintenanceWebsocketRepositoryMock.clientSend).toHaveBeenLastCalledWith(
-        'MaintenanceStatusV1',
-        expect.any(String),
-        {
-          active: true,
-          action: 'end',
-        },
-      );
-
-      expect(maintenanceHealthRepositoryMock.checkApiHealth).toHaveBeenCalled();
-      expect(mocks.process.spawnDuplexStream).toHaveBeenCalledTimes(3);
-    });
-
-    it('should fail if backup creation fails', async () => {
-      mocks.process.spawnDuplexStream.mockReturnValueOnce(mockDuplex('pg_dump', 1, '', 'error'));
-
-      await sut.runAction({
-        action: MaintenanceAction.RestoreDatabase,
-        restoreBackupFilename: 'development-filename.sql',
-      });
-
-      expect(maintenanceWebsocketRepositoryMock.clientSend).toHaveBeenCalledWith('MaintenanceStatusV1', 'private', {
-        active: true,
-        action: MaintenanceAction.RestoreDatabase,
-        error: 'Error: pg_dump non-zero exit code (1)\nerror',
-        task: 'error',
-      });
-
-      expect(maintenanceWebsocketRepositoryMock.clientSend).toHaveBeenLastCalledWith(
-        'MaintenanceStatusV1',
-        expect.any(String),
-        expect.objectContaining({
-          task: 'error',
-        }),
-      );
-    });
-
-    it('should fail if restore itself fails', async () => {
-      mocks.process.spawnDuplexStream
-        .mockReturnValueOnce(mockDuplex('pg_dump', 0, 'data', ''))
-        .mockReturnValueOnce(mockDuplex('gzip', 0, 'data', ''))
-        .mockReturnValueOnce(mockDuplex('psql', 1, '', 'error'));
-
-      await sut.runAction({
-        action: MaintenanceAction.RestoreDatabase,
-        restoreBackupFilename: 'development-filename.sql',
-      });
-
-      expect(maintenanceWebsocketRepositoryMock.clientSend).toHaveBeenCalledWith('MaintenanceStatusV1', 'private', {
-        active: true,
-        action: MaintenanceAction.RestoreDatabase,
-        error: 'Error: psql non-zero exit code (1)\nerror',
-        task: 'error',
-      });
-
-      expect(maintenanceWebsocketRepositoryMock.clientSend).toHaveBeenLastCalledWith(
-        'MaintenanceStatusV1',
-        expect.any(String),
-        expect.objectContaining({
-          task: 'error',
-        }),
-      );
-    });
-
-    it('should rollback if database migrations fail', async () => {
-      mocks.database.runMigrations.mockRejectedValue(new Error('Migrations Error'));
-
-      await sut.runAction({
-        action: MaintenanceAction.RestoreDatabase,
-        restoreBackupFilename: 'development-filename.sql',
-      });
-
-      expect(maintenanceWebsocketRepositoryMock.clientSend).toHaveBeenCalledWith('MaintenanceStatusV1', 'private', {
-        active: true,
-        action: MaintenanceAction.RestoreDatabase,
-        error: 'Error: Migrations Error',
-        task: 'error',
-      });
-
-      expect(maintenanceHealthRepositoryMock.checkApiHealth).toHaveBeenCalledTimes(0);
-      expect(mocks.process.spawnDuplexStream).toHaveBeenCalledTimes(4);
-    });
-
-    it('should rollback if API healthcheck fails', async () => {
-      maintenanceHealthRepositoryMock.checkApiHealth.mockRejectedValue(new Error('Health Error'));
-
-      await sut.runAction({
-        action: MaintenanceAction.RestoreDatabase,
-        restoreBackupFilename: 'development-filename.sql',
-      });
-
-      expect(maintenanceWebsocketRepositoryMock.clientSend).toHaveBeenCalledWith('MaintenanceStatusV1', 'private', {
-        active: true,
-        action: MaintenanceAction.RestoreDatabase,
-        error: 'Error: Health Error',
-        task: 'error',
-      });
-
-      expect(maintenanceHealthRepositoryMock.checkApiHealth).toHaveBeenCalled();
-      expect(mocks.process.spawnDuplexStream).toHaveBeenCalledTimes(4);
-    });
-  });
-
-  /**
-   * Backups
-   */
-
-  describe('listBackups', () => {
-    it('should give us all backups', async () => {
-      mocks.storage.readdir.mockResolvedValue([
-        `immich-db-backup-${DateTime.fromISO('2025-07-25T11:02:16Z').toFormat("yyyyLLdd'T'HHmmss")}-v1.234.5-pg14.5.sql.gz.tmp`,
-        `immich-db-backup-${DateTime.fromISO('2025-07-27T11:01:16Z').toFormat("yyyyLLdd'T'HHmmss")}-v1.234.5-pg14.5.sql.gz`,
-        'immich-db-backup-1753789649000.sql.gz',
-        `immich-db-backup-${DateTime.fromISO('2025-07-29T11:01:16Z').toFormat("yyyyLLdd'T'HHmmss")}-v1.234.5-pg14.5.sql.gz`,
-      ]);
-      mocks.storage.stat.mockResolvedValue({ size: 1024 } as any);
-
-      await expect(sut.listBackups()).resolves.toMatchObject({
-        backups: [
-          { filename: 'immich-db-backup-20250729T110116-v1.234.5-pg14.5.sql.gz', filesize: 1024 },
-          { filename: 'immich-db-backup-20250727T110116-v1.234.5-pg14.5.sql.gz', filesize: 1024 },
-          { filename: 'immich-db-backup-1753789649000.sql.gz', filesize: 1024 },
-        ],
-      });
-    });
-  });
-
-  describe('deleteBackup', () => {
-    it('should reject invalid file names', async () => {
-      await expect(sut.deleteBackup(['filename'])).rejects.toThrowError(
-        new BadRequestException('Invalid backup name!'),
-      );
-    });
-
-    it('should unlink the target file', async () => {
-      await sut.deleteBackup(['filename.sql']);
-      expect(mocks.storage.unlink).toHaveBeenCalledTimes(1);
-      expect(mocks.storage.unlink).toHaveBeenCalledWith(
-        `${StorageCore.getBaseFolder(StorageFolder.Backups)}/filename.sql`,
-      );
-    });
-  });
-
-  describe('uploadBackup', () => {
-    it('should reject invalid file names', async () => {
-      await expect(sut.uploadBackup({ originalname: 'invalid backup' } as never)).rejects.toThrowError(
-        new BadRequestException('Invalid backup name!'),
-      );
-    });
-
-    it('should write file', async () => {
-      await sut.uploadBackup({ originalname: 'path.sql.gz', buffer: 'buffer' } as never);
-      expect(mocks.storage.createOrOverwriteFile).toBeCalledWith('/data/backups/uploaded-path.sql.gz', 'buffer');
-    });
-  });
-
-  describe('downloadBackup', () => {
-    it('should reject invalid file names', () => {
-      expect(() => sut.downloadBackup('invalid backup')).toThrowError(new BadRequestException('Invalid backup name!'));
-    });
-
-    it('should get backup path', () => {
-      expect(sut.downloadBackup('hello.sql.gz')).toEqual(
-        expect.objectContaining({
-          path: '/data/backups/hello.sql.gz',
-        }),
-      );
-    });
-  });
 });

server/src/maintenance/maintenance-worker.service.ts

@@ -4,41 +4,19 @@ import { NextFunction, Request, Response } from 'express';
 import { jwtVerify } from 'jose';
 import { readFileSync } from 'node:fs';
 import { IncomingHttpHeaders } from 'node:http';
-import { serverVersion } from 'src/constants';
-import { StorageCore } from 'src/cores/storage.core';
-import {
-  MaintenanceAuthDto,
-  MaintenanceDetectInstallResponseDto,
-  MaintenanceStatusResponseDto,
-  SetMaintenanceModeDto,
-} from 'src/dtos/maintenance.dto';
-import { ServerConfigDto, ServerVersionResponseDto } from 'src/dtos/server.dto';
-import { DatabaseLock, ImmichCookie, MaintenanceAction, SystemMetadataKey } from 'src/enum';
-import { MaintenanceHealthRepository } from 'src/maintenance/maintenance-health.repository';
+import { MaintenanceAuthDto } from 'src/dtos/maintenance.dto';
+import { ImmichCookie, SystemMetadataKey } from 'src/enum';
 import { MaintenanceWebsocketRepository } from 'src/maintenance/maintenance-websocket.repository';
 import { AppRepository } from 'src/repositories/app.repository';
 import { ConfigRepository } from 'src/repositories/config.repository';
-import { DatabaseRepository } from 'src/repositories/database.repository';
 import { LoggingRepository } from 'src/repositories/logging.repository';
-import { ProcessRepository } from 'src/repositories/process.repository';
-import { StorageRepository } from 'src/repositories/storage.repository';
 import { SystemMetadataRepository } from 'src/repositories/system-metadata.repository';
 import { type ApiService as _ApiService } from 'src/services/api.service';
 import { type BaseService as _BaseService } from 'src/services/base.service';
-import { type DatabaseBackupService as _DatabaseBackupService } from 'src/services/database-backup.service';
 import { type ServerService as _ServerService } from 'src/services/server.service';
-import { type VersionService as _VersionService } from 'src/services/version.service';
 import { MaintenanceModeState } from 'src/types';
 import { getConfig } from 'src/utils/config';
-import {
-  deleteDatabaseBackup,
-  downloadDatabaseBackup,
-  listDatabaseBackups,
-  restoreDatabaseBackup,
-  uploadDatabaseBackup,
-} from 'src/utils/database-backups';
-import { ImmichFileResponse } from 'src/utils/file';
-import { createMaintenanceLoginUrl, detectPriorInstall } from 'src/utils/maintenance';
+import { createMaintenanceLoginUrl } from 'src/utils/maintenance';
 import { getExternalDomain } from 'src/utils/misc';
 
 /**
@@ -46,51 +24,16 @@ import { getExternalDomain } from 'src/utils/misc';
  */
 @Injectable()
 export class MaintenanceWorkerService {
-  #secret: string | null = null;
-  #status: MaintenanceStatusResponseDto = {
-    active: true,
-    action: MaintenanceAction.Start,
-  };
-
   constructor(
     protected logger: LoggingRepository,
     private appRepository: AppRepository,
     private configRepository: ConfigRepository,
     private systemMetadataRepository: SystemMetadataRepository,
-    private maintenanceWebsocketRepository: MaintenanceWebsocketRepository,
-    private maintenanceHealthRepository: MaintenanceHealthRepository,
-    private storageRepository: StorageRepository,
-    private processRepository: ProcessRepository,
-    private databaseRepository: DatabaseRepository,
+    private maintenanceWorkerRepository: MaintenanceWebsocketRepository,
   ) {
     this.logger.setContext(this.constructor.name);
   }
 
-  mock(status: MaintenanceStatusResponseDto) {
-    this.#secret = 'secret';
-    this.#status = status;
-  }
-
-  async init() {
-    const state = (await this.systemMetadataRepository.get(
-      SystemMetadataKey.MaintenanceMode,
-    )) as MaintenanceModeState & { isMaintenanceMode: true };
-
-    this.#secret = state.secret;
-    this.#status = {
-      active: true,
-      action: state.action.action,
-    };
-
-    StorageCore.setMediaLocation(this.detectMediaLocation());
-
-    this.maintenanceWebsocketRepository.setAuthFn(async (client) => this.authenticate(client.request.headers));
-    this.maintenanceWebsocketRepository.setStatusUpdateFn((status) => (this.#status = status));
-
-    await this.logSecret();
-    void this.runAction(state.action);
-  }
-
   /**
    * {@link _BaseService.configRepos}
    */
@@ -112,17 +55,22 @@ export class MaintenanceWorkerService {
   /**
    * {@link _ServerService.getSystemConfig}
    */
-  getSystemConfig() {
-    return {
-      maintenanceMode: true,
-    } as ServerConfigDto;
-  }
+  async getSystemConfig() {
+    const config = await this.getConfig({ withCache: false });
 
-  /**
-   * {@link _VersionService.getVersion}
-   */
-  getVersion() {
-    return ServerVersionResponseDto.fromSemVer(serverVersion);
+    return {
+      loginPageMessage: config.server.loginPageMessage,
+      trashDays: config.trash.days,
+      userDeleteDelay: config.user.deleteDelay,
+      oauthButtonText: config.oauth.buttonText,
+      isInitialized: true,
+      isOnboarded: true,
+      externalDomain: config.server.externalDomain,
+      publicUsers: config.server.publicUsers,
+      mapDarkStyleUrl: config.map.darkStyle,
+      mapLightStyleUrl: config.map.lightStyle,
+      maintenanceMode: true,
+    };
   }
 
   /**
@@ -158,99 +106,12 @@ export class MaintenanceWorkerService {
     };
   }
 
-  /**
-   * {@link _StorageService.detectMediaLocation}
-   */
-  detectMediaLocation(): string {
-    const envData = this.configRepository.getEnv();
-    if (envData.storage.mediaLocation) {
-      return envData.storage.mediaLocation;
-    }
-
-    const targets: string[] = [];
-    const candidates = ['/data', '/usr/src/app/upload'];
-
-    for (const candidate of candidates) {
-      const exists = this.storageRepository.existsSync(candidate);
-      if (exists) {
-        targets.push(candidate);
-      }
-    }
-
-    if (targets.length === 1) {
-      return targets[0];
-    }
-
-    return '/usr/src/app/upload';
-  }
-
-  /**
-   * {@link _DatabaseBackupService.listBackups}
-   */
-  async listBackups(): Promise<{ backups: { filename: string; filesize: number }[] }> {
-    const backups = await listDatabaseBackups(this.backupRepos);
-    return { backups };
-  }
-
-  /**
-   * {@link _DatabaseBackupService.deleteBackup}
-   */
-  async deleteBackup(files: string[]): Promise<void> {
-    return deleteDatabaseBackup(this.backupRepos, files);
-  }
-
-  /**
-   * {@link _DatabaseBackupService.uploadBackup}
-   */
-  async uploadBackup(file: Express.Multer.File): Promise<void> {
-    return uploadDatabaseBackup(this.backupRepos, file);
-  }
-
-  /**
-   * {@link _DatabaseBackupService.downloadBackup}
-   */
-  downloadBackup(fileName: string): ImmichFileResponse {
-    return downloadDatabaseBackup(fileName);
-  }
-
-  private get secret() {
-    if (!this.#secret) {
-      throw new Error('Secret is not initialised yet.');
-    }
-
-    return this.#secret;
-  }
-
-  private get backupRepos() {
-    return {
-      logger: this.logger,
-      storage: this.storageRepository,
-      config: this.configRepository,
-      process: this.processRepository,
-      database: this.databaseRepository,
-      health: this.maintenanceHealthRepository,
+  private async secret(): Promise<string> {
+    const state = (await this.systemMetadataRepository.get(SystemMetadataKey.MaintenanceMode)) as {
+      secret: string;
     };
-  }
 
-  private getStatus(): MaintenanceStatusResponseDto {
-    return this.#status;
-  }
-
-  private getPublicStatus(): MaintenanceStatusResponseDto {
-    const state = structuredClone(this.#status);
-
-    if (state.error) {
-      state.error = 'Something went wrong, see logs!';
-    }
-
-    return state;
-  }
-
-  setStatus(status: MaintenanceStatusResponseDto): void {
-    this.#status = status;
-    this.maintenanceWebsocketRepository.serverSend('MaintenanceStatus', status);
-    this.maintenanceWebsocketRepository.clientSend('MaintenanceStatusV1', 'private', status);
-    this.maintenanceWebsocketRepository.clientSend('MaintenanceStatusV1', 'public', this.getPublicStatus());
+    return state.secret;
   }
 
   async logSecret(): Promise<void> {
@@ -262,7 +123,7 @@ export class MaintenanceWorkerService {
       {
         username: 'immich-admin',
       },
-      this.secret,
+      await this.secret(),
     );
 
     this.logger.log(`\n\n🚧 Immich is in maintenance mode, you can log in using the following URL:\n${url}\n`);
@@ -273,115 +134,28 @@ export class MaintenanceWorkerService {
     return this.login(jwtToken);
   }
 
-  async status(potentiallyJwt?: string): Promise<MaintenanceStatusResponseDto> {
-    try {
-      await this.login(potentiallyJwt);
-      return this.getStatus();
-    } catch {
-      return this.getPublicStatus();
-    }
-  }
-
-  detectPriorInstall(): Promise<MaintenanceDetectInstallResponseDto> {
-    return detectPriorInstall(this.storageRepository);
-  }
-
   async login(jwt?: string): Promise<MaintenanceAuthDto> {
     if (!jwt) {
       throw new UnauthorizedException('Missing JWT Token');
     }
 
+    const secret = await this.secret();
+
     try {
-      const result = await jwtVerify<MaintenanceAuthDto>(jwt, new TextEncoder().encode(this.secret));
+      const result = await jwtVerify<MaintenanceAuthDto>(jwt, new TextEncoder().encode(secret));
       return result.payload;
     } catch {
       throw new UnauthorizedException('Invalid JWT Token');
     }
   }
 
-  async setAction(action: SetMaintenanceModeDto) {
-    this.setStatus({
-      active: true,
-      action: action.action,
-    });
-
-    await this.runAction(action);
-  }
-
-  async runAction(action: SetMaintenanceModeDto) {
-    switch (action.action) {
-      case MaintenanceAction.Start: {
-        return;
-      }
-      case MaintenanceAction.End: {
-        return this.endMaintenance();
-      }
-      case MaintenanceAction.SelectDatabaseRestore: {
-        return;
-      }
-    }
-
-    const lock = await this.databaseRepository.tryLock(DatabaseLock.MaintenanceOperation);
-    if (!lock) {
-      return;
-    }
-
-    this.logger.log(`Running maintenance action ${action.action}`);
-
-    await this.systemMetadataRepository.set(SystemMetadataKey.MaintenanceMode, {
-      isMaintenanceMode: true,
-      secret: this.secret,
-      action: {
-        action: MaintenanceAction.Start,
-      },
-    });
-
-    try {
-      if (!action.restoreBackupFilename) {
-        throw new Error("Expected restoreBackupFilename but it's missing!");
-      }
-
-      await this.restoreBackup(action.restoreBackupFilename);
-    } catch (error) {
-      this.logger.error(`Encountered error running action: ${error}`);
-      this.setStatus({
-        active: true,
-        action: action.action,
-        task: 'error',
-        error: '' + error,
-      });
-    }
-  }
-
-  private async restoreBackup(filename: string): Promise<void> {
-    this.setStatus({
-      active: true,
-      action: MaintenanceAction.RestoreDatabase,
-      task: 'ready',
-      progress: 0,
-    });
-
-    await restoreDatabaseBackup(this.backupRepos, filename, (task, progress) =>
-      this.setStatus({
-        active: true,
-        action: MaintenanceAction.RestoreDatabase,
-        progress,
-        task,
-      }),
-    );
-
-    await this.setAction({
-      action: MaintenanceAction.End,
-    });
-  }
-
-  private async endMaintenance(): Promise<void> {
+  async endMaintenance(): Promise<void> {
     const state: MaintenanceModeState = { isMaintenanceMode: false as const };
     await this.systemMetadataRepository.set(SystemMetadataKey.MaintenanceMode, state);
 
     // => corresponds to notification.service.ts#onAppRestart
-    this.maintenanceWebsocketRepository.clientBroadcast('AppRestartV1', state);
-    this.maintenanceWebsocketRepository.serverSend('AppRestart', state);
+    this.maintenanceWorkerRepository.clientBroadcast('AppRestartV1', state);
+    this.maintenanceWorkerRepository.serverSend('AppRestart', state);
     this.appRepository.exitApp();
   }
 }

server/src/queries/asset.job.repository.sql

@@ -29,8 +29,7 @@ select
         select
           "asset_file"."id",
           "asset_file"."path",
-          "asset_file"."type",
-          "asset_file"."isEdited"
+          "asset_file"."type"
         from
           "asset_file"
         where
@@ -38,6 +37,20 @@ select
           and "asset_file"."type" = $1
       ) as agg
   ) as "files",
+  (
+    select
+      coalesce(json_agg(agg), '[]')
+    from
+      (
+        select
+          "tag"."value"
+        from
+          "tag"
+          inner join "tag_asset" on "tag"."id" = "tag_asset"."tagId"
+        where
+          "asset"."id" = "tag_asset"."assetId"
+      ) as agg
+  ) as "tags",
   to_json("asset_exif") as "exifInfo"
 from
   "asset"
@@ -59,8 +72,7 @@ select
         select
           "asset_file"."id",
           "asset_file"."path",
-          "asset_file"."type",
-          "asset_file"."isEdited"
+          "asset_file"."type"
         from
           "asset_file"
         where
@@ -87,8 +99,7 @@ select
         select
           "asset_file"."id",
           "asset_file"."path",
-          "asset_file"."type",
-          "asset_file"."isEdited"
+          "asset_file"."type"
         from
           "asset_file"
         where
@@ -134,8 +145,7 @@ select
         select
           "asset_file"."id",
           "asset_file"."path",
-          "asset_file"."type",
-          "asset_file"."isEdited"
+          "asset_file"."type"
         from
           "asset_file"
         where
@@ -164,8 +174,7 @@ select
         select
           "asset_file"."id",
           "asset_file"."path",
-          "asset_file"."type",
-          "asset_file"."isEdited"
+          "asset_file"."type"
         from
           "asset_file"
         where
@@ -235,8 +244,7 @@ select
         select
           "asset_file"."id",
           "asset_file"."path",
-          "asset_file"."type",
-          "asset_file"."isEdited"
+          "asset_file"."type"
         from
           "asset_file"
         where
@@ -261,8 +269,7 @@ where
 select
   "asset_file"."id",
   "asset_file"."path",
-  "asset_file"."type",
-  "asset_file"."isEdited"
+  "asset_file"."type"
 from
   "asset_file"
 where
@@ -311,8 +318,7 @@ select
         select
           "asset_file"."id",
           "asset_file"."path",
-          "asset_file"."type",
-          "asset_file"."isEdited"
+          "asset_file"."type"
         from
           "asset_file"
         where
@@ -351,8 +357,7 @@ select
         select
           "asset_file"."id",
           "asset_file"."path",
-          "asset_file"."type",
-          "asset_file"."isEdited"
+          "asset_file"."type"
         from
           "asset_file"
         where
@@ -439,8 +444,7 @@ select
         select
           "asset_file"."id",
           "asset_file"."path",
-          "asset_file"."type",
-          "asset_file"."isEdited"
+          "asset_file"."type"
         from
           "asset_file"
         where
@@ -532,8 +536,7 @@ select
         select
           "asset_file"."id",
           "asset_file"."path",
-          "asset_file"."type",
-          "asset_file"."isEdited"
+          "asset_file"."type"
         from
           "asset_file"
         where
@@ -572,8 +575,7 @@ select
         select
           "asset_file"."id",
           "asset_file"."path",
-          "asset_file"."type",
-          "asset_file"."isEdited"
+          "asset_file"."type"
         from
           "asset_file"
         where

server/src/queries/asset.repository.sql

@@ -286,8 +286,7 @@ select
         select
           "asset_file"."id",
           "asset_file"."path",
-          "asset_file"."type",
-          "asset_file"."isEdited"
+          "asset_file"."type"
         from
           "asset_file"
         where

server/src/queries/stack.repository.sql

@@ -43,7 +43,6 @@ select
               "asset_exif"."projectionType",
               "asset_exif"."rating",
               "asset_exif"."state",
-              "asset_exif"."tags",
               "asset_exif"."timeZone"
             from
               "asset_exif"
@@ -128,7 +127,6 @@ select
               "asset_exif"."projectionType",
               "asset_exif"."rating",
               "asset_exif"."state",
-              "asset_exif"."tags",
               "asset_exif"."timeZone"
             from
               "asset_exif"

server/src/repositories/asset-job.repository.ts

@@ -1,5 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { Kysely } from 'kysely';
+import { jsonArrayFrom } from 'kysely/helpers/postgres';
 import { InjectKysely } from 'nestjs-kysely';
 import { Asset, columns } from 'src/database';
 import { DummyValue, GenerateSql } from 'src/decorators';
@@ -41,6 +42,15 @@ export class AssetJobRepository {
       .where('asset.id', '=', asUuid(id))
       .select(['id', 'originalPath'])
       .select((eb) => withFiles(eb, AssetFileType.Sidecar))
+      .select((eb) =>
+        jsonArrayFrom(
+          eb
+            .selectFrom('tag')
+            .select(['tag.value'])
+            .innerJoin('tag_asset', 'tag.id', 'tag_asset.tagId')
+            .whereRef('asset.id', '=', 'tag_asset.assetId'),
+        ).as('tags'),
+      )
       .$call(withExifInner)
       .limit(1)
       .executeTakeFirst();

server/src/repositories/asset.repository.ts

@@ -178,7 +178,6 @@ export class AssetRepository {
                 bitsPerSample: ref('bitsPerSample'),
                 rating: ref('rating'),
                 fps: ref('fps'),
-                tags: ref('tags'),
                 lockedProperties:
                   lockedPropertiesBehavior === 'append'
                     ? distinctLocked(eb, exif.lockedProperties ?? null)
@@ -904,22 +903,20 @@ export class AssetRepository {
       .execute();
   }
 
-  async upsertFile(file: Pick<Insertable<AssetFileTable>, 'assetId' | 'path' | 'type' | 'isEdited'>): Promise<void> {
+  async upsertFile(file: Pick<Insertable<AssetFileTable>, 'assetId' | 'path' | 'type'>): Promise<void> {
     const value = { ...file, assetId: asUuid(file.assetId) };
     await this.db
       .insertInto('asset_file')
       .values(value)
       .onConflict((oc) =>
-        oc.columns(['assetId', 'type', 'isEdited']).doUpdateSet((eb) => ({
+        oc.columns(['assetId', 'type']).doUpdateSet((eb) => ({
           path: eb.ref('excluded.path'),
         })),
       )
       .execute();
   }
 
-  async upsertFiles(
-    files: Pick<Insertable<AssetFileTable>, 'assetId' | 'path' | 'type' | 'isEdited'>[],
-  ): Promise<void> {
+  async upsertFiles(files: Pick<Insertable<AssetFileTable>, 'assetId' | 'path' | 'type'>[]): Promise<void> {
     if (files.length === 0) {
       return;
     }
@@ -929,7 +926,7 @@ export class AssetRepository {
       .insertInto('asset_file')
       .values(values)
       .onConflict((oc) =>
-        oc.columns(['assetId', 'type', 'isEdited']).doUpdateSet((eb) => ({
+        oc.columns(['assetId', 'type']).doUpdateSet((eb) => ({
           path: eb.ref('excluded.path'),
         })),
       )

server/src/repositories/process.repository.spec.ts

@@ -1,85 +0,0 @@
-import { ChildProcessWithoutNullStreams } from 'node:child_process';
-import { Readable, Writable } from 'node:stream';
-import { pipeline } from 'node:stream/promises';
-import { ProcessRepository } from 'src/repositories/process.repository';
-
-function* data() {
-  yield 'Hello, world!';
-}
-
-describe(ProcessRepository.name, () => {
-  let sut: ProcessRepository;
-  let sink: Writable;
-
-  beforeAll(() => {
-    sut = new ProcessRepository();
-  });
-
-  beforeEach(() => {
-    sink = new Writable({
-      write(_chunk, _encoding, callback) {
-        callback();
-      },
-
-      final(callback) {
-        callback();
-      },
-    });
-  });
-
-  describe('createSpawnDuplexStream', () => {
-    it('should work (drain to stdout)', async () => {
-      const process = sut.spawnDuplexStream('bash', ['-c', 'exit 0']);
-      await pipeline(process, sink);
-    });
-
-    it('should throw on non-zero exit code', async () => {
-      const process = sut.spawnDuplexStream('bash', ['-c', 'echo "error message" >&2; exit 1']);
-      await expect(pipeline(process, sink)).rejects.toThrowErrorMatchingInlineSnapshot(`
-        [Error: bash non-zero exit code (1)
-        error message
-        ]
-      `);
-    });
-
-    it('should accept stdin / output stdout', async () => {
-      let output = '';
-      const sink = new Writable({
-        write(chunk, _encoding, callback) {
-          output += chunk;
-          callback();
-        },
-
-        final(callback) {
-          callback();
-        },
-      });
-
-      const echoProcess = sut.spawnDuplexStream('cat');
-      await pipeline(Readable.from(data()), echoProcess, sink);
-      expect(output).toBe('Hello, world!');
-    });
-
-    it('should drain stdin on process exit', async () => {
-      let resolve1: () => void;
-      let resolve2: () => void;
-      const promise1 = new Promise<void>((r) => (resolve1 = r));
-      const promise2 = new Promise<void>((r) => (resolve2 = r));
-
-      async function* data() {
-        yield 'Hello, world!';
-        await promise1;
-        await promise2;
-        yield 'Write after stdin close / process exit!';
-      }
-
-      const process = sut.spawnDuplexStream('bash', ['-c', 'exit 0']);
-
-      const realProcess = (process as never as { _process: ChildProcessWithoutNullStreams })._process;
-      realProcess.on('close', () => setImmediate(() => resolve1()));
-      realProcess.stdin.on('close', () => setImmediate(() => resolve2()));
-
-      await pipeline(Readable.from(data()), process);
-    });
-  });
-});

server/src/repositories/process.repository.ts

@@ -1,110 +1,9 @@
 import { Injectable } from '@nestjs/common';
-import { ChildProcessWithoutNullStreams, fork, spawn, SpawnOptionsWithoutStdio } from 'node:child_process';
-import { Duplex } from 'node:stream';
+import { ChildProcessWithoutNullStreams, spawn, SpawnOptionsWithoutStdio } from 'node:child_process';
 
 @Injectable()
 export class ProcessRepository {
-  spawn(command: string, args?: readonly string[], options?: SpawnOptionsWithoutStdio): ChildProcessWithoutNullStreams {
+  spawn(command: string, args: readonly string[], options?: SpawnOptionsWithoutStdio): ChildProcessWithoutNullStreams {
     return spawn(command, args, options);
   }
-
-  spawnDuplexStream(command: string, args?: readonly string[], options?: SpawnOptionsWithoutStdio): Duplex {
-    let stdinClosed = false;
-    let drainCallback: undefined | (() => void);
-
-    const process = this.spawn(command, args, options);
-    const duplex = new Duplex({
-      // duplex -> stdin
-      write(chunk, encoding, callback) {
-        // drain the input if process dies
-        if (stdinClosed) {
-          return callback();
-        }
-
-        // handle stream backpressure
-        if (process.stdin.write(chunk, encoding)) {
-          callback();
-        } else {
-          drainCallback = callback;
-          process.stdin.once('drain', () => {
-            drainCallback = undefined;
-            callback();
-          });
-        }
-      },
-
-      read() {
-        // no-op
-      },
-
-      final(callback) {
-        if (stdinClosed) {
-          callback();
-        } else {
-          process.stdin.end(callback);
-        }
-      },
-    });
-
-    // stdout -> duplex
-    process.stdout.on('data', (chunk) => {
-      // handle stream backpressure
-      if (!duplex.push(chunk)) {
-        process.stdout.pause();
-      }
-    });
-
-    duplex.on('resume', () => process.stdout.resume());
-
-    // end handling
-    let stdoutClosed = false;
-    function close(error?: Error) {
-      stdinClosed = true;
-
-      if (error) {
-        duplex.destroy(error);
-      } else if (stdoutClosed && typeof process.exitCode === 'number') {
-        duplex.push(null);
-      }
-    }
-
-    process.stdout.on('close', () => {
-      stdoutClosed = true;
-      close();
-    });
-
-    // error handling
-    process.on('error', close);
-    process.stdout.on('error', close);
-    process.stdin.on('error', (error) => {
-      if ((error as { code?: 'EPIPE' })?.code === 'EPIPE') {
-        try {
-          drainCallback!();
-        } catch (error) {
-          close(error as Error);
-        }
-      } else {
-        close(error);
-      }
-    });
-
-    let stderr = '';
-    process.stderr.on('data', (chunk) => (stderr += chunk));
-
-    process.on('exit', (code) => {
-      console.info(`${command} exited (${code})`);
-
-      if (code === 0) {
-        close();
-      } else {
-        close(new Error(`${command} non-zero exit code (${code})\n${stderr}`));
-      }
-    });
-
-    return Object.assign(duplex, { _process: process });
-  }
-
-  fork(...args: Parameters<typeof fork>): ReturnType<typeof fork> {
-    return fork(...args);
-  }
 }

server/src/repositories/storage.repository.ts

@@ -5,8 +5,7 @@ import { escapePath, glob, globStream } from 'fast-glob';
 import { constants, createReadStream, createWriteStream, existsSync, mkdirSync, ReadOptionsWithBuffer } from 'node:fs';
 import fs from 'node:fs/promises';
 import path from 'node:path';
-import { PassThrough, Readable, Writable } from 'node:stream';
-import { createGunzip, createGzip } from 'node:zlib';
+import { Readable, Writable } from 'node:stream';
 import { CrawlOptionsDto, WalkOptionsDto } from 'src/dtos/library.dto';
 import { LoggingRepository } from 'src/repositories/logging.repository';
 import { mimeTypes } from 'src/utils/mime-types';
@@ -94,18 +93,6 @@ export class StorageRepository {
     return { stream: archive, addFile, finalize };
   }
 
-  createGzip(): PassThrough {
-    return createGzip();
-  }
-
-  createGunzip(): PassThrough {
-    return createGunzip();
-  }
-
-  createPlainReadStream(filepath: string): Readable {
-    return createReadStream(filepath);
-  }
-
   async createReadStream(filepath: string, mimeType?: string | null): Promise<ImmichReadStream> {
     const { size } = await fs.stat(filepath);
     await fs.access(filepath, constants.R_OK);

server/src/schema/migrations/1768828334807-AddIsEditedToAssetFile.ts

@@ -1,13 +0,0 @@
-import { Kysely, sql } from 'kysely';
-
-export async function up(db: Kysely<any>): Promise<void> {
-  await sql`ALTER TABLE "asset_file" DROP CONSTRAINT "asset_file_assetId_type_uq";`.execute(db);
-  await sql`ALTER TABLE "asset_file" ADD "isEdited" boolean NOT NULL DEFAULT false;`.execute(db);
-  await sql`ALTER TABLE "asset_file" ADD CONSTRAINT "asset_file_assetId_type_isEdited_uq" UNIQUE ("assetId", "type", "isEdited");`.execute(db);
-}
-
-export async function down(db: Kysely<any>): Promise<void> {
-  await sql`ALTER TABLE "asset_file" DROP CONSTRAINT "asset_file_assetId_type_isEdited_uq";`.execute(db);
-  await sql`ALTER TABLE "asset_file" ADD CONSTRAINT "asset_file_assetId_type_uq" UNIQUE ("assetId", "type");`.execute(db);
-  await sql`ALTER TABLE "asset_file" DROP COLUMN "isEdited";`.execute(db);
-}

server/src/schema/migrations/1768847456553-AddTagsToExif.ts

@@ -1,9 +0,0 @@
-import { Kysely, sql } from 'kysely';
-
-export async function up(db: Kysely<any>): Promise<void> {
-  await sql`ALTER TABLE "asset_exif" ADD "tags" character varying[];`.execute(db);
-}
-
-export async function down(db: Kysely<any>): Promise<void> {
-  await sql`ALTER TABLE "asset_exif" DROP COLUMN "tags";`.execute(db);
-}

server/src/schema/tables/asset-exif.table.ts

@@ -93,9 +93,6 @@ export class AssetExifTable {
   @Column({ type: 'integer', nullable: true })
   rating!: number | null;
 
-  @Column({ type: 'character varying', array: true, nullable: true })
-  tags!: string[] | null;
-
   @UpdateDateColumn({ default: () => 'clock_timestamp()' })
   updatedAt!: Generated<Date>;
 

server/src/schema/tables/asset-file.table.ts

@@ -14,7 +14,7 @@ import {
 } from 'src/sql-tools';
 
 @Table('asset_file')
-@Unique({ columns: ['assetId', 'type', 'isEdited'] })
+@Unique({ columns: ['assetId', 'type'] })
 @UpdatedAtTrigger('asset_file_updatedAt')
 export class AssetFileTable {
   @PrimaryGeneratedColumn()
@@ -37,7 +37,4 @@ export class AssetFileTable {
 
   @UpdateIdColumn({ index: true })
   updateId!: Generated<string>;
-
-  @Column({ type: 'boolean', default: false })
-  isEdited!: Generated<boolean>;
 }

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

@@ -529,10 +529,9 @@ describe(AssetMediaService.name, () => {
           ...assetStub.withCropEdit.files,
           {
             id: 'edited-file',
-            type: AssetFileType.FullSize,
+            type: AssetFileType.FullSizeEdited,
             path: '/uploads/user-id/fullsize/edited.jpg',
-            isEdited: true,
-          },
+          } as AssetFile,
         ],
       };
       mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
@@ -555,10 +554,9 @@ describe(AssetMediaService.name, () => {
           ...assetStub.withCropEdit.files,
           {
             id: 'edited-file',
-            type: AssetFileType.FullSize,
+            type: AssetFileType.FullSizeEdited,
             path: '/uploads/user-id/fullsize/edited.jpg',
-            isEdited: true,
-          },
+          } as AssetFile,
         ],
       };
       mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
@@ -581,10 +579,9 @@ describe(AssetMediaService.name, () => {
           ...assetStub.withCropEdit.files,
           {
             id: 'edited-file',
-            type: AssetFileType.FullSize,
+            type: AssetFileType.FullSizeEdited,
             path: '/uploads/user-id/fullsize/edited.jpg',
-            isEdited: true,
-          },
+          } as AssetFile,
         ],
       };
       mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
@@ -659,7 +656,6 @@ describe(AssetMediaService.name, () => {
             id: '42',
             path: '/path/to/preview',
             type: AssetFileType.Thumbnail,
-            isEdited: false,
           },
         ],
       });
@@ -677,7 +673,6 @@ describe(AssetMediaService.name, () => {
             id: '42',
             path: '/path/to/preview.jpg',
             type: AssetFileType.Preview,
-            isEdited: false,
           },
         ],
       });

server/src/services/asset.service.ts

@@ -4,7 +4,7 @@ import { DateTime, Duration } from 'luxon';
 import { JOBS_ASSET_PAGINATION_SIZE } from 'src/constants';
 import { AssetFile } from 'src/database';
 import { OnJob } from 'src/decorators';
-import { AssetResponseDto, SanitizedAssetResponseDto, mapAsset } from 'src/dtos/asset-response.dto';
+import { AssetResponseDto, MapAsset, SanitizedAssetResponseDto, mapAsset } from 'src/dtos/asset-response.dto';
 import {
   AssetBulkDeleteDto,
   AssetBulkUpdateDto,
@@ -112,7 +112,7 @@ export class AssetService extends BaseService {
     const { description, dateTimeOriginal, latitude, longitude, rating, ...rest } = dto;
     const repos = { asset: this.assetRepository, event: this.eventRepository };
 
-    let previousMotion: { id: string } | null = null;
+    let previousMotion: MapAsset | null = null;
     if (rest.livePhotoVideoId) {
       await onBeforeLink(repos, { userId: auth.user.id, livePhotoVideoId: rest.livePhotoVideoId });
     } else if (rest.livePhotoVideoId === null) {

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

@@ -5,7 +5,7 @@ import { StorageCore } from 'src/cores/storage.core';
 import { ImmichWorker, JobStatus, StorageFolder } from 'src/enum';
 import { BackupService } from 'src/services/backup.service';
 import { systemConfigStub } from 'test/fixtures/system-config.stub';
-import { mockDuplex, mockSpawn, newTestService, ServiceMocks } from 'test/utils';
+import { mockSpawn, newTestService, ServiceMocks } from 'test/utils';
 import { describe } from 'vitest';
 
 describe(BackupService.name, () => {
@@ -147,7 +147,6 @@ describe(BackupService.name, () => {
     beforeEach(() => {
       mocks.storage.readdir.mockResolvedValue([]);
       mocks.process.spawn.mockReturnValue(mockSpawn(0, 'data', ''));
-      mocks.process.spawnDuplexStream.mockImplementation(() => mockDuplex('command', 0, 'data', ''));
       mocks.storage.rename.mockResolvedValue();
       mocks.storage.unlink.mockResolvedValue();
       mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.backupEnabled);
@@ -166,7 +165,7 @@ describe(BackupService.name, () => {
       ({ sut, mocks } = newTestService(BackupService, { config: configMock }));
 
       mocks.storage.readdir.mockResolvedValue([]);
-      mocks.process.spawnDuplexStream.mockImplementation(() => mockDuplex('command', 0, 'data', ''));
+      mocks.process.spawn.mockReturnValue(mockSpawn(0, 'data', ''));
       mocks.storage.rename.mockResolvedValue();
       mocks.storage.unlink.mockResolvedValue();
       mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.backupEnabled);
@@ -175,16 +174,14 @@ describe(BackupService.name, () => {
 
       await sut.handleBackupDatabase();
 
-      expect(mocks.process.spawnDuplexStream).toHaveBeenCalled();
-      const call = mocks.process.spawnDuplexStream.mock.calls[0];
+      expect(mocks.process.spawn).toHaveBeenCalled();
+      const call = mocks.process.spawn.mock.calls[0];
       const args = call[1] as string[];
-      expect(args).toMatchInlineSnapshot(`
-        [
-          "postgresql://postgres:pwd@host:5432/immich?sslmode=require",
-          "--clean",
-          "--if-exists",
-        ]
-      `);
+      // ['--dbname', '<url>', '--clean', '--if-exists']
+      expect(args[0]).toBe('--dbname');
+      const passedUrl = args[1];
+      expect(passedUrl).not.toContain('uselibpqcompat');
+      expect(passedUrl).toContain('sslmode=require');
     });
 
     it('should run a database backup successfully', async () => {
@@ -199,21 +196,21 @@ describe(BackupService.name, () => {
       expect(mocks.storage.rename).toHaveBeenCalled();
     });
 
-    it('should fail if pg_dump fails', async () => {
-      mocks.process.spawnDuplexStream.mockReturnValueOnce(mockDuplex('pg_dump', 1, '', 'error'));
-      await expect(sut.handleBackupDatabase()).rejects.toThrow('pg_dump non-zero exit code (1)');
+    it('should fail if pg_dumpall fails', async () => {
+      mocks.process.spawn.mockReturnValueOnce(mockSpawn(1, '', 'error'));
+      await expect(sut.handleBackupDatabase()).rejects.toThrow('Backup failed with code 1');
     });
 
     it('should not rename file if pgdump fails and gzip succeeds', async () => {
-      mocks.process.spawnDuplexStream.mockReturnValueOnce(mockDuplex('pg_dump', 1, '', 'error'));
-      await expect(sut.handleBackupDatabase()).rejects.toThrow('pg_dump non-zero exit code (1)');
+      mocks.process.spawn.mockReturnValueOnce(mockSpawn(1, '', 'error'));
+      await expect(sut.handleBackupDatabase()).rejects.toThrow('Backup failed with code 1');
       expect(mocks.storage.rename).not.toHaveBeenCalled();
     });
 
     it('should fail if gzip fails', async () => {
-      mocks.process.spawnDuplexStream.mockReturnValueOnce(mockDuplex('pg_dump', 0, 'data', ''));
-      mocks.process.spawnDuplexStream.mockReturnValueOnce(mockDuplex('gzip', 1, '', 'error'));
-      await expect(sut.handleBackupDatabase()).rejects.toThrow('gzip non-zero exit code (1)');
+      mocks.process.spawn.mockReturnValueOnce(mockSpawn(0, 'data', ''));
+      mocks.process.spawn.mockReturnValueOnce(mockSpawn(1, '', 'error'));
+      await expect(sut.handleBackupDatabase()).rejects.toThrow('Gzip failed with code 1');
     });
 
     it('should fail if write stream fails', async () => {
@@ -229,9 +226,9 @@ describe(BackupService.name, () => {
     });
 
     it('should ignore unlink failing and still return failed job status', async () => {
-      mocks.process.spawnDuplexStream.mockReturnValueOnce(mockDuplex('pg_dump', 1, '', 'error'));
+      mocks.process.spawn.mockReturnValueOnce(mockSpawn(1, '', 'error'));
       mocks.storage.unlink.mockRejectedValue(new Error('error'));
-      await expect(sut.handleBackupDatabase()).rejects.toThrow('pg_dump non-zero exit code (1)');
+      await expect(sut.handleBackupDatabase()).rejects.toThrow('Backup failed with code 1');
       expect(mocks.storage.unlink).toHaveBeenCalled();
     });
 
@@ -245,12 +242,12 @@ describe(BackupService.name, () => {
       ${'17.15.1'}                          | ${17}
       ${'18.0.0'}                           | ${18}
     `(
-      `should use pg_dump $expectedVersion with postgres version $postgresVersion`,
+      `should use pg_dumpall $expectedVersion with postgres version $postgresVersion`,
       async ({ postgresVersion, expectedVersion }) => {
         mocks.database.getPostgresVersion.mockResolvedValue(postgresVersion);
         await sut.handleBackupDatabase();
-        expect(mocks.process.spawnDuplexStream).toHaveBeenCalledWith(
-          `/usr/lib/postgresql/${expectedVersion}/bin/pg_dump`,
+        expect(mocks.process.spawn).toHaveBeenCalledWith(
+          `/usr/lib/postgresql/${expectedVersion}/bin/pg_dumpall`,
           expect.any(Array),
           expect.any(Object),
         );