Merge 7abe36f82007dc0128bc758c3f5a5c401c0e6205 into b0bcc6c03ecedff0d756a0e54352586672cea761

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

cli/package-lock.json

@@ -3148,10 +3148,11 @@
       }
     },
     "node_modules/mock-fs": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/mock-fs/-/mock-fs-5.2.0.tgz",
-      "integrity": "sha512-2dF2R6YMSZbpip1V1WHKGLNjr/k48uQClqMVb5H3MOvwc9qhYis3/IWbj02qIg/Y8MDXKFF4c5v0rxx2o6xTZw==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/mock-fs/-/mock-fs-5.3.0.tgz",
+      "integrity": "sha512-IMvz1X+RF7vf+ur7qUenXMR7/FSKSIqS3HqFHXcyNI7G0FbpFO8L5lfsUJhl+bhK1AiulVHWKUSxebWauPA+xQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12.0.0"
       }

server/package-lock.json

@@ -10478,9 +10478,9 @@
       "dev": true
     },
     "node_modules/mock-fs": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/mock-fs/-/mock-fs-5.2.0.tgz",
-      "integrity": "sha512-2dF2R6YMSZbpip1V1WHKGLNjr/k48uQClqMVb5H3MOvwc9qhYis3/IWbj02qIg/Y8MDXKFF4c5v0rxx2o6xTZw==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/mock-fs/-/mock-fs-5.3.0.tgz",
+      "integrity": "sha512-IMvz1X+RF7vf+ur7qUenXMR7/FSKSIqS3HqFHXcyNI7G0FbpFO8L5lfsUJhl+bhK1AiulVHWKUSxebWauPA+xQ==",
       "dev": true,
       "engines": {
         "node": ">=12.0.0"
@@ -22506,9 +22506,9 @@
       "dev": true
     },
     "mock-fs": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/mock-fs/-/mock-fs-5.2.0.tgz",
-      "integrity": "sha512-2dF2R6YMSZbpip1V1WHKGLNjr/k48uQClqMVb5H3MOvwc9qhYis3/IWbj02qIg/Y8MDXKFF4c5v0rxx2o6xTZw==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/mock-fs/-/mock-fs-5.3.0.tgz",
+      "integrity": "sha512-IMvz1X+RF7vf+ur7qUenXMR7/FSKSIqS3HqFHXcyNI7G0FbpFO8L5lfsUJhl+bhK1AiulVHWKUSxebWauPA+xQ==",
       "dev": true
     },
     "module-details-from-path": {

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

@@ -1,4 +1,5 @@
 import { BinaryField, ExifDateTime } from 'exiftool-vendored';
+import { DateTime } from 'luxon';
 import { randomBytes } from 'node:crypto';
 import { Stats } from 'node:fs';
 import { constants } from 'node:fs/promises';
@@ -871,10 +872,30 @@ describe(MetadataService.name, () => {
       metadataMock.readTags.mockResolvedValue(tags);
 
       await sut.handleMetadataExtraction({ id: assetStub.image.id });
-      expect(assetMock.getByIds).toHaveBeenCalledWith([assetStub.image.id]);
       expect(assetMock.upsertExif).toHaveBeenCalledWith(
         expect.objectContaining({
           timeZone: 'UTC+0',
+          dateTimeOriginal: DateTime.fromISO('2024-09-01T00:00:00.000Z').toJSDate(),
+        }),
+      );
+    });
+
+    it('should extract +00:00 timezone from raw value despite conflicting GPS location/timezone', async () => {
+      // exiftool-vendored returns a timezone derived from GPS coordinates even though "+00:00" might be set explicitly
+      // https://github.com/photostructure/exiftool-vendored.js/issues/203
+
+      const tags: ImmichTags = {
+        DateTimeOriginal: ExifDateTime.fromISO('2024-09-15T00:00:00.000+00:00'),
+        tz: 'America/Santiago',
+      };
+      assetMock.getByIds.mockResolvedValue([assetStub.image]);
+      metadataMock.readTags.mockResolvedValue(tags);
+
+      await sut.handleMetadataExtraction({ id: assetStub.image.id });
+      expect(assetMock.upsertExif).toHaveBeenCalledWith(
+        expect.objectContaining({
+          timeZone: 'UTC+0',
+          dateTimeOriginal: DateTime.fromISO('2024-09-15T00:00:00.000Z').toJSDate(),
         }),
       );
     });

server/src/services/metadata.service.ts

@@ -623,12 +623,10 @@ export class MetadataService extends BaseService {
     }
 
     // timezone
-    let timeZone = exifTags.tz ?? null;
-    if (timeZone == null && dateTime?.rawValue?.endsWith('+00:00')) {
-      // exiftool-vendored returns "no timezone" information even though "+00:00" might be set explicitly
-      // https://github.com/photostructure/exiftool-vendored.js/issues/203
-      timeZone = 'UTC+0';
-    }
+    // exiftool-vendored returns "no timezone" information or one derived from GPS coordinates even though "+00:00"
+    // might be set explicitly
+    // https://github.com/photostructure/exiftool-vendored.js/issues/203
+    const timeZone = dateTime?.rawValue?.endsWith('+00:00') ? 'UTC+0' : (exifTags.tz ?? null);
 
     if (timeZone) {
       this.logger.debug(`Asset ${asset.id} timezone is ${timeZone} (via ${exifTags.tzSource})`);

web/package-lock.json

@@ -769,9 +769,9 @@
       }
     },
     "node_modules/@faker-js/faker": {
-      "version": "9.0.2",
-      "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-9.0.2.tgz",
-      "integrity": "sha512-nI/FP30ZGXb+UaR7yXawVTH40NVKXPIx0tA3GKjkKLjorqBoMAeq4iSEacl8mJmpVhOCDa0vYHwYDmOOcFMrYw==",
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-9.0.3.tgz",
+      "integrity": "sha512-lWrrK4QNlFSU+13PL9jMbMKLJYXDFu3tQfayBsMXX7KL/GiQeqfB1CzHkqD5UHBUtPAuPo6XwGbMFNdVMZObRA==",
       "dev": true,
       "funding": [
         {