@atproto/bsky 0.0.116 → 0.0.118

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

@@ -1,4 +1,5 @@
-import { AtpAgent } from '@atproto/api'
+import assert from 'node:assert'
+import { AppBskyLabelerDefs, AtpAgent } from '@atproto/api'
 import { RecordRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
 
@@ -121,6 +122,7 @@ describe('bsky takedown labels', () => {
       uri,
       cid: '',
       val: '!takedown',
+      exp: null,
       neg: false,
       cts,
     }))
@@ -232,7 +234,8 @@ describe('bsky takedown labels', () => {
       dids: [sc.dids.labeler1, sc.dids.labeler2],
     })
     expect(res.data.views.length).toBe(1)
-    expect(res.data.views[0].creator?.['did']).toBe(sc.dids.labeler2)
+    assert(AppBskyLabelerDefs.isLabelerView(res.data.views[0]))
+    expect(res.data.views[0].creator.did).toBe(sc.dids.labeler2)
   })
 
   it('only applies if the relevant labeler is configured', async () => {

package/tests/views/list-feed.test.ts

@@ -118,11 +118,14 @@ describe('list feed views', () => {
         }
         if (item.reply) {
           result.reply = {
-            parent: stripViewerFromPost(item.reply.parent),
-            root: stripViewerFromPost(item.reply.root),
-            grandparentAuthor:
-              item.reply.grandparentAuthor &&
-              stripViewer(item.reply.grandparentAuthor),
+            parent: stripViewerFromPost(item.reply.parent, true),
+            root: stripViewerFromPost(item.reply.root, true),
+          }
+
+          if (item.reply.grandparentAuthor) {
+            result.reply.grandparentAuthor = stripViewer(
+              item.reply.grandparentAuthor,
+            )
           }
         }
         return result

package/tests/views/posts.test.ts

@@ -1,4 +1,4 @@
-import { AppBskyFeedPost, AtpAgent } from '@atproto/api'
+import { AppBskyFeedPost, AtpAgent, Un$Typed } from '@atproto/api'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { RecordWithMedia } from '../../dist/views/types'
 import { ids } from '../../src/lexicon/lexicons'
@@ -96,7 +96,7 @@ describe('pds posts views', () => {
   })
 
   it('allows for creating posts with tags', async () => {
-    const post: AppBskyFeedPost.Record = {
+    const post: Un$Typed<AppBskyFeedPost.Record> = {
       text: 'hello world',
       tags: ['javascript', 'hehe'],
       createdAt: new Date().toISOString(),

package/tests/views/starter-packs.test.ts

@@ -1,10 +1,12 @@
 import assert from 'node:assert'
-import { AtpAgent } from '@atproto/api'
+import { AtpAgent, asPredicate } from '@atproto/api'
 import { RecordRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
-import { isRecord as isProfile } from '../../src/lexicon/types/app/bsky/actor/profile'
+import { validateRecord as validateProfileRecord } from '../../src/lexicon/types/app/bsky/actor/profile'
 import { forSnapshot } from '../_util'
 
+const isValidProfile = asPredicate(validateProfileRecord)
+
 describe('starter packs', () => {
   let network: TestNetwork
   let agent: AtpAgent
@@ -147,7 +149,7 @@ describe('starter packs', () => {
       expect(notif.reason).toBe('starterpack-joined')
       expect(notif.reasonSubject).toBe(sp1.uriStr)
       expect(notif.uri).toMatch(/\/app\.bsky\.actor\.profile\/self$/)
-      assert(isProfile(notif.record), 'record is not profile')
+      assert(isValidProfile(notif.record), 'record is not profile')
       expect(notif.record.joinedViaStarterPack?.uri).toBe(sp1.uriStr)
     })
     expect(forSnapshot(notifications)).toMatchSnapshot()

package/tests/views/thread.test.ts

@@ -1,6 +1,8 @@
+import assert from 'node:assert'
 import { AppBskyFeedGetPostThread, AtpAgent } from '@atproto/api'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
+import { isThreadViewPost } from '../../src/lexicon/types/app/bsky/feed/defs'
 import {
   assertIsThreadViewPost,
   forSnapshot,
@@ -404,7 +406,10 @@ describe('pds thread views', () => {
         },
       )
 
-      const parent = threadPreTakedown.data.thread.parent?.['post']
+      assert(isThreadViewPost(threadPreTakedown.data.thread))
+      assert(isThreadViewPost(threadPreTakedown.data.thread.parent))
+
+      const parent = threadPreTakedown.data.thread.parent.post
 
       await network.bsky.ctx.dataplane.takedownRecord({
         recordUri: parent.uri,
@@ -439,8 +444,18 @@ describe('pds thread views', () => {
           ),
         },
       )
+
+      assert(isThreadViewPost(threadPreTakedown.data.thread))
+      assert(isThreadViewPost(threadPreTakedown.data.thread.replies?.[0]))
+      assert(isThreadViewPost(threadPreTakedown.data.thread.replies?.[1]))
+      assert(
+        isThreadViewPost(
+          threadPreTakedown.data.thread.replies?.[1].replies?.[0],
+        ),
+      )
+
       const post1 = threadPreTakedown.data.thread.replies?.[0].post
-      const post2 = threadPreTakedown.data.thread.replies?.[1].replies[0].post
+      const post2 = threadPreTakedown.data.thread.replies?.[1].replies?.[0].post
 
       await Promise.all(
         [post1, post2].map((post) =>

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,
     })