@atproto/bsky 0.0.157 → 0.0.158

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.157",
+  "version": "0.0.158",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
@@ -48,7 +48,7 @@
     "uint8arrays": "3.0.0",
     "undici": "^6.19.8",
     "@atproto-labs/fetch-node": "0.1.9",
-    "@atproto-labs/xrpc-utils": "0.0.15",
+    "@atproto-labs/xrpc-utils": "0.0.16",
     "@atproto/api": "^0.15.14",
     "@atproto/common": "^0.4.11",
     "@atproto/crypto": "^0.4.4",
@@ -56,9 +56,9 @@
     "@atproto/identity": "^0.4.8",
     "@atproto/lexicon": "^0.4.11",
     "@atproto/repo": "^0.8.1",
-    "@atproto/sync": "^0.1.24",
+    "@atproto/sync": "^0.1.25",
     "@atproto/syntax": "^0.4.0",
-    "@atproto/xrpc-server": "^0.7.19"
+    "@atproto/xrpc-server": "^0.8.0"
   },
   "devDependencies": {
     "@bufbuild/buf": "^1.28.1",
@@ -75,7 +75,7 @@
     "typescript": "^5.6.3",
     "@atproto/api": "^0.15.14",
     "@atproto/lex-cli": "^0.8.2",
-    "@atproto/pds": "^0.4.146",
+    "@atproto/pds": "^0.4.147",
     "@atproto/xrpc": "^0.7.0"
   },
   "scripts": {

package/proto/bsky.proto

@@ -794,19 +794,20 @@ message ChatNotificationPreference {
 }
 
 message NotificationPreferences {
-  ChatNotificationPreference chat = 1;
-  FilterableNotificationPreference follow = 2;
-  FilterableNotificationPreference like = 3;
-  FilterableNotificationPreference like_via_repost = 4;
-  FilterableNotificationPreference mention = 5;
-  FilterableNotificationPreference quote = 6;
-  FilterableNotificationPreference reply = 7;
-  FilterableNotificationPreference repost = 8;
-  FilterableNotificationPreference repost_via_repost = 9;
-  NotificationPreference starterpack_joined = 10;
-  NotificationPreference subscribed_post = 11;
-  NotificationPreference unverified = 12;
-  NotificationPreference verified = 13;
+  bytes entry = 1;
+  ChatNotificationPreference chat = 2;
+  FilterableNotificationPreference follow = 3;
+  FilterableNotificationPreference like = 4;
+  FilterableNotificationPreference like_via_repost = 5;
+  FilterableNotificationPreference mention = 6;
+  FilterableNotificationPreference quote = 7;
+  FilterableNotificationPreference reply = 8;
+  FilterableNotificationPreference repost = 9;
+  FilterableNotificationPreference repost_via_repost = 10;
+  NotificationPreference starterpack_joined = 11;
+  NotificationPreference subscribed_post = 12;
+  NotificationPreference unverified = 13;
+  NotificationPreference verified = 14;
 }
 
 message GetNotificationPreferencesResponse {

package/src/data-plane/server/db/db.ts

@@ -19,6 +19,8 @@ import * as migrations from './migrations'
 import { CtxMigrationProvider } from './migrations/provider'
 import { PgOptions } from './types'
 
+export type { DatabaseSchema }
+
 export class Database {
   pool: PgPool
   db: DatabaseSchema

package/src/data-plane/server/db/index.ts

@@ -1 +1,2 @@
 export * from './db'
+export type { DatabaseSchema } from './db'

package/src/data-plane/server/db/tables/record.ts

@@ -1,3 +1,5 @@
+import { ColumnType } from 'kysely'
+
 export interface Record {
   uri: string
   cid: string
@@ -5,7 +7,7 @@ export interface Record {
   json: string
   indexedAt: string
   takedownRef: string | null
-  tags: string[] | null
+  tags: ColumnType<string[] | null, string | undefined, string> | null
 }
 
 export const tableName = 'record'

package/src/data-plane/server/index.ts

@@ -3,9 +3,11 @@ import http from 'node:http'
 import { expressConnectMiddleware } from '@connectrpc/connect-express'
 import express from 'express'
 import { IdResolver, MemoryCache } from '@atproto/identity'
-import { Database } from './db'
+import { Database, DatabaseSchema } from './db'
 import createRoutes from './routes'
 
+export type { DatabaseSchema }
+
 export { RepoSubscription } from './subscription'
 
 export class DataPlaneServer {

package/src/data-plane/server/routes/private-data.ts

@@ -35,15 +35,19 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
         return {}
       }
       const p: Preferences = JSON.parse(row.payload)
-      return lexToProtobuf(p)
+      return lexToProtobuf(p, row.payload)
     })
 
     return { preferences }
   },
 })
 
-export const lexToProtobuf = (p: Preferences): NotificationPreferences => {
+export const lexToProtobuf = (
+  p: Preferences,
+  json: string,
+): NotificationPreferences => {
   return new NotificationPreferences({
+    entry: Buffer.from(json),
     chat: lexChatPreferenceToProtobuf(p.chat),
     follow: lexFilterablePreferenceToProtobuf(p.follow),
     like: lexFilterablePreferenceToProtobuf(p.like),

package/src/proto/bsky_pb.ts

@@ -8613,67 +8613,72 @@ export class ChatNotificationPreference extends Message<ChatNotificationPreferen
  */
 export class NotificationPreferences extends Message<NotificationPreferences> {
   /**
-   * @generated from field: bsky.ChatNotificationPreference chat = 1;
+   * @generated from field: bytes entry = 1;
+   */
+  entry = new Uint8Array(0)
+
+  /**
+   * @generated from field: bsky.ChatNotificationPreference chat = 2;
    */
   chat?: ChatNotificationPreference
 
   /**
-   * @generated from field: bsky.FilterableNotificationPreference follow = 2;
+   * @generated from field: bsky.FilterableNotificationPreference follow = 3;
    */
   follow?: FilterableNotificationPreference
 
   /**
-   * @generated from field: bsky.FilterableNotificationPreference like = 3;
+   * @generated from field: bsky.FilterableNotificationPreference like = 4;
    */
   like?: FilterableNotificationPreference
 
   /**
-   * @generated from field: bsky.FilterableNotificationPreference like_via_repost = 4;
+   * @generated from field: bsky.FilterableNotificationPreference like_via_repost = 5;
    */
   likeViaRepost?: FilterableNotificationPreference
 
   /**
-   * @generated from field: bsky.FilterableNotificationPreference mention = 5;
+   * @generated from field: bsky.FilterableNotificationPreference mention = 6;
    */
   mention?: FilterableNotificationPreference
 
   /**
-   * @generated from field: bsky.FilterableNotificationPreference quote = 6;
+   * @generated from field: bsky.FilterableNotificationPreference quote = 7;
    */
   quote?: FilterableNotificationPreference
 
   /**
-   * @generated from field: bsky.FilterableNotificationPreference reply = 7;
+   * @generated from field: bsky.FilterableNotificationPreference reply = 8;
    */
   reply?: FilterableNotificationPreference
 
   /**
-   * @generated from field: bsky.FilterableNotificationPreference repost = 8;
+   * @generated from field: bsky.FilterableNotificationPreference repost = 9;
    */
   repost?: FilterableNotificationPreference
 
   /**
-   * @generated from field: bsky.FilterableNotificationPreference repost_via_repost = 9;
+   * @generated from field: bsky.FilterableNotificationPreference repost_via_repost = 10;
    */
   repostViaRepost?: FilterableNotificationPreference
 
   /**
-   * @generated from field: bsky.NotificationPreference starterpack_joined = 10;
+   * @generated from field: bsky.NotificationPreference starterpack_joined = 11;
    */
   starterpackJoined?: NotificationPreference
 
   /**
-   * @generated from field: bsky.NotificationPreference subscribed_post = 11;
+   * @generated from field: bsky.NotificationPreference subscribed_post = 12;
    */
   subscribedPost?: NotificationPreference
 
   /**
-   * @generated from field: bsky.NotificationPreference unverified = 12;
+   * @generated from field: bsky.NotificationPreference unverified = 13;
    */
   unverified?: NotificationPreference
 
   /**
-   * @generated from field: bsky.NotificationPreference verified = 13;
+   * @generated from field: bsky.NotificationPreference verified = 14;
    */
   verified?: NotificationPreference
 
@@ -8685,69 +8690,70 @@ export class NotificationPreferences extends Message<NotificationPreferences> {
   static readonly runtime: typeof proto3 = proto3
   static readonly typeName = 'bsky.NotificationPreferences'
   static readonly fields: FieldList = proto3.util.newFieldList(() => [
-    { no: 1, name: 'chat', kind: 'message', T: ChatNotificationPreference },
+    { no: 1, name: 'entry', kind: 'scalar', T: 12 /* ScalarType.BYTES */ },
+    { no: 2, name: 'chat', kind: 'message', T: ChatNotificationPreference },
     {
-      no: 2,
+      no: 3,
       name: 'follow',
       kind: 'message',
       T: FilterableNotificationPreference,
     },
     {
-      no: 3,
+      no: 4,
       name: 'like',
       kind: 'message',
       T: FilterableNotificationPreference,
     },
     {
-      no: 4,
+      no: 5,
       name: 'like_via_repost',
       kind: 'message',
       T: FilterableNotificationPreference,
     },
     {
-      no: 5,
+      no: 6,
       name: 'mention',
       kind: 'message',
       T: FilterableNotificationPreference,
     },
     {
-      no: 6,
+      no: 7,
       name: 'quote',
       kind: 'message',
       T: FilterableNotificationPreference,
     },
     {
-      no: 7,
+      no: 8,
       name: 'reply',
       kind: 'message',
       T: FilterableNotificationPreference,
     },
     {
-      no: 8,
+      no: 9,
       name: 'repost',
       kind: 'message',
       T: FilterableNotificationPreference,
     },
     {
-      no: 9,
+      no: 10,
       name: 'repost_via_repost',
       kind: 'message',
       T: FilterableNotificationPreference,
     },
     {
-      no: 10,
+      no: 11,
       name: 'starterpack_joined',
       kind: 'message',
       T: NotificationPreference,
     },
     {
-      no: 11,
+      no: 12,
       name: 'subscribed_post',
       kind: 'message',
       T: NotificationPreference,
     },
-    { no: 12, name: 'unverified', kind: 'message', T: NotificationPreference },
-    { no: 13, name: 'verified', kind: 'message', T: NotificationPreference },
+    { no: 13, name: 'unverified', kind: 'message', T: NotificationPreference },
+    { no: 14, name: 'verified', kind: 'message', T: NotificationPreference },
   ])
 
   static fromBinary(

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

@@ -1,6 +1,6 @@
 import assert from 'node:assert'
 import { AppBskyUnspeccedDefs, AtpAgent } from '@atproto/api'
-import { SeedClient, TestNetwork } from '@atproto/dev-env'
+import { SeedClient, TestNetwork, seedThreadV2 } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
 import { ThreadItemPost } from '../../src/lexicon/types/app/bsky/unspecced/defs'
 import { OutputSchema as OutputSchemaHiddenThread } from '../../src/lexicon/types/app/bsky/unspecced/getPostThreadOtherV2'
@@ -13,8 +13,6 @@ import {
   ThreadOtherItemValuePost,
 } 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 => ({
@@ -45,8 +43,8 @@ describe('appview thread views v2', () => {
     network = await TestNetwork.create({
       bsky: {
         maxThreadParents: 15,
-        threadTagsBumpDown: new Set([TAG_BUMP_DOWN]),
-        threadTagsHide: new Set([TAG_HIDE]),
+        threadTagsBumpDown: new Set([seedThreadV2.TAG_BUMP_DOWN]),
+        threadTagsHide: new Set([seedThreadV2.TAG_HIDE]),
       },
       dbPostgresSchema: 'bsky_views_thread_v_two',
     })
@@ -79,10 +77,10 @@ describe('appview thread views v2', () => {
   })
 
   describe('simple thread', () => {
-    let seed: Awaited<ReturnType<typeof seeds.simple>>
+    let seed: Awaited<ReturnType<typeof seedThreadV2.simple>>
 
     beforeAll(async () => {
-      seed = await seeds.simple(sc)
+      seed = await seedThreadV2.simple(sc)
       await network.processAll()
     })
 
@@ -244,10 +242,10 @@ describe('appview thread views v2', () => {
   })
 
   describe('long thread', () => {
-    let seed: Awaited<ReturnType<typeof seeds.long>>
+    let seed: Awaited<ReturnType<typeof seedThreadV2.long>>
 
     beforeAll(async () => {
-      seed = await seeds.long(sc)
+      seed = await seedThreadV2.long(sc)
       await network.processAll()
     })
 
@@ -313,10 +311,10 @@ describe('appview thread views v2', () => {
   })
 
   describe('deep thread', () => {
-    let seed: Awaited<ReturnType<typeof seeds.deep>>
+    let seed: Awaited<ReturnType<typeof seedThreadV2.deep>>
 
     beforeAll(async () => {
-      seed = await seeds.deep(sc)
+      seed = await seedThreadV2.deep(sc)
       await network.processAll()
     })
 
@@ -432,10 +430,10 @@ describe('appview thread views v2', () => {
   })
 
   describe('branching factor', () => {
-    let seed: Awaited<ReturnType<typeof seeds.branchingFactor>>
+    let seed: Awaited<ReturnType<typeof seedThreadV2.branchingFactor>>
 
     beforeAll(async () => {
-      seed = await seeds.branchingFactor(sc)
+      seed = await seedThreadV2.branchingFactor(sc)
       await network.processAll()
     })
 
@@ -611,10 +609,10 @@ describe('appview thread views v2', () => {
   })
 
   describe('annotate more replies', () => {
-    let seed: Awaited<ReturnType<typeof seeds.annotateMoreReplies>>
+    let seed: Awaited<ReturnType<typeof seedThreadV2.annotateMoreReplies>>
 
     beforeAll(async () => {
-      seed = await seeds.annotateMoreReplies(sc)
+      seed = await seedThreadV2.annotateMoreReplies(sc)
       await network.processAll()
     })
 
@@ -706,10 +704,10 @@ describe('appview thread views v2', () => {
   })
 
   describe(`annotate OP thread`, () => {
-    let seed: Awaited<ReturnType<typeof seeds.annotateOP>>
+    let seed: Awaited<ReturnType<typeof seedThreadV2.annotateOP>>
 
     beforeAll(async () => {
-      seed = await seeds.annotateOP(sc)
+      seed = await seedThreadV2.annotateOP(sc)
       await network.processAll()
     })
 
@@ -800,10 +798,10 @@ describe('appview thread views v2', () => {
 
   describe('bumping and sorting', () => {
     describe('sorting', () => {
-      let seed: Awaited<ReturnType<typeof seeds.sort>>
+      let seed: Awaited<ReturnType<typeof seedThreadV2.sort>>
 
       beforeAll(async () => {
-        seed = await seeds.sort(sc)
+        seed = await seedThreadV2.sort(sc)
         await network.processAll()
       })
 
@@ -899,10 +897,10 @@ describe('appview thread views v2', () => {
 
     describe('bumping', () => {
       describe('sorting within bumped post groups', () => {
-        let seed: Awaited<ReturnType<typeof seeds.bumpGroupSorting>>
+        let seed: Awaited<ReturnType<typeof seedThreadV2.bumpGroupSorting>>
 
         beforeAll(async () => {
-          seed = await seeds.bumpGroupSorting(sc)
+          seed = await seedThreadV2.bumpGroupSorting(sc)
           await network.processAll()
         })
 
@@ -951,10 +949,10 @@ describe('appview thread views v2', () => {
       })
 
       describe('OP and viewer', () => {
-        let seed: Awaited<ReturnType<typeof seeds.bumpOpAndViewer>>
+        let seed: Awaited<ReturnType<typeof seedThreadV2.bumpOpAndViewer>>
 
         beforeAll(async () => {
-          seed = await seeds.bumpOpAndViewer(sc)
+          seed = await seedThreadV2.bumpOpAndViewer(sc)
           await network.processAll()
         })
 
@@ -1103,10 +1101,10 @@ describe('appview thread views v2', () => {
       })
 
       describe('followers', () => {
-        let seed: Awaited<ReturnType<typeof seeds.bumpFollows>>
+        let seed: Awaited<ReturnType<typeof seedThreadV2.bumpFollows>>
 
         beforeAll(async () => {
-          seed = await seeds.bumpFollows(sc)
+          seed = await seedThreadV2.bumpFollows(sc)
           await network.processAll()
         })
 
@@ -1204,10 +1202,10 @@ describe('appview thread views v2', () => {
   })
 
   describe(`blocks, deletions, no-unauthenticated`, () => {
-    let seed: Awaited<ReturnType<typeof seeds.blockDeletionAuth>>
+    let seed: Awaited<ReturnType<typeof seedThreadV2.blockDeletionAuth>>
 
     beforeAll(async () => {
-      seed = await seeds.blockDeletionAuth(sc, labelerDid)
+      seed = await seedThreadV2.blockDeletionAuth(sc, labelerDid)
       await network.processAll()
     })
 
@@ -1603,10 +1601,10 @@ describe('appview thread views v2', () => {
   })
 
   describe(`mutes`, () => {
-    let seed: Awaited<ReturnType<typeof seeds.mutes>>
+    let seed: Awaited<ReturnType<typeof seedThreadV2.mutes>>
 
     beforeAll(async () => {
-      seed = await seeds.mutes(sc)
+      seed = await seedThreadV2.mutes(sc)
       await network.processAll()
     })
 
@@ -1748,10 +1746,10 @@ describe('appview thread views v2', () => {
   })
 
   describe(`threadgated`, () => {
-    let seed: Awaited<ReturnType<typeof seeds.threadgated>>
+    let seed: Awaited<ReturnType<typeof seedThreadV2.threadgated>>
 
     beforeAll(async () => {
-      seed = await seeds.threadgated(sc)
+      seed = await seedThreadV2.threadgated(sc)
       await network.processAll()
     })
 
@@ -1954,10 +1952,10 @@ describe('appview thread views v2', () => {
   })
 
   describe('tags', () => {
-    let seed: Awaited<ReturnType<typeof seeds.tags>>
+    let seed: Awaited<ReturnType<typeof seedThreadV2.tags>>
 
     beforeAll(async () => {
-      seed = await seeds.tags(sc)
+      seed = await seedThreadV2.tags(sc)
       await network.processAll()
     })
 

package/tsconfig.tests.tsbuildinfo

@@ -1 +1 @@
-{"root":["./tests/_util.ts","./tests/auth.test.ts","./tests/blob-resolver.test.ts","./tests/entryway-auth.test.ts","./tests/etcd.test.ts","./tests/feed-generation.test.ts","./tests/label-hydration.test.ts","./tests/postgates.test.ts","./tests/query-labels.test.ts","./tests/redis-cache.test.ts","./tests/server.test.ts","./tests/stash.test.ts","./tests/admin/admin-auth.test.ts","./tests/admin/moderation.test.ts","./tests/data-plane/db.test.ts","./tests/data-plane/duplicate-records.test.ts","./tests/data-plane/handle-invalidation.test.ts","./tests/data-plane/indexing.test.ts","./tests/data-plane/subscription.test.ts","./tests/data-plane/thread-mutes.test.ts","./tests/hydration/util.test.ts","./tests/image/server.test.ts","./tests/image/sharp.test.ts","./tests/image/uri.test.ts","./tests/seed/feed-hidden-replies.ts","./tests/seed/get-suggested-starter-packs.ts","./tests/seed/get-trends.ts","./tests/seed/known-followers.ts","./tests/seed/postgates.ts","./tests/seed/thread-v2.ts","./tests/seed/util.ts","./tests/views/account-deactivation.test.ts","./tests/views/actor-likes.test.ts","./tests/views/actor-search.test.ts","./tests/views/author-feed.test.ts","./tests/views/block-lists.test.ts","./tests/views/blocks.test.ts","./tests/views/feed-hidden-replies.test.ts","./tests/views/feed-view-post.test.ts","./tests/views/follows.test.ts","./tests/views/get-config.test.ts","./tests/views/get-suggested-starter-packs.test.ts","./tests/views/get-trends.test.ts","./tests/views/known-followers.test.ts","./tests/views/labeler-service.test.ts","./tests/views/labels-needs-review.test.ts","./tests/views/labels-takedown.test.ts","./tests/views/likes.test.ts","./tests/views/list-feed.test.ts","./tests/views/lists.test.ts","./tests/views/mute-lists.test.ts","./tests/views/mutes.test.ts","./tests/views/notifications.test.ts","./tests/views/posts.test.ts","./tests/views/profile.test.ts","./tests/views/quotes.test.ts","./tests/views/reposts.test.ts","./tests/views/starter-packs.test.ts","./tests/views/suggested-follows.test.ts","./tests/views/suggestions.test.ts","./tests/views/thread-v2.test.ts","./tests/views/thread.test.ts","./tests/views/threadgating.test.ts","./tests/views/timeline.test.ts","./tests/views/verification.test.ts"],"version":"5.8.3"}
+{"root":["./tests/_util.ts","./tests/auth.test.ts","./tests/blob-resolver.test.ts","./tests/entryway-auth.test.ts","./tests/etcd.test.ts","./tests/feed-generation.test.ts","./tests/label-hydration.test.ts","./tests/postgates.test.ts","./tests/query-labels.test.ts","./tests/redis-cache.test.ts","./tests/server.test.ts","./tests/stash.test.ts","./tests/admin/admin-auth.test.ts","./tests/admin/moderation.test.ts","./tests/data-plane/db.test.ts","./tests/data-plane/duplicate-records.test.ts","./tests/data-plane/handle-invalidation.test.ts","./tests/data-plane/indexing.test.ts","./tests/data-plane/subscription.test.ts","./tests/data-plane/thread-mutes.test.ts","./tests/hydration/util.test.ts","./tests/image/server.test.ts","./tests/image/sharp.test.ts","./tests/image/uri.test.ts","./tests/seed/feed-hidden-replies.ts","./tests/seed/get-suggested-starter-packs.ts","./tests/seed/get-trends.ts","./tests/seed/known-followers.ts","./tests/seed/postgates.ts","./tests/views/account-deactivation.test.ts","./tests/views/actor-likes.test.ts","./tests/views/actor-search.test.ts","./tests/views/author-feed.test.ts","./tests/views/block-lists.test.ts","./tests/views/blocks.test.ts","./tests/views/feed-hidden-replies.test.ts","./tests/views/feed-view-post.test.ts","./tests/views/follows.test.ts","./tests/views/get-config.test.ts","./tests/views/get-suggested-starter-packs.test.ts","./tests/views/get-trends.test.ts","./tests/views/known-followers.test.ts","./tests/views/labeler-service.test.ts","./tests/views/labels-needs-review.test.ts","./tests/views/labels-takedown.test.ts","./tests/views/likes.test.ts","./tests/views/list-feed.test.ts","./tests/views/lists.test.ts","./tests/views/mute-lists.test.ts","./tests/views/mutes.test.ts","./tests/views/notifications.test.ts","./tests/views/posts.test.ts","./tests/views/profile.test.ts","./tests/views/quotes.test.ts","./tests/views/reposts.test.ts","./tests/views/starter-packs.test.ts","./tests/views/suggested-follows.test.ts","./tests/views/suggestions.test.ts","./tests/views/thread-v2.test.ts","./tests/views/thread.test.ts","./tests/views/threadgating.test.ts","./tests/views/timeline.test.ts","./tests/views/verification.test.ts"],"version":"5.8.3"}