Merge branch 'nullable-review-state' of github.com:bluesky-social/atp…

…roto into divert-blobs
bluesky-social · Mar 6, 2024 · be498d7 · be498d7
2 parents 9be9921 + f04c7b6
commit be498d7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/packages/ozone/src/mod-service/status.ts b/packages/ozone/src/mod-service/status.ts
@@ -135,6 +135,8 @@ export const adjustModerationSubjectStatus = async (
     .selectFrom('moderation_subject_status')
     .where('did', '=', identifier.did)
     .where('recordPath', '=', identifier.recordPath)
+    // Make sure we respect other updates that may be happening at the same time
+    .forUpdate()
     .selectAll()
     .executeTakeFirst()
 

diff --git a/packages/ozone/tests/__snapshots__/moderation-events.test.ts.snap b/packages/ozone/tests/__snapshots__/moderation-events.test.ts.snap
@@ -22,7 +22,7 @@ Object {
         "lastReportedAt": "1970-01-01T00:00:00.000Z",
         "lastReviewedAt": "1970-01-01T00:00:00.000Z",
         "lastReviewedBy": "user(1)",
-        "reviewState": "com.atproto.admin.defs#reviewOpen",
+        "reviewState": "com.atproto.admin.defs#reviewEscalated",
         "subject": Object {
           "$type": "com.atproto.admin.defs#repoRef",
           "did": "user(0)",