@atproto/bsky 0.0.76 → 0.0.77

package/src/views/util.ts

@@ -1,4 +1,3 @@
-import { AtUri } from '@atproto/syntax'
 import { BlobRef } from '@atproto/lexicon'
 import { Record as PostRecord } from '../lexicon/types/app/bsky/feed/post'
 import {
@@ -7,12 +6,12 @@ import {
   isListRule,
   isMentionRule,
 } from '../lexicon/types/app/bsky/feed/threadgate'
+import {
+  Record as PostgateRecord,
+  isDisableRule as isPostgateDisableRule,
+} from '../lexicon/types/app/bsky/feed/postgate'
 import { isMention } from '../lexicon/types/app/bsky/richtext/facet'
 
-export const creatorFromUri = (uri: string): string => {
-  return new AtUri(uri).hostname
-}
-
 export const parseThreadGate = (
   replierDid: string,
   ownerDid: string,
@@ -27,8 +26,8 @@ export const parseThreadGate = (
     return { canReply: true }
   }
 
-  const allowMentions = !!gate.allow.find(isMentionRule)
-  const allowFollowing = !!gate.allow.find(isFollowingRule)
+  const allowMentions = gate.allow.some(isMentionRule)
+  const allowFollowing = gate.allow.some(isFollowingRule)
   const allowListUris = gate.allow?.filter(isListRule).map((item) => item.list)
 
   // check mentions first since it's quick and synchronous
@@ -62,3 +61,34 @@ export const cidFromBlobJson = (json: BlobRef) => {
   }
   return (json['cid'] ?? '') as string
 }
+
+export const parsePostgate = ({
+  gate,
+  viewerDid,
+  authorDid,
+}: {
+  gate: PostgateRecord | undefined
+  viewerDid: string | undefined
+  authorDid: string
+}): ParsedPostgate => {
+  if (viewerDid === authorDid) {
+    return { embeddingRules: { canEmbed: true } }
+  }
+  // default state is unset, allow everyone
+  if (!gate || !gate.embeddingRules) {
+    return { embeddingRules: { canEmbed: true } }
+  }
+
+  const disabled = gate.embeddingRules.some(isPostgateDisableRule)
+  if (disabled) {
+    return { embeddingRules: { canEmbed: false } }
+  }
+
+  return { embeddingRules: { canEmbed: true } }
+}
+
+type ParsedPostgate = {
+  embeddingRules: {
+    canEmbed: boolean
+  }
+}

package/tests/__snapshots__/feed-generation.test.ts.snap

@@ -26,6 +26,7 @@ Object {
   "indexedAt": "1970-01-01T00:00:00.000Z",
   "labels": Array [],
   "likeCount": 0,
+  "quoteCount": 0,
   "record": Object {
     "$type": "app.bsky.feed.post",
     "createdAt": "1970-01-01T00:00:00.000Z",
@@ -42,6 +43,7 @@ Object {
   "repostCount": 0,
   "uri": "record(0)",
   "viewer": Object {
+    "embeddingDisabled": false,
     "threadMuted": false,
   },
 }
@@ -73,6 +75,7 @@ Object {
   "indexedAt": "1970-01-01T00:00:00.000Z",
   "labels": Array [],
   "likeCount": 0,
+  "quoteCount": 0,
   "record": Object {
     "$type": "app.bsky.feed.post",
     "createdAt": "1970-01-01T00:00:00.000Z",
@@ -89,6 +92,7 @@ Object {
   "repostCount": 0,
   "uri": "record(0)",
   "viewer": Object {
+    "embeddingDisabled": false,
     "threadMuted": false,
   },
 }
@@ -160,6 +164,7 @@ Object {
   "indexedAt": "1970-01-01T00:00:00.000Z",
   "labels": Array [],
   "likeCount": 0,
+  "quoteCount": 0,
   "record": Object {
     "$type": "app.bsky.feed.post",
     "createdAt": "1970-01-01T00:00:00.000Z",
@@ -176,6 +181,7 @@ Object {
   "repostCount": 0,
   "uri": "record(0)",
   "viewer": Object {
+    "embeddingDisabled": false,
     "threadMuted": false,
   },
 }
@@ -249,6 +255,7 @@ Object {
   "indexedAt": "1970-01-01T00:00:00.000Z",
   "labels": Array [],
   "likeCount": 0,
+  "quoteCount": 0,
   "record": Object {
     "$type": "app.bsky.feed.post",
     "createdAt": "1970-01-01T00:00:00.000Z",
@@ -265,6 +272,7 @@ Object {
   "repostCount": 0,
   "uri": "record(0)",
   "viewer": Object {
+    "embeddingDisabled": false,
     "threadMuted": false,
   },
 }
@@ -531,6 +539,7 @@ Array [
         },
       ],
       "likeCount": 0,
+      "quoteCount": 0,
       "record": Object {
         "$type": "app.bsky.feed.post",
         "createdAt": "1970-01-01T00:00:00.000Z",
@@ -548,6 +557,7 @@ Array [
       "repostCount": 0,
       "uri": "record(0)",
       "viewer": Object {
+        "embeddingDisabled": false,
         "threadMuted": false,
       },
     },
@@ -573,6 +583,7 @@ Array [
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
+      "quoteCount": 1,
       "record": Object {
         "$type": "app.bsky.feed.post",
         "createdAt": "1970-01-01T00:00:00.000Z",
@@ -586,6 +597,7 @@ Array [
       "repostCount": 0,
       "uri": "record(2)",
       "viewer": Object {
+        "embeddingDisabled": false,
         "threadMuted": false,
       },
     },
@@ -662,6 +674,7 @@ Array [
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 2,
+      "quoteCount": 1,
       "record": Object {
         "$type": "app.bsky.feed.post",
         "createdAt": "1970-01-01T00:00:00.000Z",
@@ -707,6 +720,7 @@ Array [
       "repostCount": 0,
       "uri": "record(5)",
       "viewer": Object {
+        "embeddingDisabled": false,
         "like": "record(8)",
         "threadMuted": false,
       },
@@ -730,6 +744,7 @@ Array [
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
+      "quoteCount": 0,
       "record": Object {
         "$type": "app.bsky.feed.post",
         "createdAt": "1970-01-01T00:00:00.000Z",
@@ -749,6 +764,7 @@ Array [
       "repostCount": 0,
       "uri": "record(9)",
       "viewer": Object {
+        "embeddingDisabled": false,
         "threadMuted": false,
       },
     },
@@ -786,6 +802,7 @@ Array [
         "indexedAt": "1970-01-01T00:00:00.000Z",
         "labels": Array [],
         "likeCount": 3,
+        "quoteCount": 0,
         "record": Object {
           "$type": "app.bsky.feed.post",
           "createdAt": "1970-01-01T00:00:00.000000Z",
@@ -795,6 +812,7 @@ Array [
         "repostCount": 1,
         "uri": "record(10)",
         "viewer": Object {
+          "embeddingDisabled": false,
           "threadMuted": false,
         },
       },
@@ -831,6 +849,7 @@ Array [
         "indexedAt": "1970-01-01T00:00:00.000Z",
         "labels": Array [],
         "likeCount": 3,
+        "quoteCount": 0,
         "record": Object {
           "$type": "app.bsky.feed.post",
           "createdAt": "1970-01-01T00:00:00.000000Z",
@@ -840,6 +859,7 @@ Array [
         "repostCount": 1,
         "uri": "record(10)",
         "viewer": Object {
+          "embeddingDisabled": false,
           "threadMuted": false,
         },
       },
@@ -987,6 +1007,7 @@ Array [
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
+      "quoteCount": 1,
       "record": Object {
         "$type": "app.bsky.feed.post",
         "createdAt": "1970-01-01T00:00:00.000Z",
@@ -1017,6 +1038,7 @@ Array [
       "repostCount": 1,
       "uri": "record(11)",
       "viewer": Object {
+        "embeddingDisabled": false,
         "threadMuted": false,
       },
     },
@@ -1079,6 +1101,7 @@ Array [
         },
       ],
       "likeCount": 0,
+      "quoteCount": 0,
       "record": Object {
         "$type": "app.bsky.feed.post",
         "createdAt": "1970-01-01T00:00:00.000Z",
@@ -1157,6 +1180,7 @@ Array [
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 2,
+      "quoteCount": 1,
       "record": Object {
         "$type": "app.bsky.feed.post",
         "createdAt": "1970-01-01T00:00:00.000Z",
@@ -1215,6 +1239,7 @@ Array [
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
+      "quoteCount": 0,
       "record": Object {
         "$type": "app.bsky.feed.post",
         "createdAt": "1970-01-01T00:00:00.000Z",
@@ -1264,6 +1289,7 @@ Array [
         "indexedAt": "1970-01-01T00:00:00.000Z",
         "labels": Array [],
         "likeCount": 3,
+        "quoteCount": 0,
         "record": Object {
           "$type": "app.bsky.feed.post",
           "createdAt": "1970-01-01T00:00:00.000000Z",
@@ -1302,6 +1328,7 @@ Array [
         "indexedAt": "1970-01-01T00:00:00.000Z",
         "labels": Array [],
         "likeCount": 3,
+        "quoteCount": 0,
         "record": Object {
           "$type": "app.bsky.feed.post",
           "createdAt": "1970-01-01T00:00:00.000000Z",
@@ -1360,6 +1387,7 @@ Array [
         },
       ],
       "likeCount": 0,
+      "quoteCount": 0,
       "record": Object {
         "$type": "app.bsky.feed.post",
         "createdAt": "1970-01-01T00:00:00.000Z",
@@ -1377,6 +1405,7 @@ Array [
       "repostCount": 0,
       "uri": "record(0)",
       "viewer": Object {
+        "embeddingDisabled": false,
         "threadMuted": false,
       },
     },
@@ -1453,6 +1482,7 @@ Array [
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 2,
+      "quoteCount": 1,
       "record": Object {
         "$type": "app.bsky.feed.post",
         "createdAt": "1970-01-01T00:00:00.000Z",
@@ -1498,6 +1528,7 @@ Array [
       "repostCount": 0,
       "uri": "record(2)",
       "viewer": Object {
+        "embeddingDisabled": false,
         "like": "record(8)",
         "threadMuted": false,
       },
@@ -1521,6 +1552,7 @@ Array [
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
+      "quoteCount": 0,
       "record": Object {
         "$type": "app.bsky.feed.post",
         "createdAt": "1970-01-01T00:00:00.000Z",
@@ -1540,6 +1572,7 @@ Array [
       "repostCount": 0,
       "uri": "record(9)",
       "viewer": Object {
+        "embeddingDisabled": false,
         "threadMuted": false,
       },
     },
@@ -1577,6 +1610,7 @@ Array [
         "indexedAt": "1970-01-01T00:00:00.000Z",
         "labels": Array [],
         "likeCount": 3,
+        "quoteCount": 0,
         "record": Object {
           "$type": "app.bsky.feed.post",
           "createdAt": "1970-01-01T00:00:00.000000Z",
@@ -1586,6 +1620,7 @@ Array [
         "repostCount": 1,
         "uri": "record(10)",
         "viewer": Object {
+          "embeddingDisabled": false,
           "threadMuted": false,
         },
       },
@@ -1622,6 +1657,7 @@ Array [
         "indexedAt": "1970-01-01T00:00:00.000Z",
         "labels": Array [],
         "likeCount": 3,
+        "quoteCount": 0,
         "record": Object {
           "$type": "app.bsky.feed.post",
           "createdAt": "1970-01-01T00:00:00.000000Z",
@@ -1631,6 +1667,7 @@ Array [
         "repostCount": 1,
         "uri": "record(10)",
         "viewer": Object {
+          "embeddingDisabled": false,
           "threadMuted": false,
         },
       },

package/tests/data-plane/__snapshots__/indexing.test.ts.snap

@@ -59,6 +59,7 @@ Array [
           "indexedAt": "1970-01-01T00:00:00.000Z",
           "labels": Array [],
           "likeCount": 0,
+          "quoteCount": 0,
           "record": Object {
             "$type": "app.bsky.feed.post",
             "createdAt": "1970-01-01T00:00:00.000Z",
@@ -68,6 +69,7 @@ Array [
           "repostCount": 0,
           "uri": "record(2)",
           "viewer": Object {
+            "embeddingDisabled": false,
             "threadMuted": false,
           },
         },
@@ -87,6 +89,7 @@ Array [
           "indexedAt": "1970-01-01T00:00:00.000Z",
           "labels": Array [],
           "likeCount": 0,
+          "quoteCount": 0,
           "record": Object {
             "$type": "app.bsky.feed.post",
             "createdAt": "1970-01-01T00:00:00.000Z",
@@ -106,6 +109,7 @@ Array [
           "repostCount": 1,
           "uri": "record(3)",
           "viewer": Object {
+            "embeddingDisabled": false,
             "threadMuted": false,
           },
         },
@@ -164,6 +168,7 @@ Array [
               },
             ],
             "likeCount": 0,
+            "quoteCount": 0,
             "record": Object {
               "$type": "app.bsky.feed.post",
               "createdAt": "1970-01-01T00:00:00.000Z",
@@ -199,6 +204,7 @@ Array [
             "repostCount": 0,
             "uri": "record(5)",
             "viewer": Object {
+              "embeddingDisabled": false,
               "threadMuted": false,
             },
           },
@@ -217,6 +223,7 @@ Array [
             "indexedAt": "1970-01-01T00:00:00.000Z",
             "labels": Array [],
             "likeCount": 3,
+            "quoteCount": 0,
             "record": Object {
               "$type": "app.bsky.feed.post",
               "createdAt": "1970-01-01T00:00:00.000000Z",
@@ -226,6 +233,7 @@ Array [
             "repostCount": 1,
             "uri": "record(4)",
             "viewer": Object {
+              "embeddingDisabled": false,
               "threadMuted": false,
             },
           },
@@ -374,6 +382,7 @@ Array [
             },
           ],
           "likeCount": 2,
+          "quoteCount": 0,
           "record": Object {
             "$type": "app.bsky.feed.post",
             "createdAt": "1970-01-01T00:00:00.000Z",
@@ -390,6 +399,7 @@ Array [
           "repostCount": 0,
           "uri": "record(6)",
           "viewer": Object {
+            "embeddingDisabled": false,
             "threadMuted": false,
           },
         },
@@ -409,6 +419,7 @@ Array [
           "indexedAt": "1970-01-01T00:00:00.000Z",
           "labels": Array [],
           "likeCount": 3,
+          "quoteCount": 0,
           "record": Object {
             "$type": "app.bsky.feed.post",
             "createdAt": "1970-01-01T00:00:00.000000Z",
@@ -418,6 +429,7 @@ Array [
           "repostCount": 1,
           "uri": "record(4)",
           "viewer": Object {
+            "embeddingDisabled": false,
             "threadMuted": false,
           },
         },
@@ -445,6 +457,7 @@ Array [
             },
           ],
           "likeCount": 0,
+          "quoteCount": 0,
           "record": Object {
             "$type": "app.bsky.feed.post",
             "createdAt": "1970-01-01T00:00:00.000Z",
@@ -462,6 +475,7 @@ Array [
           "repostCount": 0,
           "uri": "record(12)",
           "viewer": Object {
+            "embeddingDisabled": false,
             "threadMuted": false,
           },
         },
@@ -554,6 +568,7 @@ Object {
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
+      "quoteCount": 0,
       "record": Object {
         "$type": "app.bsky.feed.post",
         "createdAt": "1970-01-01T00:00:00.000Z",
@@ -577,6 +592,7 @@ Object {
       "repostCount": 0,
       "uri": "record(0)",
       "viewer": Object {
+        "embeddingDisabled": false,
         "threadMuted": false,
       },
     },
@@ -621,6 +637,7 @@ Object {
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
+      "quoteCount": 0,
       "record": Object {
         "$type": "app.bsky.feed.post",
         "createdAt": "1970-01-01T00:00:00.000Z",
@@ -644,6 +661,7 @@ Object {
       "repostCount": 0,
       "uri": "record(0)",
       "viewer": Object {
+        "embeddingDisabled": false,
         "threadMuted": false,
       },
     },

package/tests/data-plane/indexing.test.ts

@@ -277,6 +277,7 @@ describe('indexing', () => {
       replyCount: 1,
       repostCount: 1,
       likeCount: 1,
+      quoteCount: 0,
     })
     // Cleanup
     const del = (uri: AtUri) => {

package/tests/postgates.test.ts

@@ -0,0 +1,186 @@
+import { TestNetwork, SeedClient, RecordRef } from '@atproto/dev-env'
+import AtpAgent, { AppBskyEmbedRecord } from '@atproto/api'
+
+import { ids } from '../src/lexicon/lexicons'
+import { postgatesSeed, Users } from './seed/postgates'
+
+describe('postgates', () => {
+  let network: TestNetwork
+  let agent: AtpAgent
+  let pdsAgent: AtpAgent
+  let sc: SeedClient
+  let users: Users
+
+  beforeAll(async () => {
+    network = await TestNetwork.create({
+      dbPostgresSchema: 'bsky_tests_postgates',
+    })
+    agent = network.bsky.getClient()
+    pdsAgent = network.pds.getClient()
+    sc = network.getSeedClient()
+
+    const result = await postgatesSeed(sc)
+    users = result.users
+
+    await network.processAll()
+  })
+
+  afterAll(async () => {
+    await network.close()
+  })
+
+  describe(`quotee <-> quoter`, () => {
+    it(`quotee detaches own post from quoter`, async () => {
+      const quoteePost = await sc.post(users.quotee.did, `post`)
+      const quoterPost = await sc.post(
+        users.quoter.did,
+        `quote post`,
+        undefined,
+        undefined,
+        quoteePost.ref,
+      )
+      await pdsAgent.api.app.bsky.feed.postgate.create(
+        {
+          repo: users.quotee.did,
+          rkey: quoteePost.ref.uri.rkey,
+        },
+        {
+          post: quoteePost.ref.uriStr,
+          createdAt: new Date().toISOString(),
+          detachedEmbeddingUris: [quoterPost.ref.uriStr],
+        },
+        sc.getHeaders(users.quotee.did),
+      )
+      await network.processAll()
+
+      const root = await agent.api.app.bsky.feed.getPostThread(
+        { uri: quoterPost.ref.uriStr },
+        {
+          headers: await network.serviceHeaders(
+            users.viewer.did,
+            ids.AppBskyFeedGetPostThread,
+          ),
+        },
+      )
+
+      expect(
+        // @ts-ignore I know more than you
+        AppBskyEmbedRecord.isViewDetached(root.data.thread.post.embed.record),
+      ).toBe(true)
+    })
+
+    it(`postgate made by bystander has no effect`, async () => {
+      const quoteePost = await sc.post(users.quotee.did, `post`)
+      const quoterPost = await sc.post(
+        users.quoter.did,
+        `quote post`,
+        undefined,
+        undefined,
+        quoteePost.ref,
+      )
+      await pdsAgent.api.app.bsky.feed.postgate.create(
+        {
+          repo: users.viewer.did,
+          rkey: quoteePost.ref.uri.rkey,
+        },
+        {
+          post: quoteePost.ref.uriStr,
+          createdAt: new Date().toISOString(),
+          detachedEmbeddingUris: [quoterPost.ref.uriStr],
+        },
+        sc.getHeaders(users.viewer.did),
+      )
+      await network.processAll()
+
+      const root = await agent.api.app.bsky.feed.getPostThread(
+        { uri: quoterPost.ref.uriStr },
+        {
+          headers: await network.serviceHeaders(
+            users.viewer.did,
+            ids.AppBskyFeedGetPostThread,
+          ),
+        },
+      )
+
+      expect(
+        // @ts-ignore I know more than you
+        AppBskyEmbedRecord.isViewDetached(root.data.thread.post.embed.record),
+      ).toBe(false)
+    })
+  })
+
+  describe(`embeddingRules`, () => {
+    it(`disables quoteposts`, async () => {
+      const quoteePost = await sc.post(users.quotee.did, `post`)
+      await pdsAgent.api.app.bsky.feed.postgate.create(
+        {
+          repo: users.quotee.did,
+          rkey: quoteePost.ref.uri.rkey,
+        },
+        {
+          post: quoteePost.ref.uriStr,
+          createdAt: new Date().toISOString(),
+          embeddingRules: [{ $type: 'app.bsky.feed.postgate#disableRule' }],
+        },
+        sc.getHeaders(users.quotee.did),
+      )
+      await network.processAll()
+
+      const root = await agent.api.app.bsky.feed.getPostThread(
+        { uri: quoteePost.ref.uriStr },
+        {
+          headers: await network.serviceHeaders(
+            users.viewer.did,
+            ids.AppBskyFeedGetPostThread,
+          ),
+        },
+      )
+
+      expect(
+        // @ts-ignore I know more than you
+        root.data.thread.post.viewer.embeddingDisabled,
+      ).toBe(true)
+    })
+
+    it(`quotepost created after quotes disabled hides embed`, async () => {
+      const quoteePost = await sc.post(users.quotee.did, `post`)
+      await pdsAgent.api.app.bsky.feed.postgate.create(
+        {
+          repo: users.quotee.did,
+          rkey: quoteePost.ref.uri.rkey,
+        },
+        {
+          post: quoteePost.ref.uriStr,
+          createdAt: new Date().toISOString(),
+          embeddingRules: [{ $type: 'app.bsky.feed.postgate#disableRule' }],
+        },
+        sc.getHeaders(users.quotee.did),
+      )
+      await network.processAll()
+
+      const quoterPost = await sc.post(
+        users.quoter.did,
+        `quote post`,
+        undefined,
+        undefined,
+        quoteePost.ref,
+      )
+      await network.processAll()
+
+      const root = await agent.api.app.bsky.feed.getPostThread(
+        { uri: quoterPost.ref.uriStr },
+        {
+          headers: await network.serviceHeaders(
+            users.viewer.did,
+            ids.AppBskyFeedGetPostThread,
+          ),
+        },
+      )
+
+      expect(
+        // @ts-ignore I know more than you
+        AppBskyEmbedRecord.isViewDetached(root.data.thread.post.embed.record),
+      ).toBe(true)
+    })
+  })
+})