Merge pull request #510 from BlueBubblesApp/development

fix: live photo edge cases
BlueBubblesApp · Mar 30, 2023 · a16e69a · a16e69a
2 parents 665f4b7 + c5c9421
commit a16e69a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/server/src/server/api/v1/serializers/AttachmentSerializer.ts b/packages/server/src/server/api/v1/serializers/AttachmentSerializer.ts
@@ -107,7 +107,7 @@ export class AttachmentSerializer {
         if (!isForNotification) {
             // Get the path for a possible live photo
             const ext = fPath.split(".").pop();
-            const livePath = ext ? fPath.replace(`.${ext}`, ".mov") : `${fPath}.mov`;
+            const livePath = ext !== fPath ? fPath.replace(`.${ext}`, ".mov") : `${fPath}.mov`;
 
             output = {
                 ...output,

diff --git a/packages/server/src/server/services/httpService/api/v1/routers/attachmentRouter.ts b/packages/server/src/server/services/httpService/api/v1/routers/attachmentRouter.ts
@@ -111,8 +111,9 @@ export class AttachmentRouter {
 
         // Replace the extension with .mov (if there is one). Otherwise just append .mov
         const ext = aPath.split(".").pop();
-        const livePath = ext ? aPath.replace(`.${ext}`, ".mov") : `${aPath}.mov`;
-        if (!fs.existsSync(livePath)) throw new NotFound({ error: "Live photo does not exist for this attachment!" });
+        const livePath = ext !== aPath ? aPath.replace(`.${ext}`, ".mov") : `${aPath}.mov`;
+        if (aPath.endsWith('.mov') || !fs.existsSync(livePath))
+            throw new NotFound({ error: "Live photo does not exist for this attachment!" });
 
         return new FileStream(ctx, livePath, "video/quicktime").send();
     }