@atproto/bsky 0.0.152 → 0.0.153

package/tests/seed/thread-v2.ts

@@ -1,3 +1,4 @@
+import { sql } from 'kysely'
 import { AppBskyFeedPost } from '@atproto/api'
 import {
   RecordRef,
@@ -5,6 +6,7 @@ import {
   TestNetwork,
   TestNetworkNoAppView,
 } from '@atproto/dev-env'
+import { DatabaseSchema } from '../../src/data-plane/server/db/database-schema'
 import { User, createUsers } from './util'
 
 type ReplyFn = (
@@ -15,6 +17,9 @@ type ReplyFn = (
 
 type ReplyCb = (r: ReplyFn) => Promise<void>
 
+export const TAG_BUMP_DOWN = 'down'
+export const TAG_HIDE = 'hide'
+
 const rootReplyFnBuilder = <T extends TestNetworkNoAppView>(
   sc: SeedClient<T>,
   root: RecordRef,
@@ -95,10 +100,7 @@ const createThread = async <T extends TestNetworkNoAppView>(
   return { root, replies }
 }
 
-export async function simple(
-  sc: SeedClient<TestNetwork | TestNetworkNoAppView>,
-  prefix = 'simple',
-) {
+export async function simple(sc: SeedClient<TestNetwork>, prefix = 'simple') {
   const users = await createUsers(sc, prefix, [
     'op',
     'alice',
@@ -126,7 +128,7 @@ export async function simple(
   }
 }
 
-export async function long(sc: SeedClient<TestNetwork | TestNetworkNoAppView>) {
+export async function long(sc: SeedClient<TestNetwork>) {
   const users = await createUsers(sc, 'long', [
     'op',
     'alice',
@@ -187,7 +189,7 @@ export async function long(sc: SeedClient<TestNetwork | TestNetworkNoAppView>) {
   }
 }
 
-export async function deep(sc: SeedClient<TestNetwork | TestNetworkNoAppView>) {
+export async function deep(sc: SeedClient<TestNetwork>) {
   const users = await createUsers(sc, 'deep', ['op'] as const)
   const { op } = users
 
@@ -210,9 +212,7 @@ export async function deep(sc: SeedClient<TestNetwork | TestNetworkNoAppView>) {
   }
 }
 
-export async function branchingFactor(
-  sc: SeedClient<TestNetwork | TestNetworkNoAppView>,
-) {
+export async function branchingFactor(sc: SeedClient<TestNetwork>) {
   const users = await createUsers(sc, 'bf', ['op', 'bob'] as const)
   const { op, bob } = users
 
@@ -333,9 +333,7 @@ export async function branchingFactor(
   }
 }
 
-export async function annotateMoreReplies(
-  sc: SeedClient<TestNetwork | TestNetworkNoAppView>,
-) {
+export async function annotateMoreReplies(sc: SeedClient<TestNetwork>) {
   const users = await createUsers(sc, 'mr', ['op', 'alice'] as const)
   const { op, alice } = users
 
@@ -392,9 +390,7 @@ export async function annotateMoreReplies(
   }
 }
 
-export async function annotateOP(
-  sc: SeedClient<TestNetwork | TestNetworkNoAppView>,
-) {
+export async function annotateOP(sc: SeedClient<TestNetwork>) {
   const users = await createUsers(sc, 'op', ['op', 'alice', 'bob'] as const)
   const { op, alice, bob } = users
 
@@ -422,7 +418,7 @@ export async function annotateOP(
   }
 }
 
-export async function sort(sc: SeedClient<TestNetwork | TestNetworkNoAppView>) {
+export async function sort(sc: SeedClient<TestNetwork>) {
   const users = await createUsers(sc, 'sort', [
     'op',
     'alice',
@@ -478,9 +474,7 @@ export async function sort(sc: SeedClient<TestNetwork | TestNetworkNoAppView>) {
   }
 }
 
-export async function bumpOpAndViewer(
-  sc: SeedClient<TestNetwork | TestNetworkNoAppView>,
-) {
+export async function bumpOpAndViewer(sc: SeedClient<TestNetwork>) {
   const users = await createUsers(sc, 'bumpOV', [
     'op',
     'viewer',
@@ -566,9 +560,7 @@ export async function bumpOpAndViewer(
   }
 }
 
-export async function bumpGroupSorting(
-  sc: SeedClient<TestNetwork | TestNetworkNoAppView>,
-) {
+export async function bumpGroupSorting(sc: SeedClient<TestNetwork>) {
   const users = await createUsers(sc, 'bumpGS', [
     'op',
     'viewer',
@@ -595,9 +587,7 @@ export async function bumpGroupSorting(
   }
 }
 
-export async function bumpFollows(
-  sc: SeedClient<TestNetwork | TestNetworkNoAppView>,
-) {
+export async function bumpFollows(sc: SeedClient<TestNetwork>) {
   const users = await createUsers(sc, 'bumpF', [
     'op',
     'viewerF',
@@ -631,7 +621,8 @@ export async function bumpFollows(
 }
 
 export async function blockDeletionAuth(
-  sc: SeedClient<TestNetwork | TestNetworkNoAppView>,
+  sc: SeedClient<TestNetwork>,
+  labelerDid: string,
 ) {
   const users = await createUsers(sc, 'bda', [
     'op',
@@ -675,6 +666,14 @@ export async function blockDeletionAuth(
   await sc.block(blocker.did, blocked.did)
   await sc.block(op.did, opBlocked.did)
 
+  const db = sc.network.bsky.db.db
+  await createLabel(db, {
+    src: labelerDid,
+    uri: auth.did,
+    cid: '',
+    val: '!no-unauthenticated',
+  })
+
   return {
     seedClient: sc,
     users,
@@ -683,9 +682,7 @@ export async function blockDeletionAuth(
   }
 }
 
-export async function mutes(
-  sc: SeedClient<TestNetwork | TestNetworkNoAppView>,
-) {
+export async function mutes(sc: SeedClient<TestNetwork>) {
   const users = await createUsers(sc, 'mutes', [
     'op',
     'opMuted',
@@ -719,9 +716,7 @@ export async function mutes(
   }
 }
 
-export async function threadgated(
-  sc: SeedClient<TestNetwork | TestNetworkNoAppView>,
-) {
+export async function threadgated(sc: SeedClient<TestNetwork>) {
   const users = await createUsers(sc, 'tg', [
     'op',
     'opMuted',
@@ -773,3 +768,107 @@ export async function threadgated(
     r,
   }
 }
+
+export async function tags(sc: SeedClient<TestNetwork>) {
+  const users = await createUsers(sc, 'tags', [
+    'op',
+    'alice',
+    'down',
+    'following',
+    'hide',
+    'viewer',
+  ] as const)
+
+  const { op, alice, down, following, hide, viewer } = users
+
+  const { root, replies: r } = await createThread(sc, op, async (r) => {
+    await r(alice, async (r) => {
+      await r(alice)
+      await r(down)
+      await r(hide)
+    })
+    await r(down, async (r) => {
+      await r(alice)
+      await r(down)
+      await r(hide)
+    })
+    await r(hide, async (r) => {
+      await r(alice)
+      await r(down)
+      await r(hide)
+    })
+    await r(op)
+    await r(viewer)
+    await r(following)
+  })
+
+  await sc.network.processAll()
+
+  await sc.follow(viewer.did, following.did)
+
+  const db = sc.network.bsky.db.db
+  await createTag(db, { uri: r['1'].ref.uriStr, val: TAG_BUMP_DOWN })
+  await createTag(db, { uri: r['0.1'].ref.uriStr, val: TAG_BUMP_DOWN })
+  await createTag(db, { uri: r['1.1'].ref.uriStr, val: TAG_BUMP_DOWN })
+  await createTag(db, { uri: r['2.1'].ref.uriStr, val: TAG_BUMP_DOWN })
+
+  await createTag(db, { uri: r['2'].ref.uriStr, val: TAG_HIDE })
+  await createTag(db, { uri: r['0.2'].ref.uriStr, val: TAG_HIDE })
+  await createTag(db, { uri: r['1.2'].ref.uriStr, val: TAG_HIDE })
+  await createTag(db, { uri: r['2.2'].ref.uriStr, val: TAG_HIDE })
+
+  // Neither tag affect op, viewer.
+  await createTag(db, { uri: r['3'].ref.uriStr, val: TAG_BUMP_DOWN })
+  await createTag(db, { uri: r['4'].ref.uriStr, val: TAG_HIDE })
+
+  // Tags affect following depending on the config to prioritize following.
+  await createTag(db, { uri: r['5'].ref.uriStr, val: TAG_HIDE })
+
+  return {
+    seedClient: sc,
+    users,
+    root,
+    r,
+  }
+}
+
+const createLabel = async (
+  db: DatabaseSchema,
+  opts: {
+    src: string
+    uri: string
+    cid: string
+    val: string
+    exp?: string
+  },
+) => {
+  await db
+    .insertInto('label')
+    .values({
+      uri: opts.uri,
+      cid: opts.cid,
+      val: opts.val,
+      cts: new Date().toISOString(),
+      exp: opts.exp ?? null,
+      neg: false,
+      src: opts.src,
+    })
+    .execute()
+}
+
+const createTag = async (
+  db: DatabaseSchema,
+  opts: {
+    uri: string
+    val: string
+  },
+) => {
+  await db
+    .updateTable('record')
+    .set({
+      tags: sql<string[]>`${JSON.stringify([opts.val])}`,
+    })
+    .where('uri', '=', opts.uri)
+    .returningAll()
+    .execute()
+}

package/tests/views/thread-v2.test.ts

@@ -19,6 +19,7 @@ import {
 import { ThreadItemValuePost } from '../../src/views/threads-v2'
 import { forSnapshot } from '../_util'
 import * as seeds from '../seed/thread-v2'
+import { TAG_BUMP_DOWN, TAG_HIDE } from '../seed/thread-v2'
 
 type PostProps = Pick<ThreadItemPost, 'moreReplies' | 'opThread'>
 const props = (overrides: Partial<PostProps> = {}): PostProps => ({
@@ -43,12 +44,14 @@ describe('appview thread views v2', () => {
   let network: TestNetwork
   let agent: AtpAgent
   let labelerDid: string
-  let sc: SeedClient
+  let sc: SeedClient<TestNetwork>
 
   beforeAll(async () => {
     network = await TestNetwork.create({
       bsky: {
         maxThreadParents: 15,
+        threadTagsBumpDown: new Set([TAG_BUMP_DOWN]),
+        threadTagsHide: new Set([TAG_HIDE]),
       },
       dbPostgresSchema: 'bsky_views_thread_v_two',
     })
@@ -1209,13 +1212,7 @@ describe('appview thread views v2', () => {
     let seed: Awaited<ReturnType<typeof seeds.blockDeletionAuth>>
 
     beforeAll(async () => {
-      seed = await seeds.blockDeletionAuth(sc)
-      await createLabel({
-        src: labelerDid,
-        uri: seed.users.auth.did,
-        cid: '',
-        val: '!no-unauthenticated',
-      })
+      seed = await seeds.blockDeletionAuth(sc, labelerDid)
       await network.processAll()
     })
 
@@ -1964,26 +1961,141 @@ describe('appview thread views v2', () => {
     })
   })
 
-  const createLabel = async (opts: {
-    src?: string
-    uri: string
-    cid: string
-    val: string
-    exp?: string
-  }) => {
-    await network.bsky.db.db
-      .insertInto('label')
-      .values({
-        uri: opts.uri,
-        cid: opts.cid,
-        val: opts.val,
-        cts: new Date().toISOString(),
-        exp: opts.exp ?? null,
-        neg: false,
-        src: opts.src ?? labelerDid,
+  describe('tags', () => {
+    let seed: Awaited<ReturnType<typeof seeds.tags>>
+
+    beforeAll(async () => {
+      seed = await seeds.tags(sc)
+      await network.processAll()
+    })
+
+    describe('when prioritizing followed users', () => {
+      const prioritizeFollowedUsers = true
+
+      it('considers tags for bumping down and hiding', async () => {
+        const { data } = await agent.app.bsky.unspecced.getPostThreadV2(
+          {
+            anchor: seed.root.ref.uriStr,
+            sort: 'newest',
+            prioritizeFollowedUsers,
+          },
+          {
+            headers: await network.serviceHeaders(
+              seed.users.viewer.did,
+              ids.AppBskyUnspeccedGetPostThreadV2,
+            ),
+          },
+        )
+        const { thread: t, hasHiddenReplies } = data
+
+        expect(hasHiddenReplies).toBe(true)
+        assertPosts(t)
+        expect(t).toEqual([
+          expect.objectContaining({ uri: seed.root.ref.uriStr }),
+          // OP (down overridden).
+          expect.objectContaining({ uri: seed.r['3'].ref.uriStr }),
+          // Viewer (hide overridden).
+          expect.objectContaining({ uri: seed.r['4'].ref.uriStr }),
+          // Following (hide overridden).
+          expect.objectContaining({ uri: seed.r['5'].ref.uriStr }),
+          // Fot following.
+          expect.objectContaining({ uri: seed.r['0'].ref.uriStr }),
+          expect.objectContaining({ uri: seed.r['0.0'].ref.uriStr }),
+          expect.objectContaining({ uri: seed.r['0.1'].ref.uriStr }),
+          // Down.
+          expect.objectContaining({ uri: seed.r['1'].ref.uriStr }),
+          expect.objectContaining({ uri: seed.r['1.0'].ref.uriStr }),
+          expect.objectContaining({ uri: seed.r['1.1'].ref.uriStr }),
+        ])
+      })
+
+      it('finds the hidden by tag', async () => {
+        const { data } = await agent.app.bsky.unspecced.getPostThreadHiddenV2(
+          {
+            anchor: seed.root.ref.uriStr,
+            prioritizeFollowedUsers,
+          },
+          {
+            headers: await network.serviceHeaders(
+              seed.users.viewer.did,
+              ids.AppBskyUnspeccedGetPostThreadHiddenV2,
+            ),
+          },
+        )
+        const { thread: t } = data
+
+        assertHiddenPosts(t)
+        expect(t).toEqual([
+          // Hide.
+          expect.objectContaining({ uri: seed.r['2'].ref.uriStr }),
+        ])
       })
-      .execute()
-  }
+    })
+
+    describe('when not prioritizing followed users', () => {
+      const prioritizeFollowedUsers = false
+
+      it('considers tags for bumping down and hiding', async () => {
+        const { data } = await agent.app.bsky.unspecced.getPostThreadV2(
+          {
+            anchor: seed.root.ref.uriStr,
+            sort: 'newest',
+            prioritizeFollowedUsers,
+          },
+          {
+            headers: await network.serviceHeaders(
+              seed.users.viewer.did,
+              ids.AppBskyUnspeccedGetPostThreadV2,
+            ),
+          },
+        )
+        const { thread: t, hasHiddenReplies } = data
+
+        expect(hasHiddenReplies).toBe(true)
+        assertPosts(t)
+        expect(t).toEqual([
+          expect.objectContaining({ uri: seed.root.ref.uriStr }),
+          // OP (down overridden).
+          expect.objectContaining({ uri: seed.r['3'].ref.uriStr }),
+          // Viewer (hide overriden).
+          expect.objectContaining({ uri: seed.r['4'].ref.uriStr }),
+          // Following was hidden because not prioritizing.
+          // Not following.
+          expect.objectContaining({ uri: seed.r['0'].ref.uriStr }),
+          expect.objectContaining({ uri: seed.r['0.0'].ref.uriStr }),
+          expect.objectContaining({ uri: seed.r['0.1'].ref.uriStr }),
+          // Down.
+          expect.objectContaining({ uri: seed.r['1'].ref.uriStr }),
+          expect.objectContaining({ uri: seed.r['1.0'].ref.uriStr }),
+          expect.objectContaining({ uri: seed.r['1.1'].ref.uriStr }),
+        ])
+      })
+
+      it('finds the hidden by tag', async () => {
+        const { data } = await agent.app.bsky.unspecced.getPostThreadHiddenV2(
+          {
+            anchor: seed.root.ref.uriStr,
+            prioritizeFollowedUsers,
+          },
+          {
+            headers: await network.serviceHeaders(
+              seed.users.viewer.did,
+              ids.AppBskyUnspeccedGetPostThreadHiddenV2,
+            ),
+          },
+        )
+        const { thread: t } = data
+
+        assertHiddenPosts(t)
+        expect(t).toEqual([
+          // Following (hide).
+          expect.objectContaining({ uri: seed.r['5'].ref.uriStr }),
+          // Hide.
+          expect.objectContaining({ uri: seed.r['2'].ref.uriStr }),
+        ])
+      })
+    })
+  })
 })
 
 function assertPosts(