Merge branch 'main' into chore/backup-wakelock

.github/workflows/docker.yml

@@ -43,7 +43,7 @@ jobs:
   retag_ml:
     name: Re-Tag ML
     needs: pre-job
-    if: ${{ needs.pre-job.outputs.should_run_ml == 'false' }}
+    if: ${{ needs.pre-job.outputs.should_run_ml == 'false' && !github.event.pull_request.head.repo.fork }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -51,8 +51,6 @@ jobs:
     steps:
         - name: Login to GitHub Container Registry
           uses: docker/login-action@v3
-          # Skip when PR from a fork
-          if: ${{ !github.event.pull_request.head.repo.fork }}
           with:
             registry: ghcr.io
             username: ${{ github.repository_owner }}
@@ -68,7 +66,7 @@ jobs:
   retag_server:
     name: Re-Tag Server
     needs: pre-job
-    if: ${{ needs.pre-job.outputs.should_run_server == 'false' }}
+    if: ${{ needs.pre-job.outputs.should_run_server == 'false' && !github.event.pull_request.head.repo.fork }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -76,8 +74,6 @@ jobs:
     steps:
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
-        # Skip when PR from a fork
-        if: ${{ !github.event.pull_request.head.repo.fork }}
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}

docker/docker-compose.dev.yml

@@ -98,7 +98,7 @@ services:
 
   redis:
     container_name: immich_redis
-    image: redis:6.2-alpine@sha256:fd1b5400ca24adc2ff77abdf00acb72c3aae85b94e43557ab2606d29a74bfa01
+    image: redis:6.2-alpine@sha256:2d1463258f2764328496376f5d965f20c6a67f66ea2b06dc42af351f75248792
     healthcheck:
       test: redis-cli ping || exit 1
 

docker/docker-compose.prod.yml

@@ -47,7 +47,7 @@ services:
 
   redis:
     container_name: immich_redis
-    image: redis:6.2-alpine@sha256:fd1b5400ca24adc2ff77abdf00acb72c3aae85b94e43557ab2606d29a74bfa01
+    image: redis:6.2-alpine@sha256:2d1463258f2764328496376f5d965f20c6a67f66ea2b06dc42af351f75248792
     healthcheck:
       test: redis-cli ping || exit 1
     restart: always

docker/docker-compose.yml

@@ -48,7 +48,7 @@ services:
 
   redis:
     container_name: immich_redis
-    image: docker.io/redis:6.2-alpine@sha256:fd1b5400ca24adc2ff77abdf00acb72c3aae85b94e43557ab2606d29a74bfa01
+    image: docker.io/redis:6.2-alpine@sha256:2d1463258f2764328496376f5d965f20c6a67f66ea2b06dc42af351f75248792
     healthcheck:
       test: redis-cli ping || exit 1
     restart: always

e2e/docker-compose.yml

@@ -33,7 +33,7 @@ services:
       - 2285:3001
 
   redis:
-    image: redis:6.2-alpine@sha256:fd1b5400ca24adc2ff77abdf00acb72c3aae85b94e43557ab2606d29a74bfa01
+    image: redis:6.2-alpine@sha256:2d1463258f2764328496376f5d965f20c6a67f66ea2b06dc42af351f75248792
 
   database:
     image: tensorchord/pgvecto-rs:pg14-v0.2.0@sha256:90724186f0a3517cf6914295b5ab410db9ce23190a2d9d0b9dd6463e3fa298f0

server/src/migrations/1725730782681-RemoveHiddenAssetsFromAlbums.ts

@@ -0,0 +1,13 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class RemoveHiddenAssetsFromAlbums1725730782681 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `DELETE FROM "albums_assets_assets" WHERE "assetsId" IN (SELECT "id" FROM "assets" WHERE "isVisible" = false)`,
+    );
+  }
+
+  public async down(): Promise<void> {
+    // noop
+  }
+}

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

@@ -163,7 +163,7 @@ export class AssetMediaService {
           throw new BadRequestException('Live photo video not found');
         }
         if (motionAsset.type !== AssetType.VIDEO) {
-          throw new BadRequestException('Live photo vide must be a video');
+          throw new BadRequestException('Live photo video must be a video');
         }
         if (motionAsset.ownerId !== auth.user.id) {
           throw new BadRequestException('Live photo video does not belong to the user');