Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

fix: roll back a Loom move when its original path changed underneath it

Richie McIlroye7d560014495
diff --git a/apps/web/__tests__/unit/loom-operator-tools.test.ts b/apps/web/__tests__/unit/loom-operator-tools.test.ts
index 3f1d1c5c2..9acf16705 100644
--- a/apps/web/__tests__/unit/loom-operator-tools.test.ts
+++ b/apps/web/__tests__/unit/loom-operator-tools.test.ts
@@ -380,10 +380,7 @@ describe("reassignLoomImport", () => {
mocks.updates[0]?.metadata as SQL,
);
expect(query.sql).toContain("'$.loomDeferredProcessing.rawFileKey', ?)");
- expect(query.params).toContain(
- `someoneaaaaaaaa/${ids.video}/raw-upload.webm`,
- );
- expect(query.params).toContain(`${ids.to}/${ids.video}/raw-upload.webm`);
+ expect(query.params).toEqual([`${ids.to}/${ids.video}/raw-upload.webm`]);
});
it("leaves metadata alone for videos without a pending conversion", async () => {
diff --git a/apps/web/lib/loom-import-reassign.ts b/apps/web/lib/loom-import-reassign.ts
index 697e6b8f6..5e91a08e3 100644
--- a/apps/web/lib/loom-import-reassign.ts
+++ b/apps/web/lib/loom-import-reassign.ts
@@ -284,7 +284,7 @@ async function moveClaimedVideo({
.set({
...(movedOriginalKey
? {
- metadata: sql`IF(JSON_UNQUOTE(JSON_EXTRACT(${videos.metadata}, '$.loomDeferredProcessing.rawFileKey')) = ${originalKey}, JSON_SET(${videos.metadata}, '$.loomDeferredProcessing.rawFileKey', ${movedOriginalKey}), ${videos.metadata})`,
+ metadata: sql`JSON_SET(${videos.metadata}, '$.loomDeferredProcessing.rawFileKey', ${movedOriginalKey})`,
}
: {}),
ownerId: User.UserId.make(toUserId),
@@ -299,6 +299,7 @@ async function moveClaimedVideo({
eq(videos.ownerId, User.UserId.make(fromUserId)),
sql`JSON_UNQUOTE(JSON_EXTRACT(${videos.metadata}, '$.loomReassignClaim.token')) = ${token}`,
sql`COALESCE(JSON_UNQUOTE(JSON_EXTRACT(${videos.metadata}, '$.loomDeferredProcessing.status')), '') <> 'started'`,
+ sql`JSON_UNQUOTE(JSON_EXTRACT(${videos.metadata}, '$.loomDeferredProcessing.rawFileKey')) <=> ${typeof originalKey === "string" ? originalKey : null}`,
),
);
if (getAffectedRows(result) !== 1) return false;