@atproto/bsky 0.0.117 → 0.0.118

package/src/views/index.ts

@@ -176,13 +176,23 @@ export class Views {
     return uri
   }
 
-  viewerSeesNeedsReview(did: string, state: HydrationState): boolean {
+  viewerSeesNeedsReview(
+    { did, uri }: { did?: string; uri?: string },
+    state: HydrationState,
+  ): boolean {
     const { labels, profileViewers, ctx } = state
-    return (
-      !labels?.get(did)?.needsReview ||
-      ctx?.viewer === did ||
-      !!profileViewers?.get(did)?.following
-    )
+    did = did || (uri && uriToDid(uri))
+    if (!did) {
+      return true
+    }
+    if (
+      labels?.get(did)?.needsReview ||
+      (uri && labels?.get(uri)?.needsReview)
+    ) {
+      // content marked as needs review
+      return ctx?.viewer === did || !!profileViewers?.get(did)?.following
+    }
+    return true
   }
 
   replyIsHiddenByThreadgate(
@@ -972,7 +982,7 @@ export class Views {
       if (this.viewerBlockExists(post.author.did, state)) {
         return this.blockedPost(uri, post.author.did, state)
       }
-      if (!this.viewerSeesNeedsReview(post.author.did, state)) {
+      if (!this.viewerSeesNeedsReview({ uri, did: post.author.did }, state)) {
         return undefined
       }
       return {

package/tests/label-hydration.test.ts

@@ -1,4 +1,6 @@
+import assert from 'node:assert'
 import { AtpAgent } from '@atproto/api'
+import { MINUTE } from '@atproto/common'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 
 describe('label hydration', () => {
@@ -10,6 +12,7 @@ describe('label hydration', () => {
   let bob: string
   let carol: string
   let labelerDid: string
+  let labeler2Did: string
 
   beforeAll(async () => {
     network = await TestNetwork.create({
@@ -22,6 +25,7 @@ describe('label hydration', () => {
     bob = sc.dids.bob
     carol = sc.dids.carol
     labelerDid = network.bsky.ctx.cfg.labelsFromIssuerDids[0]
+    labeler2Did = network.bsky.ctx.cfg.labelsFromIssuerDids[1]
     await createLabel({ src: alice, uri: carol, cid: '', val: 'spam' })
     await createLabel({ src: bob, uri: carol, cid: '', val: 'impersonation' })
     await createLabel({
@@ -30,6 +34,20 @@ describe('label hydration', () => {
       cid: '',
       val: 'misleading',
     })
+    await createLabel({
+      src: labeler2Did,
+      uri: carol,
+      cid: '',
+      val: 'expired',
+      exp: new Date(Date.now() - MINUTE).toISOString(),
+    })
+    await createLabel({
+      src: labeler2Did,
+      uri: carol,
+      cid: '',
+      val: 'not-expired',
+      exp: new Date(Date.now() + MINUTE).toISOString(),
+    })
     await network.processAll()
   })
 
@@ -39,17 +57,33 @@ describe('label hydration', () => {
 
   it('hydrates labels based on a supplied labeler header', async () => {
     AtpAgent.configure({ appLabelers: [alice] })
-    pdsAgent.configureLabelers([])
+    pdsAgent.configureLabelers([labeler2Did])
     const res = await pdsAgent.api.app.bsky.actor.getProfile(
       { actor: carol },
       {
         headers: sc.getHeaders(bob),
       },
     )
-    expect(res.data.labels?.length).toBe(1)
-    expect(res.data.labels?.[0].src).toBe(alice)
-    expect(res.data.labels?.[0].val).toBe('spam')
-    expect(res.headers['atproto-content-labelers']).toEqual(`${alice};redact`)
+    expect(res.data.labels?.length).toBe(2)
+    assert(res.data.labels)
+
+    const sortedLabels = res.data.labels.sort((a, b) =>
+      a.src.localeCompare(b.src),
+    )
+    const sortedExpected = [
+      { src: labeler2Did, val: 'not-expired' },
+      { src: alice, val: 'spam' },
+    ].sort((a, b) => a.src.localeCompare(b.src))
+
+    expect(sortedLabels[0].src).toBe(sortedExpected[0].src)
+    expect(sortedLabels[0].val).toBe(sortedExpected[0].val)
+
+    expect(sortedLabels[1].src).toBe(sortedExpected[1].src)
+    expect(sortedLabels[1].val).toBe(sortedExpected[1].val)
+
+    expect(res.headers['atproto-content-labelers']).toEqual(
+      `${alice};redact,${labeler2Did}`,
+    )
   })
 
   it('hydrates labels based on multiple a supplied labelers', async () => {
@@ -88,9 +122,21 @@ describe('label hydration', () => {
       { headers: sc.getHeaders(bob) },
     )
     const data = await res.json()
-    expect(data.labels?.length).toBe(1)
-    expect(data.labels?.[0].src).toBe(labelerDid)
-    expect(data.labels?.[0].val).toBe('misleading')
+
+    expect(data.labels?.length).toBe(2)
+    assert(data.labels)
+
+    const sortedLabels = data.labels.sort((a, b) => a.src.localeCompare(b.src))
+    const sortedExpected = [
+      { src: labeler2Did, val: 'not-expired' },
+      { src: labelerDid, val: 'misleading' },
+    ].sort((a, b) => a.src.localeCompare(b.src))
+
+    expect(sortedLabels[0].src).toBe(sortedExpected[0].src)
+    expect(sortedLabels[0].val).toBe(sortedExpected[0].val)
+
+    expect(sortedLabels[1].src).toBe(sortedExpected[1].src)
+    expect(sortedLabels[1].val).toBe(sortedExpected[1].val)
 
     expect(res.headers.get('atproto-content-labelers')).toEqual(
       network.bsky.ctx.cfg.labelsFromIssuerDids
@@ -181,6 +227,7 @@ describe('label hydration', () => {
     uri: string
     cid: string
     val: string
+    exp?: string
   }) => {
     await network.bsky.db.db
       .insertInto('label')
@@ -189,6 +236,7 @@ describe('label hydration', () => {
         cid: opts.cid,
         val: opts.val,
         cts: new Date().toISOString(),
+        exp: opts.exp ?? null,
         neg: false,
         src: opts.src ?? labelerDid,
       })

package/tests/query-labels.test.ts

@@ -76,6 +76,7 @@ describe('label hydration', () => {
         cid: opts.cid,
         val: opts.val,
         cts: new Date().toISOString(),
+        exp: null,
         neg: false,
         src: opts.src ?? labelerDid,
       })

package/tests/views/labels-needs-review.test.ts

@@ -43,126 +43,272 @@ describe('bsky needs-review labels', () => {
     await network.processAll()
 
     AtpAgent.configure({ appLabelers: [network.ozone.ctx.cfg.service.did] })
-    await network.bsky.db.db
-      .insertInto('label')
-      .values({
-        src: network.ozone.ctx.cfg.service.did,
-        uri: sc.dids.geoff,
-        cid: '',
-        val: 'needs-review',
-        neg: false,
-        cts: new Date().toISOString(),
-      })
-      .execute()
   })
 
   afterAll(async () => {
     await network.close()
   })
 
-  it('applies to thread replies.', async () => {
-    const {
-      data: { thread },
-    } = await agent.app.bsky.feed.getPostThread({
-      uri: sc.posts[sc.dids.alice][0].ref.uriStr,
+  describe('account-level', () => {
+    beforeAll(async () => {
+      await network.bsky.db.db
+        .insertInto('label')
+        .values({
+          src: network.ozone.ctx.cfg.service.did,
+          uri: sc.dids.geoff,
+          cid: '',
+          val: 'needs-review',
+          exp: null,
+          neg: false,
+          cts: new Date().toISOString(),
+        })
+        .execute()
     })
-    assert(isThreadViewPost(thread))
-    expect(
-      thread.replies?.some((reply) => {
-        return (
-          isThreadViewPost(reply) && reply.post.author.did === sc.dids.geoff
-        )
-      }),
-    ).toBe(false)
-  })
 
-  it('applies to quote lists.', async () => {
-    const {
-      data: { posts },
-    } = await agent.app.bsky.feed.getQuotes({
-      uri: sc.posts[sc.dids.alice][0].ref.uriStr,
+    afterAll(async () => {
+      await network.bsky.db.db
+        .deleteFrom('label')
+        .where('src', '=', network.ozone.ctx.cfg.service.did)
+        .execute()
     })
-    expect(
-      posts.some((post) => {
-        return post.author.did === sc.dids.geoff
-      }),
-    ).toBe(false)
-  })
 
-  it('applies to reply, quote, and mention notifications.', async () => {
-    const {
-      data: { notifications },
-    } = await agent.app.bsky.notification.listNotifications(
-      {},
-      {
-        headers: await network.serviceHeaders(
-          sc.dids.alice,
-          ids.AppBskyNotificationListNotifications,
-        ),
-      },
-    )
-    expect(
-      notifications.some((notif) => {
-        return notif.reason === 'reply' && notif.author.did === sc.dids.geoff
-      }),
-    ).toBe(false)
-    expect(
-      notifications.some((notif) => {
-        return notif.reason === 'quote' && notif.author.did === sc.dids.geoff
-      }),
-    ).toBe(false)
-    expect(
-      notifications.some((notif) => {
-        return notif.reason === 'mention' && notif.author.did === sc.dids.geoff
-      }),
-    ).toBe(false)
-  })
+    it('applies to thread replies.', async () => {
+      const {
+        data: { thread },
+      } = await agent.app.bsky.feed.getPostThread({
+        uri: sc.posts[sc.dids.alice][0].ref.uriStr,
+      })
+      assert(isThreadViewPost(thread))
+      expect(
+        thread.replies?.some((reply) => {
+          return (
+            isThreadViewPost(reply) && reply.post.author.did === sc.dids.geoff
+          )
+        }),
+      ).toBe(false)
+    })
 
-  it('does not apply to self.', async () => {
-    const {
-      data: { thread },
-    } = await agent.app.bsky.feed.getPostThread(
-      {
+    it('applies to quote lists.', async () => {
+      const {
+        data: { posts },
+      } = await agent.app.bsky.feed.getQuotes({
         uri: sc.posts[sc.dids.alice][0].ref.uriStr,
-      },
-      {
-        headers: await network.serviceHeaders(
-          sc.dids.geoff,
-          ids.AppBskyFeedGetPostThread,
-        ),
-      },
-    )
-    assert(isThreadViewPost(thread))
-    expect(
-      thread.replies?.some((reply) => {
-        return (
-          isThreadViewPost(reply) && reply.post.author.did === sc.dids.geoff
-        )
-      }),
-    ).toBe(true)
+      })
+      expect(
+        posts.some((post) => {
+          return post.author.did === sc.dids.geoff
+        }),
+      ).toBe(false)
+    })
+
+    it('applies to reply, quote, and mention notifications.', async () => {
+      const {
+        data: { notifications },
+      } = await agent.app.bsky.notification.listNotifications(
+        {},
+        {
+          headers: await network.serviceHeaders(
+            sc.dids.alice,
+            ids.AppBskyNotificationListNotifications,
+          ),
+        },
+      )
+      expect(
+        notifications.some((notif) => {
+          return notif.reason === 'reply' && notif.author.did === sc.dids.geoff
+        }),
+      ).toBe(false)
+      expect(
+        notifications.some((notif) => {
+          return notif.reason === 'quote' && notif.author.did === sc.dids.geoff
+        }),
+      ).toBe(false)
+      expect(
+        notifications.some((notif) => {
+          return (
+            notif.reason === 'mention' && notif.author.did === sc.dids.geoff
+          )
+        }),
+      ).toBe(false)
+    })
+
+    it('does not apply to self.', async () => {
+      const {
+        data: { thread },
+      } = await agent.app.bsky.feed.getPostThread(
+        {
+          uri: sc.posts[sc.dids.alice][0].ref.uriStr,
+        },
+        {
+          headers: await network.serviceHeaders(
+            sc.dids.geoff,
+            ids.AppBskyFeedGetPostThread,
+          ),
+        },
+      )
+      assert(isThreadViewPost(thread))
+      expect(
+        thread.replies?.some((reply) => {
+          return (
+            isThreadViewPost(reply) && reply.post.author.did === sc.dids.geoff
+          )
+        }),
+      ).toBe(true)
+    })
+
+    it('does not apply to followers.', async () => {
+      const {
+        data: { thread },
+      } = await agent.app.bsky.feed.getPostThread(
+        {
+          uri: sc.posts[sc.dids.alice][0].ref.uriStr,
+        },
+        {
+          headers: await network.serviceHeaders(
+            sc.dids.bob, // follows geoff
+            ids.AppBskyFeedGetPostThread,
+          ),
+        },
+      )
+      assert(isThreadViewPost(thread))
+      expect(
+        thread.replies?.some((reply) => {
+          return (
+            isThreadViewPost(reply) && reply.post.author.did === sc.dids.geoff
+          )
+        }),
+      ).toBe(true)
+    })
   })
 
-  it('does not apply to followers.', async () => {
-    const {
-      data: { thread },
-    } = await agent.app.bsky.feed.getPostThread(
-      {
-        uri: sc.posts[sc.dids.alice][0].ref.uriStr,
-      },
-      {
-        headers: await network.serviceHeaders(
-          sc.dids.bob, // follows geoff
-          ids.AppBskyFeedGetPostThread,
-        ),
-      },
-    )
-    assert(isThreadViewPost(thread))
-    expect(
-      thread.replies?.some((reply) => {
-        return (
-          isThreadViewPost(reply) && reply.post.author.did === sc.dids.geoff
+  describe('record-level', () => {
+    beforeAll(async () => {
+      const geoffPostUris = [
+        ...sc.posts[sc.dids.geoff],
+        ...sc.replies[sc.dids.geoff],
+      ].map((post) => post.ref.uriStr)
+      await network.bsky.db.db
+        .insertInto('label')
+        .values(
+          geoffPostUris.map((uri) => ({
+            src: network.ozone.ctx.cfg.service.did,
+            uri,
+            cid: '',
+            val: 'needs-review',
+            exp: null,
+            neg: false,
+            cts: new Date().toISOString(),
+          })),
         )
-      }),
-    ).toBe(true)
+        .execute()
+    })
+
+    it('applies to thread replies.', async () => {
+      const {
+        data: { thread },
+      } = await agent.app.bsky.feed.getPostThread({
+        uri: sc.posts[sc.dids.alice][0].ref.uriStr,
+      })
+      assert(isThreadViewPost(thread))
+      expect(
+        thread.replies?.some((reply) => {
+          return (
+            isThreadViewPost(reply) && reply.post.author.did === sc.dids.geoff
+          )
+        }),
+      ).toBe(false)
+    })
+
+    it('applies to quote lists.', async () => {
+      const {
+        data: { posts },
+      } = await agent.app.bsky.feed.getQuotes({
+        uri: sc.posts[sc.dids.alice][0].ref.uriStr,
+      })
+      expect(
+        posts.some((post) => {
+          return post.author.did === sc.dids.geoff
+        }),
+      ).toBe(false)
+    })
+
+    it('applies to reply, quote, and mention notifications.', async () => {
+      const {
+        data: { notifications },
+      } = await agent.app.bsky.notification.listNotifications(
+        {},
+        {
+          headers: await network.serviceHeaders(
+            sc.dids.alice,
+            ids.AppBskyNotificationListNotifications,
+          ),
+        },
+      )
+      expect(
+        notifications.some((notif) => {
+          return notif.reason === 'reply' && notif.author.did === sc.dids.geoff
+        }),
+      ).toBe(false)
+      expect(
+        notifications.some((notif) => {
+          return notif.reason === 'quote' && notif.author.did === sc.dids.geoff
+        }),
+      ).toBe(false)
+      expect(
+        notifications.some((notif) => {
+          return (
+            notif.reason === 'mention' && notif.author.did === sc.dids.geoff
+          )
+        }),
+      ).toBe(false)
+    })
+
+    it('does not apply to self.', async () => {
+      const {
+        data: { thread },
+      } = await agent.app.bsky.feed.getPostThread(
+        {
+          uri: sc.posts[sc.dids.alice][0].ref.uriStr,
+        },
+        {
+          headers: await network.serviceHeaders(
+            sc.dids.geoff,
+            ids.AppBskyFeedGetPostThread,
+          ),
+        },
+      )
+      assert(isThreadViewPost(thread))
+      expect(
+        thread.replies?.some((reply) => {
+          return (
+            isThreadViewPost(reply) && reply.post.author.did === sc.dids.geoff
+          )
+        }),
+      ).toBe(true)
+    })
+
+    it('does not apply to followers.', async () => {
+      const {
+        data: { thread },
+      } = await agent.app.bsky.feed.getPostThread(
+        {
+          uri: sc.posts[sc.dids.alice][0].ref.uriStr,
+        },
+        {
+          headers: await network.serviceHeaders(
+            sc.dids.bob, // follows geoff
+            ids.AppBskyFeedGetPostThread,
+          ),
+        },
+      )
+      assert(isThreadViewPost(thread))
+      expect(
+        thread.replies?.some((reply) => {
+          return (
+            isThreadViewPost(reply) && reply.post.author.did === sc.dids.geoff
+          )
+        }),
+      ).toBe(true)
+    })
   })
 })

package/tests/views/labels-takedown.test.ts

@@ -122,6 +122,7 @@ describe('bsky takedown labels', () => {
       uri,
       cid: '',
       val: '!takedown',
+      exp: null,
       neg: false,
       cts,
     }))

package/tests/views/timeline.test.ts

@@ -315,6 +315,7 @@ const createLabel = async (
       cid: opts.cid,
       val: opts.val,
       cts: new Date().toISOString(),
+      exp: null,
       neg: false,
       src: EXAMPLE_LABELER,
     })