@atproto/bsky 0.0.249 → 0.0.251

package/tests/views/notifications.test.ts

@@ -1036,6 +1036,9 @@ describe('notification views', () => {
 
   describe('preferences v2', () => {
     beforeEach(async () => {
+      // Drain pending bsync ops before clearing, so a stale op can't land
+      // after the reset.
+      await network.processAll()
       await clearPrivateData(db)
     })
 
@@ -1354,6 +1357,9 @@ describe('notification views', () => {
     })
 
     beforeEach(async () => {
+      // Drain pending bsync ops before clearing, so a stale op can't land
+      // after the reset.
+      await network.processAll()
       await clearActivitySubscription(db)
     })
 
@@ -1383,6 +1389,7 @@ describe('notification views', () => {
         subject: subjectDid,
         activitySubscription: val,
       })
+      await network.processAll()
 
       const { data: listData } = await list(actorDid)
       expect(listData).toEqual({
@@ -1413,6 +1420,7 @@ describe('notification views', () => {
         subject: subjectDid,
         activitySubscription: valUpdate,
       })
+      await network.processAll()
 
       const { data: listData } = await list(actorDid)
       expect(listData).toEqual({
@@ -1435,10 +1443,12 @@ describe('notification views', () => {
       const valDelete = { post: false, reply: false }
 
       await put(actorDid, subjectDid, valCreate)
+      await network.processAll()
       const { data: list0 } = await list(actorDid)
       expect(list0.subscriptions).toHaveLength(1)
 
       await put(actorDid, subjectDid, valDelete)
+      await network.processAll()
       const { data: list1 } = await list(actorDid)
       expect(list1.subscriptions).toHaveLength(0)
     })
@@ -1454,6 +1464,7 @@ describe('notification views', () => {
       await put(actorDid, eve, val)
       await put(actorDid, fred, val)
       await put(actorDid, blocked, val) // blocked is removed from the list.
+      await network.processAll()
 
       const results = (
         results: AppBskyNotificationListActivitySubscriptions.OutputSchema[],
@@ -1507,24 +1518,29 @@ describe('notification views', () => {
 
         // 'none' declaration.
         await put(viewer, bob, val)
+        await network.processAll()
         await expect(viewerActivitySub(viewer, bob)).resolves.toBeUndefined()
 
         // 'mutuals' declaration and both follow.
         await put(viewer, carol, val)
+        await network.processAll()
         await expect(viewerActivitySub(viewer, carol)).resolves.toStrictEqual(
           val,
         )
 
         // 'mutuals' declaration but only actor follows.
         await put(viewer, dan, val)
+        await network.processAll()
         await expect(viewerActivitySub(viewer, dan)).resolves.toBeUndefined()
 
         // 'mutuals' declaration but only subject follows.
         await put(viewer, eve, val)
+        await network.processAll()
         await expect(viewerActivitySub(viewer, eve)).resolves.toBeUndefined()
 
         // 'followers' declaration and viewer follows.
         await put(viewer, fred, val)
+        await network.processAll()
         await expect(viewerActivitySub(viewer, carol)).resolves.toStrictEqual(
           val,
         )

package/tests/views/post-search.test.ts

@@ -5,6 +5,7 @@ import type { DidString } from '@atproto/syntax'
 import { DatabaseSchema } from '../../src/index.js'
 
 const TAG_HIDE = 'hide'
+const TAG_ALWAYS_HIDE = 'always-hide'
 
 describe('appview search', () => {
   let network: TestNetwork
@@ -14,6 +15,10 @@ describe('appview search', () => {
   let post0: Awaited<ReturnType<SeedClient['post']>>
   let post1: Awaited<ReturnType<SeedClient['post']>>
   let post2: Awaited<ReturnType<SeedClient['post']>>
+  // 'unicorn' term, kept separate from the 'doggo' posts above so the
+  // always-hide cases don't perturb the existing expectations.
+  let unicornPost: Awaited<ReturnType<SeedClient['post']>>
+  let unicornPostAlwaysHidden: Awaited<ReturnType<SeedClient['post']>>
   let allResults: string[]
   let nonTaggedResults: string[]
 
@@ -27,6 +32,7 @@ describe('appview search', () => {
       dbPostgresSchema: 'bsky_views_search',
       bsky: {
         searchTagsHide: new Set([TAG_HIDE]),
+        searchTagsHideAll: new Set([TAG_ALWAYS_HIDE]),
       },
     })
     agent = network.bsky.getAgent()
@@ -43,10 +49,18 @@ describe('appview search', () => {
     post2 = await sc.post(alice, 'cute doggo')
     await network.processAll()
 
+    unicornPost = await sc.post(alice, 'a unicorn')
+    unicornPostAlwaysHidden = await sc.post(alice, 'another unicorn')
+    await network.processAll()
+
     await createTag(network.bsky.db.db, {
       uri: post1.ref.uriStr,
       val: TAG_HIDE,
     })
+    await createTag(network.bsky.db.db, {
+      uri: unicornPostAlwaysHidden.ref.uriStr,
+      val: TAG_ALWAYS_HIDE,
+    })
 
     allResults = [post2.ref.uriStr, post1.ref.uriStr, post0.ref.uriStr]
     nonTaggedResults = [post2.ref.uriStr, post0.ref.uriStr]
@@ -180,6 +194,73 @@ describe('appview search', () => {
       expect(resLatest.data.posts.map((p) => p.uri)).toStrictEqual(allResults)
     })
   })
+
+  describe('searchTagsHideAll', () => {
+    // Unlike searchTagsHide, an always-hide tag is filtered from every
+    // surface: both 'top' and 'latest', and even when an author is specified.
+    it.each(['top', 'latest'] as const)(
+      `with '%s' sort, hides always-hidden posts`,
+      async (sort) => {
+        const res = await agent.app.bsky.feed.searchPosts(
+          { q: 'unicorn', sort },
+          {
+            headers: await network.serviceHeaders(
+              carol,
+              ids.AppBskyFeedSearchPosts,
+            ),
+          },
+        )
+        expect(res.data.posts.map((p) => p.uri)).toStrictEqual([
+          unicornPost.ref.uriStr,
+        ])
+      },
+    )
+
+    it.each(['top', 'latest'] as const)(
+      `with '%s' sort, hides always-hidden posts even when specifying author`,
+      async (sort) => {
+        const res = await agent.app.bsky.feed.searchPosts(
+          { q: 'unicorn', author: alice, sort },
+          {
+            headers: await network.serviceHeaders(
+              carol,
+              ids.AppBskyFeedSearchPosts,
+            ),
+          },
+        )
+        expect(res.data.posts.map((p) => p.uri)).toStrictEqual([
+          unicornPost.ref.uriStr,
+        ])
+      },
+    )
+
+    it('includes always-hidden posts from the viewer', async () => {
+      const res = await agent.app.bsky.feed.searchPosts(
+        { q: 'unicorn', sort: 'latest' },
+        {
+          headers: await network.serviceHeaders(
+            alice,
+            ids.AppBskyFeedSearchPosts,
+          ),
+        },
+      )
+      expect(res.data.posts.map((p) => p.uri)).toStrictEqual([
+        unicornPostAlwaysHidden.ref.uriStr,
+        unicornPost.ref.uriStr,
+      ])
+    })
+
+    it('mod service finds even always-hidden posts', async () => {
+      const res = await ozoneAgent.app.bsky.feed.searchPosts(
+        { q: 'unicorn', sort: 'latest' },
+        { headers: await network.ozone.modHeaders(ids.AppBskyFeedSearchPosts) },
+      )
+      expect(res.data.posts.map((p) => p.uri)).toStrictEqual([
+        unicornPostAlwaysHidden.ref.uriStr,
+        unicornPost.ref.uriStr,
+      ])
+    })
+  })
 })
 
 const createTag = async (