@atproto/bsky 0.0.60 → 0.0.62

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

@@ -40,7 +40,9 @@ Object {
   "replyCount": 0,
   "repostCount": 0,
   "uri": "record(0)",
-  "viewer": Object {},
+  "viewer": Object {
+    "threadMuted": false,
+  },
 }
 `;
 
@@ -123,7 +125,9 @@ Object {
   "replyCount": 0,
   "repostCount": 0,
   "uri": "record(0)",
-  "viewer": Object {},
+  "viewer": Object {
+    "threadMuted": false,
+  },
 }
 `;
 
@@ -398,7 +402,9 @@ Array [
       "replyCount": 0,
       "repostCount": 0,
       "uri": "record(0)",
-      "viewer": Object {},
+      "viewer": Object {
+        "threadMuted": false,
+      },
     },
   },
   Object {
@@ -433,7 +439,9 @@ Array [
       "replyCount": 0,
       "repostCount": 0,
       "uri": "record(2)",
-      "viewer": Object {},
+      "viewer": Object {
+        "threadMuted": false,
+      },
     },
   },
   Object {
@@ -553,6 +561,7 @@ Array [
       "uri": "record(5)",
       "viewer": Object {
         "like": "record(8)",
+        "threadMuted": false,
       },
     },
   },
@@ -592,7 +601,9 @@ Array [
       "replyCount": 0,
       "repostCount": 0,
       "uri": "record(9)",
-      "viewer": Object {},
+      "viewer": Object {
+        "threadMuted": false,
+      },
     },
     "reply": Object {
       "parent": Object {
@@ -635,7 +646,9 @@ Array [
         "replyCount": 2,
         "repostCount": 1,
         "uri": "record(10)",
-        "viewer": Object {},
+        "viewer": Object {
+          "threadMuted": false,
+        },
       },
       "root": Object {
         "$type": "app.bsky.feed.defs#postView",
@@ -677,7 +690,9 @@ Array [
         "replyCount": 2,
         "repostCount": 1,
         "uri": "record(10)",
-        "viewer": Object {},
+        "viewer": Object {
+          "threadMuted": false,
+        },
       },
     },
   },
@@ -851,7 +866,9 @@ Array [
       "replyCount": 0,
       "repostCount": 1,
       "uri": "record(11)",
-      "viewer": Object {},
+      "viewer": Object {
+        "threadMuted": false,
+      },
     },
     "reason": Object {
       "$type": "app.bsky.feed.defs#reasonRepost",
@@ -1204,7 +1221,9 @@ Array [
       "replyCount": 0,
       "repostCount": 0,
       "uri": "record(0)",
-      "viewer": Object {},
+      "viewer": Object {
+        "threadMuted": false,
+      },
     },
   },
   Object {
@@ -1324,6 +1343,7 @@ Array [
       "uri": "record(2)",
       "viewer": Object {
         "like": "record(8)",
+        "threadMuted": false,
       },
     },
   },
@@ -1363,7 +1383,9 @@ Array [
       "replyCount": 0,
       "repostCount": 0,
       "uri": "record(9)",
-      "viewer": Object {},
+      "viewer": Object {
+        "threadMuted": false,
+      },
     },
     "reply": Object {
       "parent": Object {
@@ -1406,7 +1428,9 @@ Array [
         "replyCount": 2,
         "repostCount": 1,
         "uri": "record(10)",
-        "viewer": Object {},
+        "viewer": Object {
+          "threadMuted": false,
+        },
       },
       "root": Object {
         "$type": "app.bsky.feed.defs#postView",
@@ -1448,7 +1472,9 @@ Array [
         "replyCount": 2,
         "repostCount": 1,
         "uri": "record(10)",
-        "viewer": Object {},
+        "viewer": Object {
+          "threadMuted": false,
+        },
       },
     },
   },

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

@@ -18,6 +18,24 @@ Array [
     "postsCount": 5,
     "viewer": Object {
       "blockedBy": false,
+      "knownFollowers": Object {
+        "count": 1,
+        "followers": Array [
+          Object {
+            "avatar": "https://bsky.public.url/img/avatar/plain/user(2)/cids(0)@jpeg",
+            "did": "user(1)",
+            "displayName": "bobby",
+            "handle": "bob.test",
+            "labels": Array [],
+            "viewer": Object {
+              "blockedBy": false,
+              "followedBy": "record(1)",
+              "following": "record(0)",
+              "muted": false,
+            },
+          },
+        ],
+      },
       "muted": false,
     },
   },
@@ -35,7 +53,7 @@ Array [
               "muted": false,
             },
           },
-          "cid": "cids(0)",
+          "cid": "cids(1)",
           "indexedAt": "1970-01-01T00:00:00.000Z",
           "labels": Array [],
           "likeCount": 0,
@@ -46,8 +64,10 @@ Array [
           },
           "replyCount": 0,
           "repostCount": 0,
-          "uri": "record(0)",
-          "viewer": Object {},
+          "uri": "record(2)",
+          "viewer": Object {
+            "threadMuted": false,
+          },
         },
       },
       Object {
@@ -61,7 +81,7 @@ Array [
               "muted": false,
             },
           },
-          "cid": "cids(1)",
+          "cid": "cids(2)",
           "indexedAt": "1970-01-01T00:00:00.000Z",
           "labels": Array [],
           "likeCount": 0,
@@ -70,20 +90,22 @@ Array [
             "createdAt": "1970-01-01T00:00:00.000Z",
             "reply": Object {
               "parent": Object {
-                "cid": "cids(3)",
-                "uri": "record(3)",
+                "cid": "cids(4)",
+                "uri": "record(5)",
               },
               "root": Object {
-                "cid": "cids(2)",
-                "uri": "record(2)",
+                "cid": "cids(3)",
+                "uri": "record(4)",
               },
             },
             "text": "thanks bob",
           },
           "replyCount": 0,
           "repostCount": 1,
-          "uri": "record(1)",
-          "viewer": Object {},
+          "uri": "record(3)",
+          "viewer": Object {
+            "threadMuted": false,
+          },
         },
         "reply": Object {
           "grandparentAuthor": Object {
@@ -98,19 +120,19 @@ Array [
           "parent": Object {
             "$type": "app.bsky.feed.defs#postView",
             "author": Object {
-              "avatar": "https://bsky.public.url/img/avatar/plain/user(2)/cids(4)@jpeg",
+              "avatar": "https://bsky.public.url/img/avatar/plain/user(2)/cids(0)@jpeg",
               "did": "user(1)",
               "displayName": "bobby",
               "handle": "bob.test",
               "labels": Array [],
               "viewer": Object {
                 "blockedBy": false,
-                "followedBy": "record(5)",
-                "following": "record(4)",
+                "followedBy": "record(1)",
+                "following": "record(0)",
                 "muted": false,
               },
             },
-            "cid": "cids(3)",
+            "cid": "cids(4)",
             "embed": Object {
               "$type": "app.bsky.embed.images#view",
               "images": Array [
@@ -124,17 +146,17 @@ Array [
             "indexedAt": "1970-01-01T00:00:00.000Z",
             "labels": Array [
               Object {
-                "cid": "cids(3)",
+                "cid": "cids(4)",
                 "cts": "1970-01-01T00:00:00.000Z",
                 "src": "did:example:labeler",
-                "uri": "record(3)",
+                "uri": "record(5)",
                 "val": "test-label",
               },
               Object {
-                "cid": "cids(3)",
+                "cid": "cids(4)",
                 "cts": "1970-01-01T00:00:00.000Z",
                 "src": "did:example:labeler",
-                "uri": "record(3)",
+                "uri": "record(5)",
                 "val": "test-label-2",
               },
             ],
@@ -160,20 +182,22 @@ Array [
               },
               "reply": Object {
                 "parent": Object {
-                  "cid": "cids(2)",
-                  "uri": "record(2)",
+                  "cid": "cids(3)",
+                  "uri": "record(4)",
                 },
                 "root": Object {
-                  "cid": "cids(2)",
-                  "uri": "record(2)",
+                  "cid": "cids(3)",
+                  "uri": "record(4)",
                 },
               },
               "text": "hear that label_me label_me_2",
             },
             "replyCount": 1,
             "repostCount": 0,
-            "uri": "record(3)",
-            "viewer": Object {},
+            "uri": "record(5)",
+            "viewer": Object {
+              "threadMuted": false,
+            },
           },
           "root": Object {
             "$type": "app.bsky.feed.defs#postView",
@@ -186,7 +210,7 @@ Array [
                 "muted": false,
               },
             },
-            "cid": "cids(2)",
+            "cid": "cids(3)",
             "indexedAt": "1970-01-01T00:00:00.000Z",
             "labels": Array [],
             "likeCount": 3,
@@ -197,8 +221,10 @@ Array [
             },
             "replyCount": 2,
             "repostCount": 1,
-            "uri": "record(2)",
-            "viewer": Object {},
+            "uri": "record(4)",
+            "viewer": Object {
+              "threadMuted": false,
+            },
           },
         },
       },
@@ -360,7 +386,9 @@ Array [
           "replyCount": 0,
           "repostCount": 0,
           "uri": "record(6)",
-          "viewer": Object {},
+          "viewer": Object {
+            "threadMuted": false,
+          },
         },
       },
       Object {
@@ -374,7 +402,7 @@ Array [
               "muted": false,
             },
           },
-          "cid": "cids(2)",
+          "cid": "cids(3)",
           "indexedAt": "1970-01-01T00:00:00.000Z",
           "labels": Array [],
           "likeCount": 3,
@@ -385,8 +413,10 @@ Array [
           },
           "replyCount": 2,
           "repostCount": 1,
-          "uri": "record(2)",
-          "viewer": Object {},
+          "uri": "record(4)",
+          "viewer": Object {
+            "threadMuted": false,
+          },
         },
       },
       Object {
@@ -428,7 +458,9 @@ Array [
           "replyCount": 0,
           "repostCount": 0,
           "uri": "record(12)",
-          "viewer": Object {},
+          "viewer": Object {
+            "threadMuted": false,
+          },
         },
       },
     ],
@@ -452,7 +484,7 @@ Array [
         },
       },
       Object {
-        "avatar": "https://bsky.public.url/img/avatar/plain/user(2)/cids(4)@jpeg",
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(2)/cids(0)@jpeg",
         "description": "hi im bob label_me",
         "did": "user(1)",
         "displayName": "bobby",
@@ -461,8 +493,8 @@ Array [
         "labels": Array [],
         "viewer": Object {
           "blockedBy": false,
-          "followedBy": "record(5)",
-          "following": "record(4)",
+          "followedBy": "record(1)",
+          "following": "record(0)",
           "muted": false,
         },
       },
@@ -539,7 +571,9 @@ Object {
       "replyCount": 0,
       "repostCount": 0,
       "uri": "record(0)",
-      "viewer": Object {},
+      "viewer": Object {
+        "threadMuted": false,
+      },
     },
     "replies": Array [],
   },
@@ -603,7 +637,9 @@ Object {
       "replyCount": 0,
       "repostCount": 0,
       "uri": "record(0)",
-      "viewer": Object {},
+      "viewer": Object {
+        "threadMuted": false,
+      },
     },
     "replies": Array [],
   },

package/tests/data-plane/thread-mutes.test.ts

@@ -0,0 +1,140 @@
+import { RecordRef, SeedClient, TestNetwork, usersSeed } from '@atproto/dev-env'
+import AtpAgent from '@atproto/api'
+
+describe('thread mutes', () => {
+  let network: TestNetwork
+  let agent: AtpAgent
+  let sc: SeedClient
+
+  let alice: string
+  let bob: string
+
+  let rootPost: RecordRef
+  let replyPost: RecordRef
+
+  beforeAll(async () => {
+    network = await TestNetwork.create({
+      dbPostgresSchema: 'bsky_thread_mutes',
+    })
+    sc = network.getSeedClient()
+    agent = network.bsky.getClient()
+    await usersSeed(sc)
+    alice = sc.dids.alice
+    bob = sc.dids.bob
+    rootPost = (await sc.post(alice, 'root post')).ref
+    replyPost = (await sc.reply(alice, rootPost, rootPost, 'first reply')).ref
+    await network.processAll()
+  })
+
+  afterAll(async () => {
+    await network.close()
+  })
+
+  it('mutes threads', async () => {
+    await agent.api.app.bsky.graph.muteThread(
+      { root: rootPost.uriStr },
+      {
+        encoding: 'application/json',
+        headers: await network.serviceHeaders(alice),
+      },
+    )
+  })
+
+  it('notes that threads are muted in viewer state', async () => {
+    const res = await agent.api.app.bsky.feed.getPosts(
+      {
+        uris: [rootPost.uriStr, replyPost.uriStr],
+      },
+      {
+        headers: await network.serviceHeaders(alice),
+      },
+    )
+    expect(res.data.posts[0].viewer?.threadMuted).toBe(true)
+    expect(res.data.posts[1].viewer?.threadMuted).toBe(true)
+  })
+
+  it('prevents notifs from replies', async () => {
+    await sc.reply(bob, rootPost, rootPost, 'reply')
+    await sc.reply(bob, rootPost, replyPost, 'reply')
+    await network.processAll()
+
+    const notifsRes = await agent.api.app.bsky.notification.listNotifications(
+      {},
+      { headers: await network.serviceHeaders(alice) },
+    )
+    expect(notifsRes.data.notifications.length).toBe(0)
+  })
+
+  it('prevents notifs from quote posts', async () => {
+    await sc.post(bob, 'quote', undefined, undefined, rootPost)
+    await sc.post(bob, 'quote', undefined, undefined, replyPost)
+    await network.processAll()
+
+    const notifsRes = await agent.api.app.bsky.notification.listNotifications(
+      {},
+      { headers: await network.serviceHeaders(alice) },
+    )
+    expect(notifsRes.data.notifications.length).toBe(0)
+  })
+
+  it('prevents notifs from likes', async () => {
+    await sc.like(bob, rootPost)
+    await sc.like(bob, replyPost)
+    await network.processAll()
+
+    const notifsRes = await agent.api.app.bsky.notification.listNotifications(
+      {},
+      { headers: await network.serviceHeaders(alice) },
+    )
+    expect(notifsRes.data.notifications.length).toBe(0)
+  })
+
+  it('prevents notifs from reposts', async () => {
+    await sc.repost(bob, rootPost)
+    await sc.repost(bob, replyPost)
+    await network.processAll()
+
+    const notifsRes = await agent.api.app.bsky.notification.listNotifications(
+      {},
+      { headers: await network.serviceHeaders(alice) },
+    )
+    expect(notifsRes.data.notifications.length).toBe(0)
+  })
+
+  it('unmutes threads', async () => {
+    await agent.api.app.bsky.graph.unmuteThread(
+      { root: rootPost.uriStr },
+      {
+        encoding: 'application/json',
+        headers: await network.serviceHeaders(alice),
+      },
+    )
+  })
+
+  it('no longer notes that threads are muted in viewer state after unmuting', async () => {
+    const res = await agent.api.app.bsky.feed.getPosts(
+      {
+        uris: [rootPost.uriStr, replyPost.uriStr],
+      },
+      {
+        headers: await network.serviceHeaders(alice),
+      },
+    )
+    expect(res.data.posts[0].viewer?.threadMuted).toBe(false)
+    expect(res.data.posts[1].viewer?.threadMuted).toBe(false)
+  })
+
+  it('sends notifications after unmuting', async () => {
+    await sc.reply(bob, rootPost, rootPost, 'new reply')
+    await sc.reply(bob, rootPost, replyPost, 'new reply')
+    await sc.like(bob, rootPost)
+    await sc.repost(bob, replyPost)
+    await network.processAll()
+
+    const notifsRes = await agent.api.app.bsky.notification.listNotifications(
+      {},
+      { headers: await network.serviceHeaders(alice) },
+    )
+    expect(notifsRes.data.notifications.length).toBe(4)
+  })
+})

package/tests/label-hydration.test.ts

@@ -4,7 +4,6 @@ import axios from 'axios'
 
 describe('label hydration', () => {
   let network: TestNetwork
-  let agent: AtpAgent
   let pdsAgent: AtpAgent
   let sc: SeedClient
 
@@ -17,7 +16,6 @@ describe('label hydration', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'bsky_label_hydration',
     })
-    agent = network.bsky.getClient()
     pdsAgent = network.pds.getClient()
     sc = network.getSeedClient()
     await basicSeed(sc)

package/tests/query-labels.test.ts

@@ -1,10 +1,8 @@
 import { AtpAgent } from '@atproto/api'
 import { TestNetwork, SeedClient, basicSeed } from '@atproto/dev-env'
-import axios from 'axios'
 
 describe('label hydration', () => {
   let network: TestNetwork
-  let agent: AtpAgent
   let pdsAgent: AtpAgent
   let sc: SeedClient
 
@@ -17,7 +15,6 @@ describe('label hydration', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'bsky_label_hydration',
     })
-    agent = network.bsky.getClient()
     pdsAgent = network.pds.getClient()
     sc = network.getSeedClient()
     await basicSeed(sc)