@atproto/bsky 0.0.96 → 0.0.98

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

@@ -5,6 +5,7 @@ import { ids } from '../../src/lexicon/lexicons'
 describe('bsky takedown labels', () => {
   let network: TestNetwork
   let agent: AtpAgent
+  let pdsAgent: AtpAgent
   let sc: SeedClient
 
   let takendownSubjects: string[]
@@ -20,10 +21,21 @@ describe('bsky takedown labels', () => {
       dbPostgresSchema: 'bsky_views_takedown_labels',
     })
     agent = network.bsky.getClient()
+    pdsAgent = network.pds.getClient()
     sc = network.getSeedClient()
     await basicSeed(sc)
 
     aliceListRef = await sc.createList(sc.dids.alice, 'alice list', 'mod')
+    // carol blocks dan via alice's (takendown) list
+    await sc.addToList(sc.dids.alice, sc.dids.dan, aliceListRef)
+    await pdsAgent.app.bsky.graph.listblock.create(
+      { repo: sc.dids.carol },
+      {
+        subject: aliceListRef.uriStr,
+        createdAt: new Date().toISOString(),
+      },
+      sc.getHeaders(sc.dids.carol),
+    )
     carolListRef = await sc.createList(sc.dids.carol, 'carol list', 'mod')
     aliceGenRef = await sc.createFeedGen(
       sc.dids.alice,
@@ -159,6 +171,25 @@ describe('bsky takedown labels', () => {
     await expect(attempt2).rejects.toThrow('List not found')
   })
 
+  it('halts application of mod lists', async () => {
+    const { data: profile } = await agent.app.bsky.actor.getProfile(
+      {
+        actor: sc.dids.dan, // blocked via alice's takendown list
+      },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.carol,
+          ids.AppBskyActorGetProfile,
+        ),
+      },
+    )
+    expect(profile.did).toBe(sc.dids.dan)
+    expect(profile.viewer).not.toBeUndefined()
+    expect(profile.viewer?.blockedBy).toBe(false)
+    expect(profile.viewer?.blocking).toBeUndefined()
+    expect(profile.viewer?.blockingByList).toBeUndefined()
+  })
+
   it('takesdown feed generators', async () => {
     const res = await agent.api.app.bsky.feed.getFeedGenerators({
       feeds: [aliceGenRef.uriStr, bobGenRef.uriStr, carolGenRef.uriStr],

package/tests/views/likes.test.ts

@@ -11,6 +11,8 @@ describe('pds like views', () => {
   // account dids, for convenience
   let alice: string
   let bob: string
+  let carol: string
+  let frankie: string
 
   beforeAll(async () => {
     network = await TestNetwork.create({
@@ -19,9 +21,17 @@ describe('pds like views', () => {
     agent = network.bsky.getClient()
     sc = network.getSeedClient()
     await likesSeed(sc)
+    await sc.createAccount('frankie', {
+      handle: 'frankie.test',
+      email: 'frankie@frankie.com',
+      password: 'password',
+    })
     await network.processAll()
+
     alice = sc.dids.alice
     bob = sc.dids.bob
+    carol = sc.dids.carol
+    frankie = sc.dids.frankie
   })
 
   afterAll(async () => {
@@ -108,4 +118,70 @@ describe('pds like views', () => {
       }),
     )
   })
+
+  it(`author viewer doesn't see likes by user the author blocked`, async () => {
+    await sc.like(frankie, sc.posts[alice][1].ref)
+    await network.processAll()
+
+    const beforeBlock = await agent.app.bsky.feed.getLikes(
+      { uri: sc.posts[alice][1].ref.uriStr },
+      { headers: await network.serviceHeaders(alice, ids.AppBskyFeedGetLikes) },
+    )
+
+    expect(beforeBlock.data.likes.map((like) => like.actor.did)).toStrictEqual([
+      sc.dids.frankie,
+      sc.dids.eve,
+      sc.dids.dan,
+      sc.dids.carol,
+      sc.dids.bob,
+    ])
+
+    await sc.block(alice, frankie)
+    await network.processAll()
+
+    const afterBlock = await agent.app.bsky.feed.getLikes(
+      { uri: sc.posts[alice][1].ref.uriStr },
+      { headers: await network.serviceHeaders(alice, ids.AppBskyFeedGetLikes) },
+    )
+
+    expect(afterBlock.data.likes.map((like) => like.actor.did)).toStrictEqual([
+      sc.dids.eve,
+      sc.dids.dan,
+      sc.dids.carol,
+      sc.dids.bob,
+    ])
+  })
+
+  it(`non-author viewer doesn't see likes by user the author blocked and by user the viewer blocked `, async () => {
+    await sc.unblock(alice, frankie)
+    await network.processAll()
+
+    const beforeBlock = await agent.app.bsky.feed.getLikes(
+      { uri: sc.posts[alice][1].ref.uriStr },
+      { headers: await network.serviceHeaders(bob, ids.AppBskyFeedGetLikes) },
+    )
+
+    expect(beforeBlock.data.likes.map((like) => like.actor.did)).toStrictEqual([
+      sc.dids.frankie,
+      sc.dids.eve,
+      sc.dids.dan,
+      sc.dids.carol,
+      sc.dids.bob,
+    ])
+
+    await sc.block(alice, frankie)
+    await sc.block(bob, carol)
+    await network.processAll()
+
+    const afterBlock = await agent.app.bsky.feed.getLikes(
+      { uri: sc.posts[alice][1].ref.uriStr },
+      { headers: await network.serviceHeaders(bob, ids.AppBskyFeedGetLikes) },
+    )
+
+    expect(afterBlock.data.likes.map((like) => like.actor.did)).toStrictEqual([
+      sc.dids.eve,
+      sc.dids.dan,
+      sc.dids.bob,
+    ])
+  })
 })

package/tests/views/notifications.test.ts

@@ -417,6 +417,84 @@ describe('notification views', () => {
       ),
     ).toBe(true)
     expect(forSnapshot(notifs.data)).toMatchSnapshot()
+    await agent.api.app.bsky.notification.putPreferences(
+      { priority: false },
+      {
+        encoding: 'application/json',
+        headers: await network.serviceHeaders(
+          sc.dids.carol,
+          ids.AppBskyNotificationPutPreferences,
+        ),
+      },
+    )
+    await network.processAll()
+  })
+
+  it('filters notifications by reason', async () => {
+    const res = await agent.app.bsky.notification.listNotifications(
+      {
+        reasons: ['mention'],
+      },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.alice,
+          ids.AppBskyNotificationListNotifications,
+        ),
+      },
+    )
+    expect(res.data.notifications.length).toBe(1)
+    expect(forSnapshot(res.data)).toMatchSnapshot()
+  })
+
+  it('filters notifications by multiple reasons', async () => {
+    const res = await agent.app.bsky.notification.listNotifications(
+      {
+        reasons: ['mention', 'reply'],
+      },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.alice,
+          ids.AppBskyNotificationListNotifications,
+        ),
+      },
+    )
+    expect(res.data.notifications.length).toBe(4)
+    expect(forSnapshot(res.data)).toMatchSnapshot()
+  })
+
+  it('paginates filtered notifications', async () => {
+    const results = (results) =>
+      sort(results.flatMap((res) => res.notifications))
+    const paginator = async (cursor?: string) => {
+      const res = await agent.app.bsky.notification.listNotifications(
+        { reasons: ['mention', 'reply'], cursor, limit: 2 },
+        {
+          headers: await network.serviceHeaders(
+            alice,
+            ids.AppBskyNotificationListNotifications,
+          ),
+        },
+      )
+      return res.data
+    }
+
+    const paginatedAll = await paginateAll(paginator)
+    paginatedAll.forEach((res) =>
+      expect(res.notifications.length).toBeLessThanOrEqual(2),
+    )
+
+    const full = await agent.app.bsky.notification.listNotifications(
+      { reasons: ['mention', 'reply'] },
+      {
+        headers: await network.serviceHeaders(
+          alice,
+          ids.AppBskyNotificationListNotifications,
+        ),
+      },
+    )
+
+    expect(full.data.notifications.length).toBe(4)
+    expect(results(paginatedAll)).toEqual(results([full.data]))
   })
 
   it('fails open on clearly bad cursor.', async () => {