Merge branch 'main' into filter-people-mobile

cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@immich/cli",
-  "version": "2.2.47",
+  "version": "2.2.48",
   "description": "Command Line Interface (CLI) for Immich",
   "type": "module",
   "exports": "./dist/index.js",

docker/hwaccel.transcoding.yml

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

docs/static/archived-versions.json

@@ -1,4 +1,8 @@
 [
+  {
+    "label": "v1.125.7",
+    "url": "https://v1.125.7.archive.immich.app"
+  },
   {
     "label": "v1.125.6",
     "url": "https://v1.125.6.archive.immich.app"

e2e/package.json

@@ -1,6 +1,6 @@
 {
   "name": "immich-e2e",
-  "version": "1.125.6",
+  "version": "1.125.7",
   "description": "",
   "main": "index.js",
   "type": "module",

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

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

machine-learning/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "machine-learning"
-version = "1.125.6"
+version = "1.125.7"
 description = ""
 authors = ["Hau Tran <[email protected]>"]
 readme = "README.md"

mobile/android/fastlane/Fastfile

@@ -36,7 +36,7 @@ platform :android do
       build_type: 'Release',
       properties: {
         "android.injected.version.code" => 182,
-        "android.injected.version.name" => "1.125.6",
+        "android.injected.version.name" => "1.125.7",
       }
     )
     upload_to_play_store(skip_upload_apk: true, skip_upload_images: true, skip_upload_screenshots: true, aab: '../build/app/outputs/bundle/release/app-release.aab')

mobile/ios/fastlane/Fastfile

@@ -19,7 +19,7 @@ platform :ios do
   desc "iOS Release"
   lane :release do
     increment_version_number(
-      version_number: "1.125.6"
+      version_number: "1.125.7"
     )
     increment_build_number(
       build_number: latest_testflight_build_number + 1,

mobile/pubspec.yaml

@@ -2,7 +2,7 @@ name: immich_mobile
 description: Immich - selfhosted backup media file on mobile phone
 
 publish_to: 'none'
-version: 1.125.6+182
+version: 1.125.7+182
 
 environment:
   sdk: '>=3.3.0 <4.0.0'

open-api/immich-openapi-specs.json

@@ -539,7 +539,7 @@
           }
         ],
         "responses": {
-          "201": {
+          "200": {
             "content": {
               "application/json": {
                 "schema": {
@@ -1424,6 +1424,7 @@
     },
     "/assets/bulk-upload-check": {
       "post": {
+        "description": "Checks if assets exist by checksums",
         "operationId": "checkBulkUpload",
         "parameters": [],
         "requestBody": {
@@ -1459,14 +1460,15 @@
             "api_key": []
           }
         ],
-        "summary": "Checks if assets exist by checksums",
+        "summary": "checkBulkUpload",
         "tags": [
           "Assets"
         ]
       }
     },
     "/assets/device/{deviceId}": {
       "get": {
+        "description": "Get all asset of a device that are in the database, ID only.",
         "operationId": "getAllUserAssetsByDeviceId",
         "parameters": [
           {
@@ -1504,14 +1506,15 @@
             "api_key": []
           }
         ],
-        "summary": "Get all asset of a device that are in the database, ID only.",
+        "summary": "getAllUserAssetsByDeviceId",
         "tags": [
           "Assets"
         ]
       }
     },
     "/assets/exist": {
       "post": {
+        "description": "Checks if multiple assets exist on the server and returns all existing - used by background backup",
         "operationId": "checkExistingAssets",
         "parameters": [],
         "requestBody": {
@@ -1547,7 +1550,7 @@
             "api_key": []
           }
         ],
-        "summary": "Checks if multiple assets exist on the server and returns all existing - used by background backup",
+        "summary": "checkExistingAssets",
         "tags": [
           "Assets"
         ]
@@ -1903,6 +1906,7 @@
         ]
       },
       "put": {
+        "description": "Replace the asset with new file, without changing its id",
         "operationId": "replaceAsset",
         "parameters": [
           {
@@ -1956,7 +1960,7 @@
             "api_key": []
           }
         ],
-        "summary": "Replace the asset with new file, without changing its id",
+        "summary": "replaceAsset",
         "tags": [
           "Assets"
         ],
@@ -7454,7 +7458,7 @@
   "info": {
     "title": "Immich",
     "description": "Immich API",
-    "version": "1.125.6",
+    "version": "1.125.7",
     "contact": {}
   },
   "tags": [],

open-api/typescript-sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@immich/sdk",
-  "version": "1.125.6",
+  "version": "1.125.7",
   "description": "Auto-generated TypeScript SDK for the Immich API",
   "type": "module",
   "main": "./build/index.js",