@atproto/bsky 0.0.68 → 0.0.69

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

@@ -3,13 +3,20 @@ import { ServiceImpl } from '@connectrpc/connect'
 import { Timestamp } from '@bufbuild/protobuf'
 import { Service } from '../../../proto/bsky_connect'
 import { Database } from '../db'
-import { countAll, excluded, notSoftDeletedClause } from '../db/util'
+import { countAll, notSoftDeletedClause } from '../db/util'
 import { TimeCidKeyset, paginate } from '../db/pagination'
 
 export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
   async getNotifications(req) {
-    const { actorDid, limit, cursor } = req
+    const { actorDid, limit, cursor, priority } = req
     const { ref } = db.db.dynamic
+    const priorityFollowQb = db.db
+      .selectFrom('follow')
+      .select(sql<boolean>`${true}`.as('val'))
+      .where('creator', '=', actorDid)
+      .whereRef('subjectDid', '=', ref('notif.author'))
+      .limit(1)
+
     let builder = db.db
       .selectFrom('notification as notif')
       .where('notif.did', '=', actorDid)
@@ -23,6 +30,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
               .whereRef('subject.uri', '=', ref('notif.reasonSubject')),
           ),
       )
+      .if(priority, (qb) => qb.whereExists(priorityFollowQb))
       .select([
         'notif.author as authorDid',
         'notif.recordUri as uri',
@@ -31,6 +39,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
         'notif.reasonSubject as reasonSubject',
         'notif.sortAt as sortAt',
       ])
+      .select(priorityFollowQb.as('priority'))
 
     const keyset = new TimeCidKeyset(
       ref('notif.sortAt'),
@@ -50,6 +59,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       reason: notif.reason,
       reasonSubject: notif.reasonSubject ?? undefined,
       timestamp: Timestamp.fromDate(new Date(notif.sortAt)),
+      priority: notif.priority ?? false,
     }))
     return {
       notifications,
@@ -58,22 +68,37 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
   },
 
   async getNotificationSeen(req) {
+    const { actorDid, priority } = req
     const res = await db.db
       .selectFrom('actor_state')
-      .where('did', '=', req.actorDid)
+      .where('did', '=', actorDid)
       .selectAll()
       .executeTakeFirst()
     if (!res) {
       return {}
     }
+    const lastSeen =
+      priority && res.lastSeenPriorityNotifs
+        ? res.lastSeenPriorityNotifs
+        : res.lastSeenNotifs
     return {
-      timestamp: Timestamp.fromDate(new Date(res.lastSeenNotifs)),
+      timestamp: Timestamp.fromDate(new Date(lastSeen)),
     }
   },
 
   async getUnreadNotificationCount(req) {
-    const { actorDid } = req
+    const { actorDid, priority } = req
     const { ref } = db.db.dynamic
+    const lastSeenRes = await db.db
+      .selectFrom('actor_state')
+      .where('did', '=', actorDid)
+      .selectAll()
+      .executeTakeFirst()
+    const lastSeen =
+      priority && lastSeenRes?.lastSeenPriorityNotifs
+        ? lastSeenRes.lastSeenPriorityNotifs
+        : lastSeenRes?.lastSeenNotifs
+
     const result = await db.db
       .selectFrom('notification')
       .select(countAll.as('count'))
@@ -84,10 +109,15 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       .where(notSoftDeletedClause(ref('actor')))
       // Ensure to hit notification_did_sortat_idx, handling case where lastSeenNotifs is null.
       .where('notification.did', '=', actorDid)
-      .where(
-        'notification.sortAt',
-        '>',
-        sql`coalesce(${ref('actor_state.lastSeenNotifs')}, ${''})`,
+      .where('notification.sortAt', '>', lastSeen ?? '')
+      .if(priority, (qb) =>
+        qb.whereExists(
+          db.db
+            .selectFrom('follow')
+            .select(sql<boolean>`${true}`.as('val'))
+            .where('creator', '=', actorDid)
+            .whereRef('subjectDid', '=', ref('notif.author')),
+        ),
       )
       .executeTakeFirst()
 
@@ -97,19 +127,33 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
   },
 
   async updateNotificationSeen(req) {
-    const { actorDid, timestamp } = req
+    const { actorDid, timestamp, priority } = req
     if (!timestamp) {
       return
     }
-    const lastSeenNotifs = timestamp.toDate().toISOString()
+    const timestampIso = timestamp.toDate().toISOString()
+    let builder = db.db
+      .updateTable('actor_state')
+      .where('did', '=', actorDid)
+      .returningAll()
+    if (priority) {
+      builder = builder.set({ lastSeenPriorityNotifs: timestampIso })
+    } else {
+      builder = builder.set({ lastSeenNotifs: timestampIso })
+    }
+    const updateRes = await builder.executeTakeFirst()
+    if (updateRes) {
+      return
+    }
     await db.db
       .insertInto('actor_state')
-      .values({ did: actorDid, lastSeenNotifs })
-      .onConflict((oc) =>
-        oc.column('did').doUpdateSet({
-          lastSeenNotifs: excluded(db.db, 'lastSeenNotifs'),
-        }),
-      )
+      .values({
+        did: actorDid,
+        lastSeenNotifs: timestampIso,
+        priorityNotifs: priority,
+        lastSeenPriorityNotifs: priority ? timestampIso : undefined,
+      })
+      .onConflict((oc) => oc.doNothing())
       .executeTakeFirst()
   },
 })

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

@@ -22,8 +22,10 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
     const [handlesRes, profiles, chatDeclarations] = await Promise.all([
       db.db
         .selectFrom('actor')
-        .where('did', 'in', dids)
+        .leftJoin('actor_state', 'actor_state.did', 'actor.did')
+        .where('actor.did', 'in', dids)
         .selectAll('actor')
+        .select('actor_state.priorityNotifs')
         .select([
           db.db
             .selectFrom('labeler')
@@ -55,6 +57,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
             : undefined,
         upstreamStatus: row?.upstreamStatus ?? '',
         createdAt: profiles.records[i].createdAt, // @NOTE profile creation date not trusted in production
+        priorityNotifications: row?.priorityNotifs ?? false,
       }
     })
     return { actors }

package/src/hydration/actor.ts

@@ -1,4 +1,3 @@
-import { Timestamp } from '@bufbuild/protobuf'
 import { DataPlaneClient } from '../data-plane/client'
 import { Record as ProfileRecord } from '../lexicon/types/app/bsky/actor/profile'
 import { Record as ChatDeclarationRecord } from '../lexicon/types/chat/bsky/actor/declaration'
@@ -23,6 +22,7 @@ export type Actor = {
   allowIncomingChatsFrom?: string
   upstreamStatus?: string
   createdAt?: Date
+  priorityNotifications: boolean
 }
 
 export type Actors = HydrationMap<Actor>
@@ -131,6 +131,7 @@ export class ActorHydrator {
         allowIncomingChatsFrom: actor.allowIncomingChatsFrom || undefined,
         upstreamStatus: actor.upstreamStatus || undefined,
         createdAt: actor.createdAt?.toDate(),
+        priorityNotifications: actor.priorityNotifications,
       })
     }, new HydrationMap<Actor>())
   }

package/src/hydration/hydrator.ts

@@ -59,12 +59,12 @@ import {
   FeedItem,
 } from './feed'
 import { ParsedLabelers } from '../util'
-import starterPack from '../data-plane/server/indexing/plugins/starter-pack'
 
 export class HydrateCtx {
   labelers = this.vals.labelers
   viewer = this.vals.viewer !== null ? serviceRefToDid(this.vals.viewer) : null
   includeTakedowns = this.vals.includeTakedowns
+  include3pBlocks = this.vals.include3pBlocks
   constructor(private vals: HydrateCtxVals) {}
   copy<V extends Partial<HydrateCtxVals>>(vals?: V): HydrateCtx & V {
     return new HydrateCtx({ ...this.vals, ...vals }) as HydrateCtx & V
@@ -75,6 +75,7 @@ export type HydrateCtxVals = {
   labelers: ParsedLabelers
   viewer: string | null
   includeTakedowns?: boolean
+  include3pBlocks?: boolean
 }
 
 export type HydrationState = {
@@ -914,6 +915,7 @@ export class Hydrator {
       labelers: availableLabelers,
       viewer: vals.viewer,
       includeTakedowns: vals.includeTakedowns,
+      include3pBlocks: vals.include3pBlocks,
     })
   }
 

package/src/lexicon/index.ts

@@ -130,6 +130,7 @@ import * as AppBskyGraphUnmuteThread from './types/app/bsky/graph/unmuteThread'
 import * as AppBskyLabelerGetServices from './types/app/bsky/labeler/getServices'
 import * as AppBskyNotificationGetUnreadCount from './types/app/bsky/notification/getUnreadCount'
 import * as AppBskyNotificationListNotifications from './types/app/bsky/notification/listNotifications'
+import * as AppBskyNotificationPutPreferences from './types/app/bsky/notification/putPreferences'
 import * as AppBskyNotificationRegisterPush from './types/app/bsky/notification/registerPush'
 import * as AppBskyNotificationUpdateSeen from './types/app/bsky/notification/updateSeen'
 import * as AppBskyUnspeccedGetPopularFeedGenerators from './types/app/bsky/unspecced/getPopularFeedGenerators'
@@ -1716,6 +1717,17 @@ export class AppBskyNotificationNS {
     return this._server.xrpc.method(nsid, cfg)
   }
 
+  putPreferences<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      AppBskyNotificationPutPreferences.Handler<ExtractAuth<AV>>,
+      AppBskyNotificationPutPreferences.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'app.bsky.notification.putPreferences' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
   registerPush<AV extends AuthVerifier>(
     cfg: ConfigOf<
       AV,

package/src/lexicon/lexicons.ts

@@ -8341,6 +8341,9 @@ export const schemaDict = {
         parameters: {
           type: 'params',
           properties: {
+            priority: {
+              type: 'boolean',
+            },
             seenAt: {
               type: 'string',
               format: 'datetime',
@@ -8379,6 +8382,9 @@ export const schemaDict = {
               maximum: 100,
               default: 50,
             },
+            priority: {
+              type: 'boolean',
+            },
             cursor: {
               type: 'string',
             },
@@ -8404,6 +8410,9 @@ export const schemaDict = {
                   ref: 'lex:app.bsky.notification.listNotifications#notification',
                 },
               },
+              priority: {
+                type: 'boolean',
+              },
               seenAt: {
                 type: 'string',
                 format: 'datetime',
@@ -8475,6 +8484,29 @@ export const schemaDict = {
       },
     },
   },
+  AppBskyNotificationPutPreferences: {
+    lexicon: 1,
+    id: 'app.bsky.notification.putPreferences',
+    defs: {
+      main: {
+        type: 'procedure',
+        description:
+          'Set notification-related preferences for an account. Requires auth.',
+        input: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['priority'],
+            properties: {
+              priority: {
+                type: 'boolean',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
   AppBskyNotificationRegisterPush: {
     lexicon: 1,
     id: 'app.bsky.notification.registerPush',
@@ -10051,6 +10083,7 @@ export const ids = {
   AppBskyNotificationGetUnreadCount: 'app.bsky.notification.getUnreadCount',
   AppBskyNotificationListNotifications:
     'app.bsky.notification.listNotifications',
+  AppBskyNotificationPutPreferences: 'app.bsky.notification.putPreferences',
   AppBskyNotificationRegisterPush: 'app.bsky.notification.registerPush',
   AppBskyNotificationUpdateSeen: 'app.bsky.notification.updateSeen',
   AppBskyRichtextFacet: 'app.bsky.richtext.facet',

package/src/lexicon/types/app/bsky/notification/getUnreadCount.ts

@@ -9,6 +9,7 @@ import { CID } from 'multiformats/cid'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
 export interface QueryParams {
+  priority?: boolean
   seenAt?: string
 }
 

package/src/lexicon/types/app/bsky/notification/listNotifications.ts

@@ -12,6 +12,7 @@ import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
 export interface QueryParams {
   limit: number
+  priority?: boolean
   cursor?: string
   seenAt?: string
 }
@@ -21,6 +22,7 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   notifications: Notification[]
+  priority?: boolean
   seenAt?: string
   [k: string]: unknown
 }

package/src/lexicon/types/app/bsky/notification/putPreferences.ts

@@ -0,0 +1,38 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { lexicons } from '../../../../lexicons'
+import { isObj, hasProp } from '../../../../util'
+import { CID } from 'multiformats/cid'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+
+export interface QueryParams {}
+
+export interface InputSchema {
+  priority: boolean
+  [k: string]: unknown
+}
+
+export interface HandlerInput {
+  encoding: 'application/json'
+  body: InputSchema
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+}
+
+export type HandlerOutput = HandlerError | void
+export type HandlerReqCtx<HA extends HandlerAuth = never> = {
+  auth: HA
+  params: QueryParams
+  input: HandlerInput
+  req: express.Request
+  res: express.Response
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput

package/src/proto/bsky_pb.ts

@@ -4139,6 +4139,11 @@ export class ActorInfo extends Message<ActorInfo> {
    */
   createdAt?: Timestamp
 
+  /**
+   * @generated from field: bool priority_notifications = 11;
+   */
+  priorityNotifications = false
+
   constructor(data?: PartialMessage<ActorInfo>) {
     super()
     proto3.util.initPartial(data, this)
@@ -4172,6 +4177,12 @@ export class ActorInfo extends Message<ActorInfo> {
       T: 9 /* ScalarType.STRING */,
     },
     { no: 10, name: 'created_at', kind: 'message', T: Timestamp },
+    {
+      no: 11,
+      name: 'priority_notifications',
+      kind: 'scalar',
+      T: 8 /* ScalarType.BOOL */,
+    },
   ])
 
   static fromBinary(
@@ -6884,6 +6895,11 @@ export class GetNotificationsRequest extends Message<GetNotificationsRequest> {
    */
   cursor = ''
 
+  /**
+   * @generated from field: bool priority = 4;
+   */
+  priority = false
+
   constructor(data?: PartialMessage<GetNotificationsRequest>) {
     super()
     proto3.util.initPartial(data, this)
@@ -6895,6 +6911,7 @@ export class GetNotificationsRequest extends Message<GetNotificationsRequest> {
     { no: 1, name: 'actor_did', kind: 'scalar', T: 9 /* ScalarType.STRING */ },
     { no: 2, name: 'limit', kind: 'scalar', T: 5 /* ScalarType.INT32 */ },
     { no: 3, name: 'cursor', kind: 'scalar', T: 9 /* ScalarType.STRING */ },
+    { no: 4, name: 'priority', kind: 'scalar', T: 8 /* ScalarType.BOOL */ },
   ])
 
   static fromBinary(
@@ -6961,6 +6978,11 @@ export class Notification extends Message<Notification> {
    */
   timestamp?: Timestamp
 
+  /**
+   * @generated from field: bool priority = 6;
+   */
+  priority = false
+
   constructor(data?: PartialMessage<Notification>) {
     super()
     proto3.util.initPartial(data, this)
@@ -6984,6 +7006,7 @@ export class Notification extends Message<Notification> {
       T: 9 /* ScalarType.STRING */,
     },
     { no: 5, name: 'timestamp', kind: 'message', T: Timestamp },
+    { no: 6, name: 'priority', kind: 'scalar', T: 8 /* ScalarType.BOOL */ },
   ])
 
   static fromBinary(
@@ -7099,6 +7122,11 @@ export class UpdateNotificationSeenRequest extends Message<UpdateNotificationSee
    */
   timestamp?: Timestamp
 
+  /**
+   * @generated from field: bool priority = 3;
+   */
+  priority = false
+
   constructor(data?: PartialMessage<UpdateNotificationSeenRequest>) {
     super()
     proto3.util.initPartial(data, this)
@@ -7109,6 +7137,7 @@ export class UpdateNotificationSeenRequest extends Message<UpdateNotificationSee
   static readonly fields: FieldList = proto3.util.newFieldList(() => [
     { no: 1, name: 'actor_did', kind: 'scalar', T: 9 /* ScalarType.STRING */ },
     { no: 2, name: 'timestamp', kind: 'message', T: Timestamp },
+    { no: 3, name: 'priority', kind: 'scalar', T: 8 /* ScalarType.BOOL */ },
   ])
 
   static fromBinary(
@@ -7212,6 +7241,11 @@ export class GetNotificationSeenRequest extends Message<GetNotificationSeenReque
    */
   actorDid = ''
 
+  /**
+   * @generated from field: bool priority = 2;
+   */
+  priority = false
+
   constructor(data?: PartialMessage<GetNotificationSeenRequest>) {
     super()
     proto3.util.initPartial(data, this)
@@ -7221,6 +7255,7 @@ export class GetNotificationSeenRequest extends Message<GetNotificationSeenReque
   static readonly typeName = 'bsky.GetNotificationSeenRequest'
   static readonly fields: FieldList = proto3.util.newFieldList(() => [
     { no: 1, name: 'actor_did', kind: 'scalar', T: 9 /* ScalarType.STRING */ },
+    { no: 2, name: 'priority', kind: 'scalar', T: 8 /* ScalarType.BOOL */ },
   ])
 
   static fromBinary(
@@ -7325,6 +7360,11 @@ export class GetUnreadNotificationCountRequest extends Message<GetUnreadNotifica
    */
   actorDid = ''
 
+  /**
+   * @generated from field: bool priority = 2;
+   */
+  priority = false
+
   constructor(data?: PartialMessage<GetUnreadNotificationCountRequest>) {
     super()
     proto3.util.initPartial(data, this)
@@ -7334,6 +7374,7 @@ export class GetUnreadNotificationCountRequest extends Message<GetUnreadNotifica
   static readonly typeName = 'bsky.GetUnreadNotificationCountRequest'
   static readonly fields: FieldList = proto3.util.newFieldList(() => [
     { no: 1, name: 'actor_did', kind: 'scalar', T: 9 /* ScalarType.STRING */ },
+    { no: 2, name: 'priority', kind: 'scalar', T: 8 /* ScalarType.BOOL */ },
   ])
 
   static fromBinary(

package/src/proto/bsync_connect.ts

@@ -6,10 +6,14 @@
 import {
   AddMuteOperationRequest,
   AddMuteOperationResponse,
+  AddNotifOperationRequest,
+  AddNotifOperationResponse,
   PingRequest,
   PingResponse,
   ScanMuteOperationsRequest,
   ScanMuteOperationsResponse,
+  ScanNotifOperationsRequest,
+  ScanNotifOperationsResponse,
 } from './bsync_pb'
 import { MethodKind } from '@bufbuild/protobuf'
 
@@ -39,6 +43,24 @@ export const Service = {
       O: ScanMuteOperationsResponse,
       kind: MethodKind.Unary,
     },
+    /**
+     * @generated from rpc bsync.Service.AddNotifOperation
+     */
+    addNotifOperation: {
+      name: 'AddNotifOperation',
+      I: AddNotifOperationRequest,
+      O: AddNotifOperationResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * @generated from rpc bsync.Service.ScanNotifOperations
+     */
+    scanNotifOperations: {
+      name: 'ScanNotifOperations',
+      I: ScanNotifOperationsRequest,
+      O: ScanNotifOperationsResponse,
+      kind: MethodKind.Unary,
+    },
     /**
      * Ping
      *