@atproto/bsky 0.0.15 → 0.0.17

package/tests/views/thread.test.ts

@@ -1,6 +1,5 @@
 import AtpAgent, { AppBskyFeedGetPostThread } from '@atproto/api'
 import { TestNetwork, SeedClient } from '@atproto/dev-env'
-import { TAKEDOWN } from '@atproto/api/src/client/types/com/atproto/admin/defs'
 import { forSnapshot, stripViewerFromThread } from '../_util'
 import basicSeed from '../seeds/basic'
 import assert from 'assert'
@@ -166,22 +165,21 @@ describe('pds thread views', () => {
 
   describe('takedown', () => {
     it('blocks post by actor', async () => {
-      const { data: modAction } =
-        await agent.api.com.atproto.admin.takeModerationAction(
-          {
-            action: TAKEDOWN,
-            subject: {
-              $type: 'com.atproto.admin.defs#repoRef',
-              did: alice,
-            },
-            createdBy: 'did:example:admin',
-            reason: 'Y',
-          },
-          {
-            encoding: 'application/json',
-            headers: network.pds.adminAuthHeaders(),
+      await agent.api.com.atproto.admin.emitModerationEvent(
+        {
+          event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
+          subject: {
+            $type: 'com.atproto.admin.defs#repoRef',
+            did: alice,
           },
-        )
+          createdBy: 'did:example:admin',
+          reason: 'Y',
+        },
+        {
+          encoding: 'application/json',
+          headers: network.pds.adminAuthHeaders(),
+        },
+      )
 
       // Same as shallow post thread test, minus alice
       const promise = agent.api.app.bsky.feed.getPostThread(
@@ -194,9 +192,13 @@ describe('pds thread views', () => {
       )
 
       // Cleanup
-      await agent.api.com.atproto.admin.reverseModerationAction(
+      await agent.api.com.atproto.admin.emitModerationEvent(
         {
-          id: modAction.id,
+          event: { $type: 'com.atproto.admin.defs#modEventReverseTakedown' },
+          subject: {
+            $type: 'com.atproto.admin.defs#repoRef',
+            did: alice,
+          },
           createdBy: 'did:example:admin',
           reason: 'Y',
         },
@@ -208,22 +210,21 @@ describe('pds thread views', () => {
     })
 
     it('blocks replies by actor', async () => {
-      const { data: modAction } =
-        await agent.api.com.atproto.admin.takeModerationAction(
-          {
-            action: TAKEDOWN,
-            subject: {
-              $type: 'com.atproto.admin.defs#repoRef',
-              did: carol,
-            },
-            createdBy: 'did:example:admin',
-            reason: 'Y',
-          },
-          {
-            encoding: 'application/json',
-            headers: network.pds.adminAuthHeaders(),
+      await agent.api.com.atproto.admin.emitModerationEvent(
+        {
+          event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
+          subject: {
+            $type: 'com.atproto.admin.defs#repoRef',
+            did: carol,
           },
-        )
+          createdBy: 'did:example:admin',
+          reason: 'Y',
+        },
+        {
+          encoding: 'application/json',
+          headers: network.pds.adminAuthHeaders(),
+        },
+      )
 
       // Same as deep post thread test, minus carol
       const thread = await agent.api.app.bsky.feed.getPostThread(
@@ -234,9 +235,13 @@ describe('pds thread views', () => {
       expect(forSnapshot(thread.data.thread)).toMatchSnapshot()
 
       // Cleanup
-      await agent.api.com.atproto.admin.reverseModerationAction(
+      await agent.api.com.atproto.admin.emitModerationEvent(
         {
-          id: modAction.id,
+          event: { $type: 'com.atproto.admin.defs#modEventReverseTakedown' },
+          subject: {
+            $type: 'com.atproto.admin.defs#repoRef',
+            did: carol,
+          },
           createdBy: 'did:example:admin',
           reason: 'Y',
         },
@@ -248,22 +253,21 @@ describe('pds thread views', () => {
     })
 
     it('blocks ancestors by actor', async () => {
-      const { data: modAction } =
-        await agent.api.com.atproto.admin.takeModerationAction(
-          {
-            action: TAKEDOWN,
-            subject: {
-              $type: 'com.atproto.admin.defs#repoRef',
-              did: bob,
-            },
-            createdBy: 'did:example:admin',
-            reason: 'Y',
-          },
-          {
-            encoding: 'application/json',
-            headers: network.pds.adminAuthHeaders(),
+      await agent.api.com.atproto.admin.emitModerationEvent(
+        {
+          event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
+          subject: {
+            $type: 'com.atproto.admin.defs#repoRef',
+            did: bob,
           },
-        )
+          createdBy: 'did:example:admin',
+          reason: 'Y',
+        },
+        {
+          encoding: 'application/json',
+          headers: network.pds.adminAuthHeaders(),
+        },
+      )
 
       // Same as ancestor post thread test, minus bob
       const thread = await agent.api.app.bsky.feed.getPostThread(
@@ -274,9 +278,13 @@ describe('pds thread views', () => {
       expect(forSnapshot(thread.data.thread)).toMatchSnapshot()
 
       // Cleanup
-      await agent.api.com.atproto.admin.reverseModerationAction(
+      await agent.api.com.atproto.admin.emitModerationEvent(
         {
-          id: modAction.id,
+          event: { $type: 'com.atproto.admin.defs#modEventReverseTakedown' },
+          subject: {
+            $type: 'com.atproto.admin.defs#repoRef',
+            did: bob,
+          },
           createdBy: 'did:example:admin',
           reason: 'Y',
         },
@@ -289,23 +297,22 @@ describe('pds thread views', () => {
 
     it('blocks post by record', async () => {
       const postRef = sc.posts[alice][1].ref
-      const { data: modAction } =
-        await agent.api.com.atproto.admin.takeModerationAction(
-          {
-            action: TAKEDOWN,
-            subject: {
-              $type: 'com.atproto.repo.strongRef',
-              uri: postRef.uriStr,
-              cid: postRef.cidStr,
-            },
-            createdBy: 'did:example:admin',
-            reason: 'Y',
-          },
-          {
-            encoding: 'application/json',
-            headers: network.pds.adminAuthHeaders(),
+      await agent.api.com.atproto.admin.emitModerationEvent(
+        {
+          event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
+          subject: {
+            $type: 'com.atproto.repo.strongRef',
+            uri: postRef.uriStr,
+            cid: postRef.cidStr,
           },
-        )
+          createdBy: 'did:example:admin',
+          reason: 'Y',
+        },
+        {
+          encoding: 'application/json',
+          headers: network.pds.adminAuthHeaders(),
+        },
+      )
 
       const promise = agent.api.app.bsky.feed.getPostThread(
         { depth: 1, uri: postRef.uriStr },
@@ -317,9 +324,14 @@ describe('pds thread views', () => {
       )
 
       // Cleanup
-      await agent.api.com.atproto.admin.reverseModerationAction(
+      await agent.api.com.atproto.admin.emitModerationEvent(
         {
-          id: modAction.id,
+          event: { $type: 'com.atproto.admin.defs#modEventReverseTakedown' },
+          subject: {
+            $type: 'com.atproto.repo.strongRef',
+            uri: postRef.uriStr,
+            cid: postRef.cidStr,
+          },
           createdBy: 'did:example:admin',
           reason: 'Y',
         },
@@ -338,23 +350,22 @@ describe('pds thread views', () => {
 
       const parent = threadPreTakedown.data.thread.parent?.['post']
 
-      const { data: modAction } =
-        await agent.api.com.atproto.admin.takeModerationAction(
-          {
-            action: TAKEDOWN,
-            subject: {
-              $type: 'com.atproto.repo.strongRef',
-              uri: parent.uri,
-              cid: parent.cid,
-            },
-            createdBy: 'did:example:admin',
-            reason: 'Y',
-          },
-          {
-            encoding: 'application/json',
-            headers: network.pds.adminAuthHeaders(),
+      await agent.api.com.atproto.admin.emitModerationEvent(
+        {
+          event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
+          subject: {
+            $type: 'com.atproto.repo.strongRef',
+            uri: parent.uri,
+            cid: parent.cid,
           },
-        )
+          createdBy: 'did:example:admin',
+          reason: 'Y',
+        },
+        {
+          encoding: 'application/json',
+          headers: network.pds.adminAuthHeaders(),
+        },
+      )
 
       // Same as ancestor post thread test, minus parent post
       const thread = await agent.api.app.bsky.feed.getPostThread(
@@ -365,9 +376,14 @@ describe('pds thread views', () => {
       expect(forSnapshot(thread.data.thread)).toMatchSnapshot()
 
       // Cleanup
-      await agent.api.com.atproto.admin.reverseModerationAction(
+      await agent.api.com.atproto.admin.emitModerationEvent(
         {
-          id: modAction.id,
+          event: { $type: 'com.atproto.admin.defs#modEventReverseTakedown' },
+          subject: {
+            $type: 'com.atproto.repo.strongRef',
+            uri: parent.uri,
+            cid: parent.cid,
+          },
           createdBy: 'did:example:admin',
           reason: 'Y',
         },
@@ -386,11 +402,11 @@ describe('pds thread views', () => {
       const post1 = threadPreTakedown.data.thread.replies?.[0].post
       const post2 = threadPreTakedown.data.thread.replies?.[1].replies[0].post
 
-      const actionResults = await Promise.all(
+      await Promise.all(
         [post1, post2].map((post) =>
-          agent.api.com.atproto.admin.takeModerationAction(
+          agent.api.com.atproto.admin.emitModerationEvent(
             {
-              action: TAKEDOWN,
+              event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
               subject: {
                 $type: 'com.atproto.repo.strongRef',
                 uri: post.uri,
@@ -417,10 +433,17 @@ describe('pds thread views', () => {
 
       // Cleanup
       await Promise.all(
-        actionResults.map((result) =>
-          agent.api.com.atproto.admin.reverseModerationAction(
+        [post1, post2].map((post) =>
+          agent.api.com.atproto.admin.emitModerationEvent(
             {
-              id: result.data.id,
+              event: {
+                $type: 'com.atproto.admin.defs#modEventReverseTakedown',
+              },
+              subject: {
+                $type: 'com.atproto.repo.strongRef',
+                uri: post.uri,
+                cid: post.cid,
+              },
               createdBy: 'did:example:admin',
               reason: 'Y',
             },

package/tests/views/threadgating.test.ts

@@ -29,6 +29,19 @@ describe('views with thread gating', () => {
     await network.close()
   })
 
+  // check that replyDisabled state is applied correctly in a simple method like getPosts
+  const checkReplyDisabled = async (
+    uri: string,
+    user: string,
+    blocked: boolean | undefined,
+  ) => {
+    const res = await agent.api.app.bsky.feed.getPosts(
+      { uris: [uri] },
+      { headers: await network.serviceHeaders(user) },
+    )
+    expect(res.data.posts[0].viewer?.replyDisabled).toBe(blocked)
+  }
+
   it('applies gate for empty rules.', async () => {
     const post = await sc.post(sc.dids.carol, 'empty rules')
     await pdsAgent.api.app.bsky.feed.threadgate.create(
@@ -36,6 +49,7 @@ describe('views with thread gating', () => {
       { post: post.ref.uriStr, createdAt: iso(), allow: [] },
       sc.getHeaders(sc.dids.carol),
     )
+    await network.processAll()
     await sc.reply(sc.dids.alice, post.ref, post.ref, 'empty rules reply')
     await network.processAll()
     const {
@@ -46,8 +60,36 @@ describe('views with thread gating', () => {
     )
     assert(isThreadViewPost(thread))
     expect(forSnapshot(thread.post.threadgate)).toMatchSnapshot()
-    expect(thread.viewer).toEqual({ canReply: false })
+    expect(thread.post.viewer).toEqual({ replyDisabled: true })
     expect(thread.replies?.length).toEqual(0)
+    await checkReplyDisabled(post.ref.uriStr, sc.dids.alice, true)
+  })
+
+  it('does not generate notifications when post violates threadgate.', async () => {
+    const post = await sc.post(sc.dids.carol, 'notifications')
+    await pdsAgent.api.app.bsky.feed.threadgate.create(
+      { repo: sc.dids.carol, rkey: post.ref.uri.rkey },
+      { post: post.ref.uriStr, createdAt: iso(), allow: [] },
+      sc.getHeaders(sc.dids.carol),
+    )
+    await network.processAll()
+    const reply = await sc.reply(
+      sc.dids.alice,
+      post.ref,
+      post.ref,
+      'notifications reply',
+    )
+    await network.processAll()
+    const {
+      data: { notifications },
+    } = await agent.api.app.bsky.notification.listNotifications(
+      {},
+      { headers: await network.serviceHeaders(sc.dids.carol) },
+    )
+    const notificationFromReply = notifications.find(
+      (notif) => notif.uri === reply.ref.uriStr,
+    )
+    expect(notificationFromReply).toBeUndefined()
   })
 
   it('applies gate for mention rule.', async () => {
@@ -78,6 +120,7 @@ describe('views with thread gating', () => {
       },
       sc.getHeaders(sc.dids.carol),
     )
+    await network.processAll()
     await sc.reply(
       sc.dids.alice,
       post.ref,
@@ -98,7 +141,8 @@ describe('views with thread gating', () => {
       { headers: await network.serviceHeaders(sc.dids.alice) },
     )
     assert(isThreadViewPost(aliceThread))
-    expect(aliceThread.viewer).toEqual({ canReply: false })
+    expect(aliceThread.post.viewer).toEqual({ replyDisabled: true })
+    await checkReplyDisabled(post.ref.uriStr, sc.dids.alice, true)
     const {
       data: { thread: danThread },
     } = await agent.api.app.bsky.feed.getPostThread(
@@ -107,7 +151,8 @@ describe('views with thread gating', () => {
     )
     assert(isThreadViewPost(danThread))
     expect(forSnapshot(danThread.post.threadgate)).toMatchSnapshot()
-    expect(danThread.viewer).toEqual({ canReply: true })
+    expect(danThread.post.viewer).toEqual({ replyDisabled: false })
+    await checkReplyDisabled(post.ref.uriStr, sc.dids.dan, false)
     const [reply, ...otherReplies] = danThread.replies ?? []
     assert(isThreadViewPost(reply))
     expect(otherReplies.length).toEqual(0)
@@ -125,6 +170,7 @@ describe('views with thread gating', () => {
       },
       sc.getHeaders(sc.dids.carol),
     )
+    await network.processAll()
     // carol only follows alice
     await sc.reply(
       sc.dids.dan,
@@ -146,7 +192,8 @@ describe('views with thread gating', () => {
       { headers: await network.serviceHeaders(sc.dids.dan) },
     )
     assert(isThreadViewPost(danThread))
-    expect(danThread.viewer).toEqual({ canReply: false })
+    expect(danThread.post.viewer).toEqual({ replyDisabled: true })
+    await checkReplyDisabled(post.ref.uriStr, sc.dids.dan, true)
     const {
       data: { thread: aliceThread },
     } = await agent.api.app.bsky.feed.getPostThread(
@@ -155,7 +202,8 @@ describe('views with thread gating', () => {
     )
     assert(isThreadViewPost(aliceThread))
     expect(forSnapshot(aliceThread.post.threadgate)).toMatchSnapshot()
-    expect(aliceThread.viewer).toEqual({ canReply: true })
+    expect(aliceThread.post.viewer).toEqual({ replyDisabled: false })
+    await checkReplyDisabled(post.ref.uriStr, sc.dids.alice, false)
     const [reply, ...otherReplies] = aliceThread.replies ?? []
     assert(isThreadViewPost(reply))
     expect(otherReplies.length).toEqual(0)
@@ -213,6 +261,7 @@ describe('views with thread gating', () => {
       },
       sc.getHeaders(sc.dids.carol),
     )
+    await network.processAll()
     //
     await sc.reply(sc.dids.bob, post.ref, post.ref, 'list rule reply disallow')
     const aliceReply = await sc.reply(
@@ -235,7 +284,8 @@ describe('views with thread gating', () => {
       { headers: await network.serviceHeaders(sc.dids.bob) },
     )
     assert(isThreadViewPost(bobThread))
-    expect(bobThread.viewer).toEqual({ canReply: false })
+    expect(bobThread.post.viewer).toEqual({ replyDisabled: true })
+    await checkReplyDisabled(post.ref.uriStr, sc.dids.bob, true)
     const {
       data: { thread: aliceThread },
     } = await agent.api.app.bsky.feed.getPostThread(
@@ -243,7 +293,8 @@ describe('views with thread gating', () => {
       { headers: await network.serviceHeaders(sc.dids.alice) },
     )
     assert(isThreadViewPost(aliceThread))
-    expect(aliceThread.viewer).toEqual({ canReply: true })
+    expect(aliceThread.post.viewer).toEqual({ replyDisabled: false })
+    await checkReplyDisabled(post.ref.uriStr, sc.dids.alice, false)
     const {
       data: { thread: danThread },
     } = await agent.api.app.bsky.feed.getPostThread(
@@ -252,7 +303,8 @@ describe('views with thread gating', () => {
     )
     assert(isThreadViewPost(danThread))
     expect(forSnapshot(danThread.post.threadgate)).toMatchSnapshot()
-    expect(danThread.viewer).toEqual({ canReply: true })
+    expect(danThread.post.viewer).toEqual({ replyDisabled: false })
+    await checkReplyDisabled(post.ref.uriStr, sc.dids.dan, false)
     const [reply1, reply2, ...otherReplies] = aliceThread.replies ?? []
     assert(isThreadViewPost(reply1))
     assert(isThreadViewPost(reply2))
@@ -277,6 +329,7 @@ describe('views with thread gating', () => {
       },
       sc.getHeaders(sc.dids.carol),
     )
+    await network.processAll()
     await sc.reply(
       sc.dids.alice,
       post.ref,
@@ -292,8 +345,9 @@ describe('views with thread gating', () => {
     )
     assert(isThreadViewPost(thread))
     expect(forSnapshot(thread.post.threadgate)).toMatchSnapshot()
-    expect(thread.viewer).toEqual({ canReply: false })
+    expect(thread.post.viewer).toEqual({ replyDisabled: true })
     expect(thread.replies?.length).toEqual(0)
+    await checkReplyDisabled(post.ref.uriStr, sc.dids.alice, true)
   })
 
   it('applies gate for multiple rules.', async () => {
@@ -317,6 +371,7 @@ describe('views with thread gating', () => {
       },
       sc.getHeaders(sc.dids.carol),
     )
+    await network.processAll()
     // carol only follows alice, and the post mentions dan.
     await sc.reply(sc.dids.bob, post.ref, post.ref, 'multi rule reply disallow')
     const aliceReply = await sc.reply(
@@ -339,7 +394,8 @@ describe('views with thread gating', () => {
       { headers: await network.serviceHeaders(sc.dids.bob) },
     )
     assert(isThreadViewPost(bobThread))
-    expect(bobThread.viewer).toEqual({ canReply: false })
+    expect(bobThread.post.viewer).toEqual({ replyDisabled: true })
+    await checkReplyDisabled(post.ref.uriStr, sc.dids.bob, true)
     const {
       data: { thread: aliceThread },
     } = await agent.api.app.bsky.feed.getPostThread(
@@ -347,7 +403,8 @@ describe('views with thread gating', () => {
       { headers: await network.serviceHeaders(sc.dids.alice) },
     )
     assert(isThreadViewPost(aliceThread))
-    expect(aliceThread.viewer).toEqual({ canReply: true })
+    expect(aliceThread.post.viewer).toEqual({ replyDisabled: false })
+    await checkReplyDisabled(post.ref.uriStr, sc.dids.alice, false)
     const {
       data: { thread: danThread },
     } = await agent.api.app.bsky.feed.getPostThread(
@@ -356,7 +413,8 @@ describe('views with thread gating', () => {
     )
     assert(isThreadViewPost(danThread))
     expect(forSnapshot(danThread.post.threadgate)).toMatchSnapshot()
-    expect(danThread.viewer).toEqual({ canReply: true })
+    expect(danThread.post.viewer).toEqual({ replyDisabled: false })
+    await checkReplyDisabled(post.ref.uriStr, sc.dids.dan, false)
     const [reply1, reply2, ...otherReplies] = aliceThread.replies ?? []
     assert(isThreadViewPost(reply1))
     assert(isThreadViewPost(reply2))
@@ -372,6 +430,7 @@ describe('views with thread gating', () => {
       { post: post.ref.uriStr, createdAt: iso() },
       sc.getHeaders(sc.dids.carol),
     )
+    await network.processAll()
     const aliceReply = await sc.reply(
       sc.dids.alice,
       post.ref,
@@ -387,7 +446,8 @@ describe('views with thread gating', () => {
     )
     assert(isThreadViewPost(thread))
     expect(forSnapshot(thread.post.threadgate)).toMatchSnapshot()
-    expect(thread.viewer).toEqual({ canReply: true })
+    expect(thread.post.viewer).toEqual({ replyDisabled: false })
+    await checkReplyDisabled(post.ref.uriStr, sc.dids.alice, false)
     const [reply, ...otherReplies] = thread.replies ?? []
     assert(isThreadViewPost(reply))
     expect(otherReplies.length).toEqual(0)
@@ -406,6 +466,7 @@ describe('views with thread gating', () => {
       },
       sc.getHeaders(sc.dids.carol),
     )
+    await network.processAll()
     // carol only follows alice
     const orphanedReply = await sc.reply(
       sc.dids.alice,
@@ -438,7 +499,8 @@ describe('views with thread gating', () => {
       { headers: await network.serviceHeaders(sc.dids.dan) },
     )
     assert(isThreadViewPost(danThread))
-    expect(danThread.viewer).toEqual({ canReply: false })
+    expect(danThread.post.viewer).toEqual({ replyDisabled: true })
+    await checkReplyDisabled(orphanedReply.ref.uriStr, sc.dids.dan, true)
     const {
       data: { thread: aliceThread },
     } = await agent.api.app.bsky.feed.getPostThread(
@@ -451,7 +513,8 @@ describe('views with thread gating', () => {
         aliceThread.parent.uri === post.ref.uriStr,
     )
     expect(aliceThread.post.threadgate).toMatchSnapshot()
-    expect(aliceThread.viewer).toEqual({ canReply: true })
+    expect(aliceThread.post.viewer).toEqual({ replyDisabled: false })
+    await checkReplyDisabled(orphanedReply.ref.uriStr, sc.dids.alice, false)
     const [reply, ...otherReplies] = aliceThread.replies ?? []
     assert(isThreadViewPost(reply))
     expect(otherReplies.length).toEqual(0)
@@ -465,6 +528,7 @@ describe('views with thread gating', () => {
       { post: post.ref.uriStr, createdAt: iso(), allow: [] },
       sc.getHeaders(sc.dids.carol),
     )
+    await network.processAll()
     const selfReply = await sc.reply(
       sc.dids.carol,
       post.ref,
@@ -480,7 +544,8 @@ describe('views with thread gating', () => {
     )
     assert(isThreadViewPost(thread))
     expect(forSnapshot(thread.post.threadgate)).toMatchSnapshot()
-    expect(thread.viewer).toEqual({ canReply: true })
+    expect(thread.post.viewer).toEqual({ replyDisabled: false })
+    await checkReplyDisabled(post.ref.uriStr, sc.dids.carol, false)
     const [reply, ...otherReplies] = thread.replies ?? []
     assert(isThreadViewPost(reply))
     expect(otherReplies.length).toEqual(0)
@@ -498,6 +563,7 @@ describe('views with thread gating', () => {
       },
       sc.getHeaders(sc.dids.carol),
     )
+    await network.processAll()
     // carol only follows alice
     const badReply = await sc.reply(
       sc.dids.dan,
@@ -516,10 +582,11 @@ describe('views with thread gating', () => {
       { headers: await network.serviceHeaders(sc.dids.alice) },
     )
     assert(isThreadViewPost(thread))
-    expect(thread.viewer).toEqual({ canReply: false }) // nobody can reply to this, not even alice.
+    expect(thread.post.viewer).toEqual({ replyDisabled: true }) // nobody can reply to this, not even alice.
     expect(thread.replies).toBeUndefined()
     expect(thread.parent).toBeUndefined()
     expect(thread.post.threadgate).toBeUndefined()
+    await checkReplyDisabled(badReply.ref.uriStr, sc.dids.alice, true)
     // check feed view
     const {
       data: { feed },
@@ -541,6 +608,7 @@ describe('views with thread gating', () => {
       { post: postB.ref.uriStr, createdAt: iso(), allow: [] },
       sc.getHeaders(sc.dids.carol),
     )
+    await network.processAll()
     await sc.reply(sc.dids.alice, postA.ref, postA.ref, 'ungated reply')
     await sc.reply(sc.dids.alice, postB.ref, postB.ref, 'ungated reply')
     await network.processAll()
@@ -552,8 +620,9 @@ describe('views with thread gating', () => {
     )
     assert(isThreadViewPost(threadA))
     expect(threadA.post.threadgate).toBeUndefined()
-    expect(threadA.viewer).toEqual({ canReply: true })
+    expect(threadA.post.viewer).toEqual({})
     expect(threadA.replies?.length).toEqual(1)
+    await checkReplyDisabled(postA.ref.uriStr, sc.dids.alice, undefined)
     const {
       data: { thread: threadB },
     } = await agent.api.app.bsky.feed.getPostThread(
@@ -562,7 +631,8 @@ describe('views with thread gating', () => {
     )
     assert(isThreadViewPost(threadB))
     expect(threadB.post.threadgate).toBeUndefined()
-    expect(threadB.viewer).toEqual({ canReply: true })
+    expect(threadB.post.viewer).toEqual({})
+    await checkReplyDisabled(postB.ref.uriStr, sc.dids.alice, undefined)
     expect(threadB.replies?.length).toEqual(1)
   })
 })