@atproto/ozone 0.0.11 → 0.0.13

package/tests/__snapshots__/moderation-events.test.ts.snap

@@ -5,85 +5,63 @@ Object {
   "createdAt": "1970-01-01T00:00:00.000Z",
   "createdBy": "user(2)",
   "event": Object {
-    "$type": "com.atproto.admin.defs#modEventLabel",
-    "comment": "[AutoModerator]: Applying labels",
-    "createLabelVals": Array [
-      "test-label",
-    ],
-    "negateLabelVals": Array [],
+    "$type": "com.atproto.admin.defs#modEventReport",
+    "comment": "X",
+    "reportType": "com.atproto.moderation.defs#reasonMisleading",
   },
   "id": 1,
   "subject": Object {
-    "$type": "com.atproto.admin.defs#recordView",
-    "blobCids": Array [],
-    "cid": "cids(0)",
+    "$type": "com.atproto.admin.defs#repoView",
+    "did": "user(0)",
+    "handle": "alice.test",
     "indexedAt": "1970-01-01T00:00:00.000Z",
-    "moderation": Object {},
-    "repo": Object {
-      "did": "user(0)",
-      "handle": "alice.test",
-      "indexedAt": "1970-01-01T00:00:00.000Z",
-      "moderation": Object {
-        "subjectStatus": Object {
-          "createdAt": "1970-01-01T00:00:00.000Z",
-          "id": 1,
-          "lastReportedAt": "1970-01-01T00:00:00.000Z",
-          "lastReviewedAt": "1970-01-01T00:00:00.000Z",
-          "lastReviewedBy": "user(1)",
-          "reviewState": "com.atproto.admin.defs#reviewEscalated",
-          "subject": Object {
-            "$type": "com.atproto.admin.defs#repoRef",
-            "did": "user(0)",
-          },
-          "subjectBlobCids": Array [],
-          "subjectRepoHandle": "alice.test",
-          "tags": Array [
-            "lang:und",
-          ],
-          "takendown": false,
-          "updatedAt": "1970-01-01T00:00:00.000Z",
+    "moderation": Object {
+      "subjectStatus": Object {
+        "createdAt": "1970-01-01T00:00:00.000Z",
+        "id": 1,
+        "lastReportedAt": "1970-01-01T00:00:00.000Z",
+        "lastReviewedAt": "1970-01-01T00:00:00.000Z",
+        "lastReviewedBy": "user(1)",
+        "reviewState": "com.atproto.admin.defs#reviewEscalated",
+        "subject": Object {
+          "$type": "com.atproto.admin.defs#repoRef",
+          "did": "user(0)",
         },
+        "subjectBlobCids": Array [],
+        "subjectRepoHandle": "alice.test",
+        "tags": Array [
+          "lang:und",
+        ],
+        "takendown": false,
+        "updatedAt": "1970-01-01T00:00:00.000Z",
       },
-      "relatedRecords": Array [
-        Object {
-          "$type": "app.bsky.actor.profile",
-          "avatar": Object {
-            "$type": "blob",
-            "mimeType": "image/jpeg",
-            "ref": Object {
-              "$link": "cids(2)",
-            },
-            "size": 3976,
-          },
-          "description": "its me!",
-          "displayName": "ali",
-          "labels": Object {
-            "$type": "com.atproto.label.defs#selfLabels",
-            "values": Array [
-              Object {
-                "val": "self-label-a",
-              },
-              Object {
-                "val": "self-label-b",
-              },
-            ],
+    },
+    "relatedRecords": Array [
+      Object {
+        "$type": "app.bsky.actor.profile",
+        "avatar": Object {
+          "$type": "blob",
+          "mimeType": "image/jpeg",
+          "ref": Object {
+            "$link": "cids(0)",
           },
+          "size": 3976,
         },
-      ],
-    },
-    "uri": "record(0)",
-    "value": Object {
-      "$type": "app.bsky.feed.post",
-      "createdAt": "1970-01-01T00:00:00.000Z",
-      "embed": Object {
-        "$type": "app.bsky.embed.record",
-        "record": Object {
-          "cid": "cids(1)",
-          "uri": "record(1)",
+        "description": "its me!",
+        "displayName": "ali",
+        "labels": Object {
+          "$type": "com.atproto.label.defs#selfLabels",
+          "values": Array [
+            Object {
+              "val": "self-label-a",
+            },
+            Object {
+              "val": "self-label-b",
+            },
+          ],
         },
       },
-      "text": "yoohoo label_me",
-    },
+    ],
   },
   "subjectBlobCids": Array [],
   "subjectBlobs": Array [],
@@ -101,7 +79,7 @@ Array [
       "comment": "X",
       "reportType": "com.atproto.moderation.defs#reasonSpam",
     },
-    "id": 13,
+    "id": 11,
     "subject": Object {
       "$type": "com.atproto.admin.defs#repoRef",
       "did": "user(0)",
@@ -120,7 +98,7 @@ Array [
       ],
       "remove": Array [],
     },
-    "id": 8,
+    "id": 6,
     "subject": Object {
       "$type": "com.atproto.admin.defs#repoRef",
       "did": "user(0)",
@@ -137,7 +115,7 @@ Array [
       "comment": "X",
       "reportType": "com.atproto.moderation.defs#reasonSpam",
     },
-    "id": 7,
+    "id": 5,
     "subject": Object {
       "$type": "com.atproto.admin.defs#repoRef",
       "did": "user(0)",
@@ -159,7 +137,7 @@ Array [
       "comment": "X",
       "reportType": "com.atproto.moderation.defs#reasonSpam",
     },
-    "id": 12,
+    "id": 10,
     "subject": Object {
       "$type": "com.atproto.repo.strongRef",
       "cid": "cids(0)",
@@ -178,7 +156,7 @@ Array [
       ],
       "remove": Array [],
     },
-    "id": 6,
+    "id": 4,
     "subject": Object {
       "$type": "com.atproto.repo.strongRef",
       "cid": "cids(0)",
@@ -196,7 +174,7 @@ Array [
       "comment": "X",
       "reportType": "com.atproto.moderation.defs#reasonSpam",
     },
-    "id": 5,
+    "id": 3,
     "subject": Object {
       "$type": "com.atproto.repo.strongRef",
       "cid": "cids(0)",

package/tests/__snapshots__/moderation.test.ts.snap

@@ -4,7 +4,7 @@ exports[`moderation reporting creates reports of a record. 1`] = `
 Array [
   Object {
     "createdAt": "1970-01-01T00:00:00.000Z",
-    "id": 7,
+    "id": 5,
     "reasonType": "com.atproto.moderation.defs#reasonSpam",
     "reportedBy": "user(0)",
     "subject": Object {
@@ -15,7 +15,7 @@ Array [
   },
   Object {
     "createdAt": "1970-01-01T00:00:00.000Z",
-    "id": 9,
+    "id": 7,
     "reason": "defamation",
     "reasonType": "com.atproto.moderation.defs#reasonOther",
     "reportedBy": "user(1)",
@@ -32,7 +32,7 @@ exports[`moderation reporting creates reports of a repo. 1`] = `
 Array [
   Object {
     "createdAt": "1970-01-01T00:00:00.000Z",
-    "id": 3,
+    "id": 1,
     "reasonType": "com.atproto.moderation.defs#reasonSpam",
     "reportedBy": "user(0)",
     "subject": Object {
@@ -42,7 +42,7 @@ Array [
   },
   Object {
     "createdAt": "1970-01-01T00:00:00.000Z",
-    "id": 5,
+    "id": 3,
     "reason": "impersonation",
     "reasonType": "com.atproto.moderation.defs#reasonOther",
     "reportedBy": "user(2)",

package/tests/moderation-appeals.test.ts

@@ -118,7 +118,7 @@ describe('moderation-appeals', () => {
       })
 
       // Verify that appeal status changed when appeal report was emitted by moderator
-      const status = await assertBobsPostStatus(REVIEWOPEN, true)
+      const status = await assertBobsPostStatus(REVIEWESCALATED, true)
       expect(status?.appealedAt).not.toBeNull()
 
       // Create a report as normal user for carol's post
@@ -143,7 +143,11 @@ describe('moderation-appeals', () => {
         subject: getCarolPostSubject(),
       })
       // Verify that the appeal status on carol's post is true
-      await assertSubjectStatus(getCarolPostSubject().uri, REVIEWOPEN, true)
+      await assertSubjectStatus(
+        getCarolPostSubject().uri,
+        REVIEWESCALATED,
+        true,
+      )
     })
     it('allows multiple appeals and updates last appealed timestamp', async () => {
       // Resolve appeal with acknowledge
@@ -155,7 +159,7 @@ describe('moderation-appeals', () => {
         createdBy: sc.dids.carol,
       })
 
-      const previousStatus = await assertBobsPostStatus(REVIEWOPEN, false)
+      const previousStatus = await assertBobsPostStatus(REVIEWESCALATED, false)
 
       await emitModerationEvent({
         event: {
@@ -167,7 +171,7 @@ describe('moderation-appeals', () => {
       })
 
       // Verify that even after the appeal event by bob for his post, the appeal status is true again with new timestamp
-      const newStatus = await assertBobsPostStatus(REVIEWOPEN, true)
+      const newStatus = await assertBobsPostStatus(REVIEWESCALATED, true)
       expect(
         new Date(`${previousStatus?.lastAppealedAt}`).getTime(),
       ).toBeLessThan(new Date(`${newStatus?.lastAppealedAt}`).getTime())
@@ -210,7 +214,11 @@ describe('moderation-appeals', () => {
         createdBy: sc.dids.alice,
       })
 
-      await assertSubjectStatus(getAlicesPostSubject().uri, REVIEWOPEN, true)
+      await assertSubjectStatus(
+        getAlicesPostSubject().uri,
+        REVIEWESCALATED,
+        true,
+      )
 
       // Bob reports it again
       await emitModerationEvent({
@@ -222,8 +230,12 @@ describe('moderation-appeals', () => {
         createdBy: sc.dids.bob,
       })
 
-      // Assert that the status is still REVIEWOPEN, as report events are meant to do
-      await assertSubjectStatus(getAlicesPostSubject().uri, REVIEWOPEN, true)
+      // Assert that the status is still REVIEWESCALATED, as report events are meant to do
+      await assertSubjectStatus(
+        getAlicesPostSubject().uri,
+        REVIEWESCALATED,
+        true,
+      )
 
       // Emit an escalation event
       await emitModerationEvent({

package/tests/moderation-events.test.ts

@@ -22,13 +22,13 @@ describe('moderation-events', () => {
   ) => {
     return pdsAgent.api.com.atproto.admin.emitModerationEvent(eventData, {
       encoding: 'application/json',
-      headers: network.bsky.adminAuthHeaders('moderator'),
+      headers: network.ozone.adminAuthHeaders('moderator'),
     })
   }
 
   const queryModerationEvents = (eventQuery) =>
     agent.api.com.atproto.admin.queryModerationEvents(eventQuery, {
-      headers: network.bsky.adminAuthHeaders('moderator'),
+      headers: network.ozone.adminAuthHeaders('moderator'),
     })
 
   const seedEvents = async () => {
@@ -203,11 +203,11 @@ describe('moderation-events', () => {
       const defaultEvents = await getPaginatedEvents()
       const reversedEvents = await getPaginatedEvents('asc')
 
-      expect(allEvents.data.events.length).toEqual(7)
+      expect(allEvents.data.events.length).toEqual(6)
       expect(defaultEvents.length).toEqual(allEvents.data.events.length)
       expect(reversedEvents.length).toEqual(allEvents.data.events.length)
       // First event in the reversed list is the last item in the default list
-      expect(reversedEvents[0].id).toEqual(defaultEvents[6].id)
+      expect(reversedEvents[0].id).toEqual(defaultEvents[5].id)
     })
 
     it('returns report events matching reportType filters', async () => {
@@ -240,7 +240,7 @@ describe('moderation-events', () => {
 
       expect(eventsWithX.data.events.length).toEqual(10)
       expect(eventsWithTest.data.events.length).toEqual(0)
-      expect(eventsWithComment.data.events.length).toEqual(12)
+      expect(eventsWithComment.data.events.length).toEqual(10)
     })
 
     it('returns events matching filter params for labels', async () => {
@@ -325,7 +325,7 @@ describe('moderation-events', () => {
         })
       const addEvent = await tagEvent({ add: ['L1', 'L2'], remove: [] })
       const addAndRemoveEvent = await tagEvent({ add: ['L3'], remove: ['L2'] })
-      const [addFinder, addAndRemoveFinder, removeFinder] = await Promise.all([
+      const [addFinder, addAndRemoveFinder, _removeFinder] = await Promise.all([
         queryModerationEvents({
           addedTags: ['L1'],
         }),
@@ -356,7 +356,7 @@ describe('moderation-events', () => {
     it('gets an event by specific id', async () => {
       const { data } = await pdsAgent.api.com.atproto.admin.getModerationEvent(
         { id: 1 },
-        { headers: network.bsky.adminAuthHeaders('moderator') },
+        { headers: network.ozone.adminAuthHeaders('moderator') },
       )
       expect(forSnapshot(data)).toMatchSnapshot()
     })

package/tests/moderation-statuses.test.ts

@@ -19,13 +19,13 @@ describe('moderation-statuses', () => {
   const emitModerationEvent = async (eventData) => {
     return pdsAgent.api.com.atproto.admin.emitModerationEvent(eventData, {
       encoding: 'application/json',
-      headers: network.bsky.adminAuthHeaders('moderator'),
+      headers: network.ozone.adminAuthHeaders('moderator'),
     })
   }
 
   const queryModerationStatuses = (statusQuery) =>
     agent.api.com.atproto.admin.queryModerationStatuses(statusQuery, {
-      headers: network.bsky.adminAuthHeaders('moderator'),
+      headers: network.ozone.adminAuthHeaders('moderator'),
     })
 
   const seedEvents = async () => {

package/tests/moderation.test.ts

@@ -607,7 +607,7 @@ describe('moderation', () => {
         },
         {
           encoding: 'application/json',
-          headers: network.bsky.adminAuthHeaders('triage'),
+          headers: network.ozone.adminAuthHeaders('triage'),
         },
       )
       await expect(attemptLabel).rejects.toThrow(
@@ -748,7 +748,7 @@ describe('moderation', () => {
         },
         {
           encoding: 'application/json',
-          headers: network.bsky.adminAuthHeaders('moderator'),
+          headers: network.ozone.adminAuthHeaders('moderator'),
         },
       )
       // cleanup
@@ -775,11 +775,11 @@ describe('moderation', () => {
           },
           {
             encoding: 'application/json',
-            headers: network.bsky.adminAuthHeaders('triage'),
+            headers: network.ozone.adminAuthHeaders('triage'),
           },
         )
       await expect(attemptTakedownTriage).rejects.toThrow(
-        'Must be a full moderator to perform an account takedown',
+        'Must be a full moderator to take this type of action',
       )
     })
 
@@ -800,7 +800,7 @@ describe('moderation', () => {
       const { data: statusesAfterTakedown } =
         await agent.api.com.atproto.admin.queryModerationStatuses(
           { subject: sc.dids.bob },
-          { headers: network.bsky.adminAuthHeaders('moderator') },
+          { headers: network.ozone.adminAuthHeaders('moderator') },
         )
 
       expect(statusesAfterTakedown.subjectStatuses[0]).toMatchObject({
@@ -818,11 +818,11 @@ describe('moderation', () => {
       const [{ data: eventList }, { data: statuses }] = await Promise.all([
         agent.api.com.atproto.admin.queryModerationEvents(
           { subject: sc.dids.bob },
-          { headers: network.bsky.adminAuthHeaders('moderator') },
+          { headers: network.ozone.adminAuthHeaders('moderator') },
         ),
         agent.api.com.atproto.admin.queryModerationStatuses(
           { subject: sc.dids.bob },
-          { headers: network.bsky.adminAuthHeaders('moderator') },
+          { headers: network.ozone.adminAuthHeaders('moderator') },
         ),
       ])
 
@@ -879,7 +879,7 @@ describe('moderation', () => {
         },
         {
           encoding: 'application/json',
-          headers: network.bsky.adminAuthHeaders(),
+          headers: network.ozone.adminAuthHeaders(),
         },
       )
       return result.data
@@ -901,7 +901,7 @@ describe('moderation', () => {
         },
         {
           encoding: 'application/json',
-          headers: network.bsky.adminAuthHeaders(),
+          headers: network.ozone.adminAuthHeaders(),
         },
       )
     }
@@ -909,7 +909,7 @@ describe('moderation', () => {
     async function getRecordLabels(uri: string) {
       const result = await agent.api.com.atproto.admin.getRecord(
         { uri },
-        { headers: network.bsky.adminAuthHeaders() },
+        { headers: network.ozone.adminAuthHeaders() },
       )
       const labels = result.data.labels ?? []
       return labels.map((l) => l.val)
@@ -918,7 +918,7 @@ describe('moderation', () => {
     async function getRepoLabels(did: string) {
       const result = await agent.api.com.atproto.admin.getRepo(
         { did },
-        { headers: network.bsky.adminAuthHeaders() },
+        { headers: network.ozone.adminAuthHeaders() },
       )
       const labels = result.data.labels ?? []
       return labels.map((l) => l.val)
@@ -933,7 +933,7 @@ describe('moderation', () => {
       const { ctx } = network.bsky
       post = sc.posts[sc.dids.carol][0]
       blob = post.images[1]
-      imageUri = ctx.imgUriBuilder
+      imageUri = ctx.views.imgUriBuilder
         .getPresetUri(
           'feed_thumbnail',
           sc.dids.carol,
@@ -974,7 +974,8 @@ describe('moderation', () => {
       })
     })
 
-    it('prevents image blob from being served, even when cached.', async () => {
+    // @TODO add back in with image invalidation, see bluesky-social/atproto#2087
+    it.skip('prevents image blob from being served, even when cached.', async () => {
       const fetchImage = await fetch(imageUri)
       expect(fetchImage.status).toEqual(404)
       expect(await fetchImage.json()).toEqual({ message: 'Image not found' })

package/tests/query-labels.test.ts

@@ -0,0 +1,163 @@
+import AtpAgent from '@atproto/api'
+import { TestNetwork } from '@atproto/dev-env'
+import { DisconnectError, Subscription } from '@atproto/xrpc-server'
+import { ids, lexicons } from '../src/lexicon/lexicons'
+import { Label } from '../src/lexicon/types/com/atproto/label/defs'
+import {
+  OutputSchema as LabelMessage,
+  isLabels,
+} from '../src/lexicon/types/com/atproto/label/subscribeLabels'
+
+describe('ozone query labels', () => {
+  let network: TestNetwork
+  let agent: AtpAgent
+
+  let labels: Label[]
+
+  beforeAll(async () => {
+    network = await TestNetwork.create({
+      dbPostgresSchema: 'ozone_query_labels',
+    })
+
+    agent = network.ozone.getClient()
+
+    labels = [
+      {
+        src: 'did:example:labeler',
+        uri: 'did:example:blah',
+        val: 'spam',
+        neg: false,
+        cts: new Date().toISOString(),
+      },
+      {
+        src: 'did:example:labeler',
+        uri: 'did:example:blah',
+        val: 'impersonation',
+        neg: false,
+        cts: new Date().toISOString(),
+      },
+      {
+        src: 'did:example:labeler',
+        uri: 'at://did:example:blah/app.bsky.feed.post/1234abcde',
+        val: 'spam',
+        neg: false,
+        cts: new Date().toISOString(),
+      },
+      {
+        src: 'did:example:labeler',
+        uri: 'at://did:example:blah/app.bsky.feed.post/1234abcfg',
+        val: 'spam',
+        neg: false,
+        cts: new Date().toISOString(),
+      },
+      {
+        src: 'did:example:labeler',
+        uri: 'at://did:example:blah/app.bsky.actor.profile/self',
+        val: 'spam',
+        neg: false,
+        cts: new Date().toISOString(),
+      },
+      {
+        src: 'did:example:labeler',
+        uri: 'did:example:thing',
+        val: 'spam',
+        neg: false,
+        cts: new Date().toISOString(),
+      },
+    ]
+
+    const modService = network.ozone.ctx.modService(network.ozone.ctx.db)
+    await modService.createLabels(labels)
+  })
+
+  afterAll(async () => {
+    await network.close()
+  })
+
+  it('returns all labels', async () => {
+    const res = await agent.api.com.atproto.label.queryLabels({
+      uriPatterns: ['*'],
+    })
+    expect(res.data.labels).toEqual(labels)
+  })
+
+  it('returns all labels even when an additional pattern is supplied', async () => {
+    const res = await agent.api.com.atproto.label.queryLabels({
+      uriPatterns: ['*', 'did:example:blah'],
+    })
+    expect(res.data.labels).toEqual(labels)
+  })
+
+  it('returns all labels that match an exact uri pattern', async () => {
+    const res = await agent.api.com.atproto.label.queryLabels({
+      uriPatterns: ['did:example:blah'],
+    })
+    expect(res.data.labels).toEqual(labels.slice(0, 2))
+  })
+
+  it('returns all labels that match one of multiple exact uris', async () => {
+    const res = await agent.api.com.atproto.label.queryLabels({
+      uriPatterns: [
+        'at://did:example:blah/app.bsky.feed.post/1234abcfg',
+        'at://did:example:blah/app.bsky.actor.profile/self',
+      ],
+    })
+    expect(res.data.labels).toEqual(labels.slice(3, 5))
+  })
+
+  it('returns all labels that match one of multiple uris, exact & glob', async () => {
+    const res = await agent.api.com.atproto.label.queryLabels({
+      uriPatterns: ['at://did:example:blah/app.bsky*', 'did:example:blah'],
+    })
+    expect(res.data.labels).toEqual(labels.slice(0, 5))
+  })
+
+  it('paginates', async () => {
+    const res1 = await agent.api.com.atproto.label.queryLabels({
+      uriPatterns: ['at://did:example:blah/app.bsky*', 'did:example:blah'],
+      limit: 3,
+    })
+    const res2 = await agent.api.com.atproto.label.queryLabels({
+      uriPatterns: ['at://did:example:blah/app.bsky*', 'did:example:blah'],
+      limit: 3,
+      cursor: res1.data.cursor,
+    })
+
+    expect([...res1.data.labels, ...res2.data.labels]).toEqual(
+      labels.slice(0, 5),
+    )
+  })
+
+  describe('subscribeLabels', () => {
+    it('streams all labels from initial cursor.', async () => {
+      const ac = new AbortController()
+      let doneTimer: NodeJS.Timeout
+      const resetDoneTimer = () => {
+        clearTimeout(doneTimer)
+        doneTimer = setTimeout(() => ac.abort(new DisconnectError()), 100)
+      }
+      const sub = new Subscription({
+        signal: ac.signal,
+        service: agent.service.origin.replace('http://', 'ws://'),
+        method: ids.ComAtprotoLabelSubscribeLabels,
+        getParams() {
+          return { cursor: 0 }
+        },
+        validate(obj) {
+          return lexicons.assertValidXrpcMessage<LabelMessage>(
+            ids.ComAtprotoLabelSubscribeLabels,
+            obj,
+          )
+        },
+      })
+      const streamedLabels: Label[] = []
+      for await (const message of sub) {
+        resetDoneTimer()
+        if (isLabels(message)) {
+          streamedLabels.push(...message.labels)
+        }
+      }
+      expect(streamedLabels).toEqual(labels)
+    })
+  })
+})

package/tests/repo-search.test.ts

@@ -117,7 +117,6 @@ describe('admin repo search view', () => {
       { headers },
     )
 
-    expect(full.data.repos.length).toEqual(15)
     expect(results(paginatedAll)).toEqual(results([full.data]))
   })
 })