@atproto/bsky 0.0.155 → 0.0.157

package/proto/bsky.proto

@@ -753,6 +753,66 @@ message GetBlocklistSubscriptionsResponse {
 // Notifications
 //
 
+message GetNotificationPreferencesRequest {
+  repeated string dids = 1;
+}
+
+message NotificationChannelList {
+  bool enabled = 1;
+}
+
+message NotificationChannelPush {
+  bool enabled = 1;
+}
+
+enum NotificationFilter {
+  NOTIFICATION_FILTER_UNSPECIFIED = 0;
+  NOTIFICATION_FILTER_ALL = 1;
+  NOTIFICATION_FILTER_FOLLOWS = 2;
+}
+
+message FilterableNotificationPreference {
+  NotificationFilter filter = 1;
+  NotificationChannelList list = 2;
+  NotificationChannelPush push = 3;
+}
+
+message NotificationPreference {
+  NotificationChannelList list = 1;
+  NotificationChannelPush push = 2;
+}
+
+enum ChatNotificationFilter {
+  CHAT_NOTIFICATION_FILTER_UNSPECIFIED = 0;
+  CHAT_NOTIFICATION_FILTER_ALL = 1;
+  CHAT_NOTIFICATION_FILTER_ACCEPTED = 2;
+}
+
+message ChatNotificationPreference {
+  ChatNotificationFilter filter = 1;
+  NotificationChannelPush push = 2;
+}
+
+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;
+}
+
+message GetNotificationPreferencesResponse {
+  repeated NotificationPreferences preferences = 1;
+}
+
 // - list recent notifications for a user
 //     - notifications should include a uri for the record that caused the notif & a “reason” for the notification (reply, like, quotepost, etc)
 //     - this should include both read & unread notifs
@@ -1256,6 +1316,7 @@ service Service {
   rpc GetBlocklistSubscriptions(GetBlocklistSubscriptionsRequest) returns (GetBlocklistSubscriptionsResponse);
 
   // Notifications
+  rpc GetNotificationPreferences(GetNotificationPreferencesRequest) returns (GetNotificationPreferencesResponse);
   rpc GetNotifications(GetNotificationsRequest) returns (GetNotificationsResponse);
   rpc GetNotificationSeen(GetNotificationSeenRequest) returns (GetNotificationSeenResponse);
   rpc GetUnreadNotificationCount(GetUnreadNotificationCountRequest) returns (GetUnreadNotificationCountResponse);

package/src/api/app/bsky/notification/getPreferences.ts

@@ -0,0 +1,50 @@
+import assert from 'node:assert'
+import { Un$Typed } from '@atproto/api'
+import { UpstreamFailureError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
+import { Preferences } from '../../../../lexicon/types/app/bsky/notification/defs'
+import { GetNotificationPreferencesResponse } from '../../../../proto/bsky_pb'
+import { protobufToLex } from './util'
+
+export default function (server: Server, ctx: AppContext) {
+  server.app.bsky.notification.getPreferences({
+    auth: ctx.authVerifier.standard,
+    handler: async ({ auth }) => {
+      const actorDid = auth.credentials.iss
+      const preferences = await computePreferences(ctx, actorDid)
+      return {
+        encoding: 'application/json',
+        body: {
+          preferences,
+        },
+      }
+    },
+  })
+}
+
+const computePreferences = async (
+  ctx: AppContext,
+  actorDid: string,
+): Promise<Un$Typed<Preferences>> => {
+  let res: GetNotificationPreferencesResponse
+  try {
+    res = await ctx.dataplane.getNotificationPreferences({
+      dids: [actorDid],
+    })
+  } catch (err) {
+    throw new UpstreamFailureError(
+      'cannot get current notification preferences',
+      'NotificationPreferencesFailed',
+      { cause: err },
+    )
+  }
+
+  assert(
+    res.preferences.length === 1,
+    `expected exactly one preferences entry, got ${res.preferences.length}`,
+  )
+
+  const currentPreferences = protobufToLex(res.preferences[0])
+  return currentPreferences
+}

package/src/api/app/bsky/notification/putPreferencesV2.ts

@@ -0,0 +1,62 @@
+import assert from 'node:assert'
+import { Un$Typed } from '@atproto/api'
+import { UpstreamFailureError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
+import { Preferences } from '../../../../lexicon/types/app/bsky/notification/defs'
+import { HandlerInput } from '../../../../lexicon/types/app/bsky/notification/putPreferencesV2'
+import { GetNotificationPreferencesResponse } from '../../../../proto/bsky_pb'
+import { protobufToLex } from './util'
+
+export default function (server: Server, ctx: AppContext) {
+  server.app.bsky.notification.putPreferencesV2({
+    auth: ctx.authVerifier.standard,
+    handler: async ({ auth, input }) => {
+      const actorDid = auth.credentials.iss
+      const preferences = await computePreferences(ctx, actorDid, input)
+
+      // Notification preferences are created automatically on the dataplane on signup, so we just update.
+      await ctx.stashClient.update({
+        actorDid,
+        namespace: 'app.bsky.notification.defs#preferences',
+        key: 'self',
+        payload: preferences,
+      })
+
+      return {
+        encoding: 'application/json',
+        body: {
+          preferences,
+        },
+      }
+    },
+  })
+}
+
+const computePreferences = async (
+  ctx: AppContext,
+  actorDid: string,
+  input: HandlerInput,
+): Promise<Un$Typed<Preferences>> => {
+  let res: GetNotificationPreferencesResponse
+  try {
+    res = await ctx.dataplane.getNotificationPreferences({
+      dids: [actorDid],
+    })
+  } catch (err) {
+    throw new UpstreamFailureError(
+      'cannot get current notification preferences',
+      'NotificationPreferencesFailed',
+      { cause: err },
+    )
+  }
+
+  assert(
+    res.preferences.length === 1,
+    `expected exactly one preferences entry, got ${res.preferences.length}`,
+  )
+
+  const currentPreferences = protobufToLex(res.preferences[0])
+  const preferences = { ...currentPreferences, ...input.body }
+  return preferences
+}

package/src/api/app/bsky/notification/util.ts

@@ -0,0 +1,123 @@
+import { Un$Typed } from '@atproto/api'
+import {
+  ChatPreference,
+  FilterablePreference,
+  Preference,
+  Preferences,
+} from '../../../../lexicon/types/app/bsky/notification/defs'
+import {
+  ChatNotificationFilter,
+  ChatNotificationPreference,
+  FilterableNotificationPreference,
+  NotificationFilter,
+  NotificationPreference,
+  NotificationPreferences,
+} from '../../../../proto/bsky_pb'
+
+type DeepPartial<T> = T extends object
+  ? {
+      [P in keyof T]?: DeepPartial<T[P]>
+    }
+  : T
+
+const ensureChatPreference = (
+  p?: DeepPartial<ChatPreference>,
+): ChatPreference => {
+  const filters = ['all', 'accepted']
+  return {
+    filter:
+      typeof p?.filter === 'string' && filters.includes(p.filter)
+        ? p.filter
+        : 'all',
+    push: p?.push ?? true,
+  }
+}
+
+const ensureFilterablePreference = (
+  p?: DeepPartial<FilterablePreference>,
+): FilterablePreference => {
+  const filters = ['all', 'follows']
+  return {
+    filter:
+      typeof p?.filter === 'string' && filters.includes(p.filter)
+        ? p.filter
+        : 'all',
+    list: p?.list ?? true,
+    push: p?.push ?? true,
+  }
+}
+
+const ensurePreference = (p?: DeepPartial<Preference>): Preference => {
+  return {
+    list: p?.list ?? true,
+    push: p?.push ?? true,
+  }
+}
+
+const ensurePreferences = (
+  p: DeepPartial<Preferences>,
+): Un$Typed<Preferences> => {
+  return {
+    chat: ensureChatPreference(p.chat),
+    follow: ensureFilterablePreference(p.follow),
+    like: ensureFilterablePreference(p.like),
+    likeViaRepost: ensureFilterablePreference(p.likeViaRepost),
+    mention: ensureFilterablePreference(p.mention),
+    quote: ensureFilterablePreference(p.quote),
+    reply: ensureFilterablePreference(p.reply),
+    repost: ensureFilterablePreference(p.repost),
+    repostViaRepost: ensureFilterablePreference(p.repostViaRepost),
+    starterpackJoined: ensurePreference(p.starterpackJoined),
+    subscribedPost: ensurePreference(p.subscribedPost),
+    unverified: ensurePreference(p.unverified),
+    verified: ensurePreference(p.verified),
+  }
+}
+
+const protobufChatPreferenceToLex = (
+  p?: DeepPartial<ChatNotificationPreference>,
+): DeepPartial<ChatPreference> => {
+  return {
+    filter: p?.filter === ChatNotificationFilter.ACCEPTED ? 'accepted' : 'all',
+    push: p?.push?.enabled,
+  }
+}
+
+const protobufFilterablePreferenceToLex = (
+  p?: DeepPartial<FilterableNotificationPreference>,
+): DeepPartial<FilterablePreference> => {
+  return {
+    filter: p?.filter === NotificationFilter.FOLLOWS ? 'follows' : 'all',
+    list: p?.list?.enabled,
+    push: p?.push?.enabled,
+  }
+}
+
+const protobufPreferenceToLex = (
+  p?: DeepPartial<NotificationPreference>,
+): DeepPartial<Preference> => {
+  return {
+    list: p?.list?.enabled,
+    push: p?.push?.enabled,
+  }
+}
+
+export const protobufToLex = (
+  res: DeepPartial<NotificationPreferences>,
+): Un$Typed<Preferences> => {
+  return ensurePreferences({
+    chat: protobufChatPreferenceToLex(res.chat),
+    follow: protobufFilterablePreferenceToLex(res.follow),
+    like: protobufFilterablePreferenceToLex(res.like),
+    likeViaRepost: protobufFilterablePreferenceToLex(res.likeViaRepost),
+    mention: protobufFilterablePreferenceToLex(res.mention),
+    quote: protobufFilterablePreferenceToLex(res.quote),
+    reply: protobufFilterablePreferenceToLex(res.reply),
+    repost: protobufFilterablePreferenceToLex(res.repost),
+    repostViaRepost: protobufFilterablePreferenceToLex(res.repostViaRepost),
+    starterpackJoined: protobufPreferenceToLex(res.starterpackJoined),
+    subscribedPost: protobufPreferenceToLex(res.subscribedPost),
+    unverified: protobufPreferenceToLex(res.unverified),
+    verified: protobufPreferenceToLex(res.verified),
+  })
+}

package/src/api/app/bsky/unspecced/{getPostThreadHiddenV2.ts → getPostThreadOtherV2.ts}

@@ -3,7 +3,7 @@ import { AppContext } from '../../../../context'
 import { Code, DataPlaneClient, isDataplaneError } from '../../../../data-plane'
 import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
 import { Server } from '../../../../lexicon'
-import { QueryParams } from '../../../../lexicon/types/app/bsky/unspecced/getPostThreadHiddenV2'
+import { QueryParams } from '../../../../lexicon/types/app/bsky/unspecced/getPostThreadOtherV2'
 import {
   HydrationFnInput,
   PresentationFnInput,
@@ -25,13 +25,13 @@ const BELOW = 1
 const BRANCHING_FACTOR = 0
 
 export default function (server: Server, ctx: AppContext) {
-  const getPostThreadHidden = createPipeline(
+  const getPostThreadOther = createPipeline(
     skeleton,
     hydration,
     noRules, // handled in presentation: 3p block-violating replies are turned to #blockedPost, viewer blocks turned to #notFoundPost.
     presentation,
   )
-  server.app.bsky.unspecced.getPostThreadHiddenV2({
+  server.app.bsky.unspecced.getPostThreadOtherV2({
     auth: ctx.authVerifier.optionalStandardOrRole,
     handler: async ({ params, auth, req }) => {
       const { viewer, includeTakedowns, include3pBlocks } =
@@ -46,7 +46,7 @@ export default function (server: Server, ctx: AppContext) {
 
       return {
         encoding: 'application/json',
-        body: await getPostThreadHidden({ ...params, hydrateCtx }, ctx),
+        body: await getPostThreadOther({ ...params, hydrateCtx }, ctx),
         headers: resHeaders({
           labelers: hydrateCtx.labelers,
         }),
@@ -94,7 +94,7 @@ const presentation = (
   inputs: PresentationFnInput<Context, Params, Skeleton>,
 ) => {
   const { ctx, params, skeleton, hydration } = inputs
-  const thread = ctx.views.threadHiddenV2(skeleton, hydration, {
+  const thread = ctx.views.threadOtherV2(skeleton, hydration, {
     below: BELOW,
     branchingFactor: BRANCHING_FACTOR,
     prioritizeFollowedUsers: params.prioritizeFollowedUsers,

package/src/api/app/bsky/unspecced/getPostThreadV2.ts

@@ -85,7 +85,7 @@ const presentation = (
   inputs: PresentationFnInput<Context, Params, Skeleton>,
 ) => {
   const { ctx, params, skeleton, hydration } = inputs
-  const { hasHiddenReplies, thread } = ctx.views.threadV2(skeleton, hydration, {
+  const { hasOtherReplies, thread } = ctx.views.threadV2(skeleton, hydration, {
     above: calculateAbove(ctx, params),
     below: calculateBelow(ctx, skeleton.anchor, params),
     branchingFactor: params.branchingFactor,
@@ -100,7 +100,7 @@ const presentation = (
     postUriToThreadgateUri(rootUri),
     hydration,
   )
-  return { hasHiddenReplies, thread, threadgate }
+  return { hasOtherReplies, thread, threadgate }
 }
 
 type Context = {

package/src/api/index.ts

@@ -42,14 +42,16 @@ import unmuteActor from './app/bsky/graph/unmuteActor'
 import unmuteActorList from './app/bsky/graph/unmuteActorList'
 import unmuteThread from './app/bsky/graph/unmuteThread'
 import getLabelerServices from './app/bsky/labeler/getServices'
+import getPreferences from './app/bsky/notification/getPreferences'
 import getUnreadCount from './app/bsky/notification/getUnreadCount'
 import listNotifications from './app/bsky/notification/listNotifications'
 import putPreferences from './app/bsky/notification/putPreferences'
+import putPreferencesV2 from './app/bsky/notification/putPreferencesV2'
 import registerPush from './app/bsky/notification/registerPush'
 import updateSeen from './app/bsky/notification/updateSeen'
 import getConfig from './app/bsky/unspecced/getConfig'
 import getPopularFeedGenerators from './app/bsky/unspecced/getPopularFeedGenerators'
-import getPostThreadHiddenV2 from './app/bsky/unspecced/getPostThreadHiddenV2'
+import getPostThreadOtherV2 from './app/bsky/unspecced/getPostThreadOtherV2'
 import getPostThreadV2 from './app/bsky/unspecced/getPostThreadV2'
 import getUnspeccedSuggestedFeeds from './app/bsky/unspecced/getSuggestedFeeds'
 import getSuggestedStarterPacks from './app/bsky/unspecced/getSuggestedStarterPacks'
@@ -84,7 +86,7 @@ export default function (server: Server, ctx: AppContext) {
   getListFeed(server, ctx)
   getQuotes(server, ctx)
   getPostThread(server, ctx)
-  getPostThreadHiddenV2(server, ctx)
+  getPostThreadOtherV2(server, ctx)
   getPostThreadV2(server, ctx)
   getPosts(server, ctx)
   searchPosts(server, ctx)
@@ -122,10 +124,12 @@ export default function (server: Server, ctx: AppContext) {
   searchActors(server, ctx)
   searchActorsTypeahead(server, ctx)
   getSuggestions(server, ctx)
+  getPreferences(server, ctx)
   getUnreadCount(server, ctx)
   listNotifications(server, ctx)
   updateSeen(server, ctx)
   putPreferences(server, ctx)
+  putPreferencesV2(server, ctx)
   registerPush(server, ctx)
   getConfig(server, ctx)
   getPopularFeedGenerators(server, ctx)

package/src/context.ts

@@ -13,6 +13,7 @@ import { DataPlaneClient, HostList } from './data-plane/client'
 import { FeatureGates } from './feature-gates'
 import { Hydrator } from './hydration/hydrator'
 import { httpLogger as log } from './logger'
+import { StashClient } from './stash'
 import {
   ParsedLabelers,
   defaultLabelerHeader,
@@ -35,6 +36,7 @@ export class AppContext {
       signingKey: Keypair
       idResolver: IdResolver
       bsyncClient: BsyncClient
+      stashClient: StashClient
       courierClient: CourierClient | undefined
       authVerifier: AuthVerifier
       featureGates: FeatureGates
@@ -94,6 +96,10 @@ export class AppContext {
     return this.opts.bsyncClient
   }
 
+  get stashClient(): StashClient {
+    return this.opts.stashClient
+  }
+
   get courierClient(): CourierClient | undefined {
     return this.opts.courierClient
   }

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

@@ -4,10 +4,15 @@ import http from 'node:http'
 import { ConnectRouter } from '@connectrpc/connect'
 import { expressConnectMiddleware } from '@connectrpc/connect-express'
 import express from 'express'
+import { TID } from '@atproto/common'
 import { AtUri } from '@atproto/syntax'
 import { ids } from '../../lexicon/lexicons'
 import { Service } from '../../proto/bsync_connect'
-import { MuteOperation_Type } from '../../proto/bsync_pb'
+import {
+  Method,
+  MuteOperation_Type,
+  PutOperationRequest,
+} from '../../proto/bsync_pb'
 import { Database } from '../server/db'
 
 export class MockBsync {
@@ -138,7 +143,110 @@ const createRoutes = (db: Database) => (router: ConnectRouter) =>
       throw new Error('not implemented')
     },
 
+    async putOperation(req) {
+      const { actorDid, namespace, key, method, payload } = req
+      if (
+        method !== Method.CREATE &&
+        method !== Method.UPDATE &&
+        method !== Method.DELETE
+      ) {
+        throw new Error(`Unsupported method: ${method}`)
+      }
+
+      const now = new Date().toISOString()
+      if (namespace === 'app.bsky.notification.defs#preferences') {
+        await handleNotificationPreferencesOperation(db, req, now)
+      } else {
+        await handleGenericOperation(db, req, now)
+      }
+
+      return {
+        operation: {
+          id: TID.nextStr(),
+          actorDid,
+          namespace,
+          key,
+          method,
+          payload,
+        },
+      }
+    },
+
+    async scanOperations() {
+      throw new Error('not implemented')
+    },
+
     async ping() {
       return {}
     },
   })
+
+const handleNotificationPreferencesOperation = async (
+  db: Database,
+  req: PutOperationRequest,
+  now: string,
+) => {
+  const { actorDid, namespace, key, method, payload } = req
+  if (method === Method.CREATE || method === Method.UPDATE) {
+    return db.db
+      .insertInto('private_data')
+      .values({
+        actorDid,
+        namespace,
+        key,
+        payload: Buffer.from(payload).toString('utf8'),
+        indexedAt: now,
+        updatedAt: now,
+      })
+      .onConflict((oc) =>
+        oc.columns(['actorDid', 'namespace', 'key']).doUpdateSet({
+          payload: Buffer.from(payload).toString('utf8'),
+          updatedAt: now,
+        }),
+      )
+      .execute()
+  }
+
+  return handleGenericOperation(db, req, now)
+}
+
+const handleGenericOperation = async (
+  db: Database,
+  req: PutOperationRequest,
+  now: string,
+) => {
+  const { actorDid, namespace, key, method, payload } = req
+  if (method === Method.CREATE) {
+    return db.db
+      .insertInto('private_data')
+      .values({
+        actorDid,
+        namespace,
+        key,
+        payload: Buffer.from(payload).toString('utf8'),
+        indexedAt: now,
+        updatedAt: now,
+      })
+      .execute()
+  }
+
+  if (method === Method.UPDATE) {
+    return db.db
+      .updateTable('private_data')
+      .where('actorDid', '=', actorDid)
+      .where('namespace', '=', namespace)
+      .where('key', '=', key)
+      .set({
+        payload: Buffer.from(payload).toString('utf8'),
+        updatedAt: now,
+      })
+      .execute()
+  }
+
+  return db.db
+    .deleteFrom('private_data')
+    .where('actorDid', '=', actorDid)
+    .where('namespace', '=', namespace)
+    .where('key', '=', key)
+    .execute()
+}

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

@@ -24,6 +24,7 @@ import * as post from './tables/post'
 import * as postAgg from './tables/post-agg'
 import * as postEmbed from './tables/post-embed'
 import * as postgate from './tables/post-gate'
+import * as privateData from './tables/private-data'
 import * as profile from './tables/profile'
 import * as profileAgg from './tables/profile-agg'
 import * as quote from './tables/quote'
@@ -77,6 +78,7 @@ export type DatabaseSchemaType = duplicateRecord.PartialDB &
   starterPack.PartialDB &
   taggedSuggestion.PartialDB &
   quote.PartialDB &
-  verification.PartialDB
+  verification.PartialDB &
+  privateData.PartialDB
 
 export type DatabaseSchema = Kysely<DatabaseSchemaType>

package/src/data-plane/server/db/migrations/20250602T190357447Z-add-private-data.ts

@@ -0,0 +1,22 @@
+import { Kysely } from 'kysely'
+
+export async function up(db: Kysely<unknown>): Promise<void> {
+  await db.schema
+    .createTable('private_data')
+    .addColumn('actorDid', 'varchar', (col) => col.notNull())
+    .addColumn('namespace', 'varchar', (col) => col.notNull())
+    .addColumn('key', 'varchar', (col) => col.notNull())
+    .addColumn('payload', 'text', (col) => col.notNull())
+    .addColumn('indexedAt', 'varchar', (col) => col.notNull())
+    .addColumn('updatedAt', 'varchar', (col) => col.notNull())
+    .addPrimaryKeyConstraint('private_data_pkey', [
+      'actorDid',
+      'namespace',
+      'key',
+    ])
+    .execute()
+}
+
+export async function down(db: Kysely<unknown>): Promise<void> {
+  await db.schema.dropTable('private_data').execute()
+}

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

@@ -50,3 +50,4 @@ export * as _20250207T174822012Z from './20250207T174822012Z-add-label-exp'
 export * as _20250404T163421487Z from './20250404T163421487Z-verifications'
 export * as _20250526T023712742Z from './20250526T023712742Z-like-repost-via'
 export * as _20250528T221913281Z from './20250528T221913281Z-add-record-tags'
+export * as _20250602T190357447Z from './20250602T190357447Z-add-private-data'

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

@@ -0,0 +1,13 @@
+export interface PrivateData {
+  actorDid: string
+  namespace: string
+  key: string
+  // JSON-encoded
+  payload: string
+  indexedAt: string
+  updatedAt: string
+}
+
+export const tableName = 'private_data'
+
+export type PartialDB = { [tableName]: PrivateData }

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

@@ -14,6 +14,7 @@ import lists from './lists'
 import moderation from './moderation'
 import mutes from './mutes'
 import notifs from './notifs'
+import privateData from './private-data'
 import profile from './profile'
 import quotes from './quotes'
 import records from './records'
@@ -40,6 +41,7 @@ export default (db: Database, idResolver: IdResolver) =>
       ...moderation(db),
       ...mutes(db),
       ...notifs(db),
+      ...privateData(db),
       ...profile(db),
       ...quotes(db),
       ...records(db),