@atproto/bsky 0.0.96 → 0.0.98

package/dist/lexicon/types/app/bsky/notification/listNotifications.d.ts

@@ -7,6 +7,8 @@ import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server';
 import * as AppBskyActorDefs from '../actor/defs';
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs';
 export interface QueryParams {
+    /** Notification reasons to include in response. */
+    reasons?: string[];
     limit: number;
     priority?: boolean;
     cursor?: string;

package/dist/lexicon/types/app/bsky/notification/listNotifications.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"listNotifications.d.ts","sourceRoot":"","sources":["../../../../../../src/lexicon/types/app/bsky/notification/listNotifications.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,OAAO,MAAM,SAAS,CAAA;AAC7B,OAAO,EAAE,gBAAgB,EAAW,MAAM,kBAAkB,CAAA;AAI5D,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACtE,OAAO,KAAK,gBAAgB,MAAM,eAAe,CAAA;AACjD,OAAO,KAAK,mBAAmB,MAAM,iCAAiC,CAAA;AAEtE,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,MAAM,WAAW,GAAG,SAAS,CAAA;AAEnC,MAAM,WAAW,YAAY;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,aAAa,EAAE,YAAY,EAAE,CAAA;IAC7B,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;CACrB;AAED,MAAM,MAAM,YAAY,GAAG,SAAS,CAAA;AAEpC,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,kBAAkB,CAAA;IAC5B,IAAI,EAAE,YAAY,CAAA;IAClB,OAAO,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;CACpC;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,MAAM,aAAa,GAAG,YAAY,GAAG,cAAc,GAAG,kBAAkB,CAAA;AAC9E,MAAM,MAAM,aAAa,CAAC,EAAE,SAAS,WAAW,GAAG,KAAK,IAAI;IAC1D,IAAI,EAAE,EAAE,CAAA;IACR,MAAM,EAAE,WAAW,CAAA;IACnB,KAAK,EAAE,YAAY,CAAA;IACnB,GAAG,EAAE,OAAO,CAAC,OAAO,CAAA;IACpB,GAAG,EAAE,OAAO,CAAC,QAAQ,CAAA;CACtB,CAAA;AACD,MAAM,MAAM,OAAO,CAAC,EAAE,SAAS,WAAW,GAAG,KAAK,IAAI,CACpD,GAAG,EAAE,aAAa,CAAC,EAAE,CAAC,KACnB,OAAO,CAAC,aAAa,CAAC,GAAG,aAAa,CAAA;AAE3C,MAAM,WAAW,YAAY;IAC3B,GAAG,EAAE,MAAM,CAAA;IACX,GAAG,EAAE,MAAM,CAAA;IACX,MAAM,EAAE,gBAAgB,CAAC,WAAW,CAAA;IACpC,6GAA6G;IAC7G,MAAM,EACF,MAAM,GACN,QAAQ,GACR,QAAQ,GACR,SAAS,GACT,OAAO,GACP,OAAO,GACP,oBAAoB,GACpB,CAAC,MAAM,GAAG,EAAE,CAAC,CAAA;IACjB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,MAAM,EAAE,EAAE,CAAA;IACV,MAAM,EAAE,OAAO,CAAA;IACf,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,CAAC,EAAE,mBAAmB,CAAC,KAAK,EAAE,CAAA;IACpC,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;CACrB;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,OAAO,GAAG,CAAC,IAAI,YAAY,CAM5D;AAED,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,OAAO,GAAG,gBAAgB,CAKjE"}
+{"version":3,"file":"listNotifications.d.ts","sourceRoot":"","sources":["../../../../../../src/lexicon/types/app/bsky/notification/listNotifications.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,OAAO,MAAM,SAAS,CAAA;AAC7B,OAAO,EAAE,gBAAgB,EAAW,MAAM,kBAAkB,CAAA;AAI5D,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACtE,OAAO,KAAK,gBAAgB,MAAM,eAAe,CAAA;AACjD,OAAO,KAAK,mBAAmB,MAAM,iCAAiC,CAAA;AAEtE,MAAM,WAAW,WAAW;IAC1B,mDAAmD;IACnD,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,MAAM,WAAW,GAAG,SAAS,CAAA;AAEnC,MAAM,WAAW,YAAY;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,aAAa,EAAE,YAAY,EAAE,CAAA;IAC7B,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;CACrB;AAED,MAAM,MAAM,YAAY,GAAG,SAAS,CAAA;AAEpC,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,kBAAkB,CAAA;IAC5B,IAAI,EAAE,YAAY,CAAA;IAClB,OAAO,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;CACpC;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,MAAM,aAAa,GAAG,YAAY,GAAG,cAAc,GAAG,kBAAkB,CAAA;AAC9E,MAAM,MAAM,aAAa,CAAC,EAAE,SAAS,WAAW,GAAG,KAAK,IAAI;IAC1D,IAAI,EAAE,EAAE,CAAA;IACR,MAAM,EAAE,WAAW,CAAA;IACnB,KAAK,EAAE,YAAY,CAAA;IACnB,GAAG,EAAE,OAAO,CAAC,OAAO,CAAA;IACpB,GAAG,EAAE,OAAO,CAAC,QAAQ,CAAA;CACtB,CAAA;AACD,MAAM,MAAM,OAAO,CAAC,EAAE,SAAS,WAAW,GAAG,KAAK,IAAI,CACpD,GAAG,EAAE,aAAa,CAAC,EAAE,CAAC,KACnB,OAAO,CAAC,aAAa,CAAC,GAAG,aAAa,CAAA;AAE3C,MAAM,WAAW,YAAY;IAC3B,GAAG,EAAE,MAAM,CAAA;IACX,GAAG,EAAE,MAAM,CAAA;IACX,MAAM,EAAE,gBAAgB,CAAC,WAAW,CAAA;IACpC,6GAA6G;IAC7G,MAAM,EACF,MAAM,GACN,QAAQ,GACR,QAAQ,GACR,SAAS,GACT,OAAO,GACP,OAAO,GACP,oBAAoB,GACpB,CAAC,MAAM,GAAG,EAAE,CAAC,CAAA;IACjB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,MAAM,EAAE,EAAE,CAAA;IACV,MAAM,EAAE,OAAO,CAAA;IACf,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,CAAC,EAAE,mBAAmB,CAAC,KAAK,EAAE,CAAA;IACpC,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;CACrB;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,OAAO,GAAG,CAAC,IAAI,YAAY,CAM5D;AAED,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,OAAO,GAAG,gBAAgB,CAKjE"}

package/dist/lexicon/types/app/bsky/notification/listNotifications.js.map

@@ -1 +1 @@
-{"version":3,"file":"listNotifications.js","sourceRoot":"","sources":["../../../../../../src/lexicon/types/app/bsky/notification/listNotifications.ts"],"names":[],"mappings":";;AA4EA,wCAMC;AAED,oDAKC;AApFD,mDAA+C;AAC/C,2CAAiD;AAsEjD,SAAgB,cAAc,CAAC,CAAU;IACvC,OAAO,CACL,IAAA,YAAK,EAAC,CAAC,CAAC;QACR,IAAA,cAAO,EAAC,CAAC,EAAE,OAAO,CAAC;QACnB,CAAC,CAAC,KAAK,KAAK,sDAAsD,CACnE,CAAA;AACH,CAAC;AAED,SAAgB,oBAAoB,CAAC,CAAU;IAC7C,OAAO,mBAAQ,CAAC,QAAQ,CACtB,sDAAsD,EACtD,CAAC,CACF,CAAA;AACH,CAAC"}
+{"version":3,"file":"listNotifications.js","sourceRoot":"","sources":["../../../../../../src/lexicon/types/app/bsky/notification/listNotifications.ts"],"names":[],"mappings":";;AA8EA,wCAMC;AAED,oDAKC;AAtFD,mDAA+C;AAC/C,2CAAiD;AAwEjD,SAAgB,cAAc,CAAC,CAAU;IACvC,OAAO,CACL,IAAA,YAAK,EAAC,CAAC,CAAC;QACR,IAAA,cAAO,EAAC,CAAC,EAAE,OAAO,CAAC;QACnB,CAAC,CAAC,KAAK,KAAK,sDAAsD,CACnE,CAAA;AACH,CAAC;AAED,SAAgB,oBAAoB,CAAC,CAAU;IAC7C,OAAO,mBAAQ,CAAC,QAAQ,CACtB,sDAAsD,EACtD,CAAC,CACF,CAAA;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.96",
+  "version": "0.0.98",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
@@ -42,15 +42,15 @@
     "structured-headers": "^1.0.1",
     "typed-emitter": "^2.1.0",
     "uint8arrays": "3.0.0",
-    "@atproto/api": "^0.13.18",
-    "@atproto/common": "^0.4.4",
+    "@atproto/api": "^0.13.20",
+    "@atproto/common": "^0.4.5",
     "@atproto/crypto": "^0.4.2",
     "@atproto/identity": "^0.4.3",
-    "@atproto/lexicon": "^0.4.3",
-    "@atproto/repo": "^0.5.5",
-    "@atproto/sync": "^0.1.6",
+    "@atproto/lexicon": "^0.4.4",
+    "@atproto/repo": "^0.6.0",
+    "@atproto/sync": "^0.1.7",
     "@atproto/syntax": "^0.3.1",
-    "@atproto/xrpc-server": "^0.7.3"
+    "@atproto/xrpc-server": "^0.7.4"
   },
   "devDependencies": {
     "@bufbuild/buf": "^1.28.1",
@@ -66,10 +66,10 @@
     "jest": "^28.1.2",
     "ts-node": "^10.8.2",
     "typescript": "^5.6.3",
-    "@atproto/api": "^0.13.18",
-    "@atproto/lex-cli": "^0.5.2",
-    "@atproto/pds": "^0.4.73",
-    "@atproto/xrpc": "^0.6.4"
+    "@atproto/api": "^0.13.20",
+    "@atproto/lex-cli": "^0.5.3",
+    "@atproto/pds": "^0.4.76",
+    "@atproto/xrpc": "^0.6.5"
   },
   "scripts": {
     "codegen": "lex gen-server --yes ./src/lexicon ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/* ../../lexicons/chat/bsky/*/*",

package/src/api/app/bsky/actor/getProfile.ts

@@ -60,7 +60,9 @@ const hydration = async (input: {
   const { ctx, params, skeleton } = input
   return ctx.hydrator.hydrateProfilesDetailed(
     [skeleton.did],
-    params.hydrateCtx.copy({ includeTakedowns: true }),
+    params.hydrateCtx.copy({
+      includeActorTakedowns: true,
+    }),
   )
 }
 

package/src/api/app/bsky/actor/getProfiles.ts

@@ -25,9 +25,13 @@ export default function (server: Server, ctx: AppContext) {
       },
     }),
     handler: async ({ auth, params, req }) => {
-      const viewer = auth.credentials.iss
+      const { viewer, includeTakedowns } = ctx.authVerifier.parseCreds(auth)
       const labelers = ctx.reqLabelers(req)
-      const hydrateCtx = await ctx.hydrator.createContext({ viewer, labelers })
+      const hydrateCtx = await ctx.hydrator.createContext({
+        viewer,
+        labelers,
+        includeTakedowns,
+      })
 
       const result = await getProfile({ ...params, hydrateCtx }, ctx)
 

package/src/api/app/bsky/feed/getLikes.ts

@@ -3,11 +3,12 @@ import { normalizeDatetimeAlways } from '@atproto/syntax'
 import { Server } from '../../../../lexicon'
 import { QueryParams } from '../../../../lexicon/types/app/bsky/feed/getLikes'
 import AppContext from '../../../../context'
-import { createPipeline } from '../../../../pipeline'
+import { createPipeline, RulesFnInput } from '../../../../pipeline'
 import {
   HydrateCtx,
   HydrationState,
   Hydrator,
+  mergeStates,
 } from '../../../../hydration/hydrator'
 import { Views } from '../../../../views'
 import { parseString } from '../../../../hydration/util'
@@ -43,8 +44,10 @@ const skeleton = async (inputs: {
   params: Params
 }): Promise<Skeleton> => {
   const { ctx, params } = inputs
+  const authorDid = creatorFromUri(params.uri)
+
   if (clearlyBadCursor(params.cursor)) {
-    return { likes: [] }
+    return { authorDid, likes: [] }
   }
   if (looksLikeNonSortedCursor(params.cursor)) {
     throw new InvalidRequestError(
@@ -57,6 +60,7 @@ const skeleton = async (inputs: {
     limit: params.limit,
   })
   return {
+    authorDid,
     likes: likesRes.uris,
     cursor: parseString(likesRes.cursor),
   }
@@ -68,18 +72,25 @@ const hydration = async (inputs: {
   skeleton: Skeleton
 }) => {
   const { ctx, params, skeleton } = inputs
-  return await ctx.hydrator.hydrateLikes(skeleton.likes, params.hydrateCtx)
+  const likesState = await ctx.hydrator.hydrateLikes(
+    skeleton.authorDid,
+    skeleton.likes,
+    params.hydrateCtx,
+  )
+  return likesState
 }
 
-const noBlocks = (inputs: {
-  ctx: Context
-  skeleton: Skeleton
-  hydration: HydrationState
-}) => {
-  const { ctx, skeleton, hydration } = inputs
-  skeleton.likes = skeleton.likes.filter((uri) => {
-    const creator = creatorFromUri(uri)
-    return !ctx.views.viewerBlockExists(creator, hydration)
+const noBlocks = (input: RulesFnInput<Context, Params, Skeleton>) => {
+  const { ctx, skeleton, hydration } = input
+
+  skeleton.likes = skeleton.likes.filter((likeUri) => {
+    const like = hydration.likes?.get(likeUri)
+    if (!like) return false
+    const likerDid = creatorFromUri(likeUri)
+    return (
+      !hydration.likeBlocks?.get(likeUri) &&
+      !ctx.views.viewerBlockExists(likerDid, hydration)
+    )
   })
   return skeleton
 }
@@ -123,6 +134,7 @@ type Context = {
 type Params = QueryParams & { hydrateCtx: HydrateCtx }
 
 type Skeleton = {
+  authorDid: string
   likes: string[]
   cursor?: string
 }

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

@@ -43,6 +43,56 @@ export default function (server: Server, ctx: AppContext) {
   })
 }
 
+const paginateNotifications = async (opts: {
+  ctx: Context
+  priority: boolean
+  reasons?: string[]
+  cursor?: string
+  limit: number
+  viewer: string
+}) => {
+  const { ctx, priority, reasons, limit, viewer } = opts
+
+  // if not filtering, then just pass through the response from dataplane
+  if (!reasons) {
+    const res = await ctx.hydrator.dataplane.getNotifications({
+      actorDid: viewer,
+      priority,
+      cursor: opts.cursor,
+      limit,
+    })
+    return {
+      notifications: res.notifications,
+      cursor: res.cursor,
+    }
+  }
+
+  let nextCursor: string | undefined = opts.cursor
+  let toReturn: Notification[] = []
+  const maxAttempts = 10
+  const attemptSize = Math.ceil(limit / 2)
+  for (let i = 0; i < maxAttempts; i++) {
+    const res = await ctx.hydrator.dataplane.getNotifications({
+      actorDid: viewer,
+      priority,
+      cursor: nextCursor,
+      limit,
+    })
+    const filtered = res.notifications.filter((notif) =>
+      reasons.includes(notif.reason),
+    )
+    toReturn = [...toReturn, ...filtered]
+    nextCursor = res.cursor ?? undefined
+    if (toReturn.length >= attemptSize || !nextCursor) {
+      break
+    }
+  }
+  return {
+    notifications: toReturn,
+    cursor: nextCursor,
+  }
+}
+
 const skeleton = async (
   input: SkeletonFnInput<Context, Params>,
 ): Promise<SkeletonState> => {
@@ -56,11 +106,13 @@ const skeleton = async (
     return { notifs: [], priority }
   }
   const [res, lastSeenRes] = await Promise.all([
-    ctx.hydrator.dataplane.getNotifications({
-      actorDid: viewer,
+    paginateNotifications({
+      ctx,
       priority,
+      reasons: params.reasons,
       cursor: params.cursor,
       limit: params.limit,
+      viewer,
     }),
     ctx.hydrator.dataplane.getNotificationSeen({
       actorDid: viewer,
@@ -126,7 +178,9 @@ const noBlockOrMutesOrNeedsReview = (
     if (
       item.reason === 'reply' ||
       item.reason === 'quote' ||
-      item.reason === 'mention'
+      item.reason === 'mention' ||
+      item.reason === 'like' ||
+      item.reason === 'follow'
     ) {
       if (!ctx.views.viewerSeesNeedsReview(did, hydration)) {
         return false

package/src/auth-verifier.ts

@@ -18,14 +18,7 @@ import {
   unpackIdentityKeys,
 } from './data-plane'
 import { GetIdentityByDidResponse } from './proto/bsky_pb'
-import {
-  extractMultikey,
-  extractPrefixedBytes,
-  hasPrefix,
-  parseDidKey,
-  SECP256K1_DID_PREFIX,
-  SECP256K1_JWT_ALG,
-} from '@atproto/crypto'
+import { parseDidKey, SECP256K1_JWT_ALG } from '@atproto/crypto'
 
 type ReqCtx = {
   req: express.Request

package/src/hydration/hydrator.ts

@@ -65,6 +65,7 @@ export class HydrateCtx {
   labelers = this.vals.labelers
   viewer = this.vals.viewer !== null ? serviceRefToDid(this.vals.viewer) : null
   includeTakedowns = this.vals.includeTakedowns
+  includeActorTakedowns = this.vals.includeActorTakedowns
   include3pBlocks = this.vals.include3pBlocks
   constructor(private vals: HydrateCtxVals) {}
   copy<V extends Partial<HydrateCtxVals>>(vals?: V): HydrateCtx & V {
@@ -76,6 +77,7 @@ export type HydrateCtxVals = {
   labelers: ParsedLabelers
   viewer: string | null
   includeTakedowns?: boolean
+  includeActorTakedowns?: boolean
   include3pBlocks?: boolean
 }
 
@@ -98,6 +100,7 @@ export type HydrationState = {
   listViewers?: ListViewerStates
   listItems?: ListItems
   likes?: Likes
+  likeBlocks?: LikeBlocks
   labels?: Labels
   feedgens?: FeedGens
   feedgenViewers?: FeedGenViewerStates
@@ -119,6 +122,9 @@ type PostBlockPairs = {
   root?: RelationshipPair
 }
 
+export type LikeBlock = boolean
+export type LikeBlocks = HydrationMap<LikeBlock>
+
 export type FollowBlock = boolean
 export type FollowBlocks = HydrationMap<FollowBlock>
 
@@ -179,12 +185,13 @@ export class Hydrator {
     dids: string[],
     ctx: HydrateCtx,
   ): Promise<HydrationState> {
+    const includeTakedowns = ctx.includeTakedowns || ctx.includeActorTakedowns
     const [actors, labels, profileViewersState] = await Promise.all([
-      this.actor.getActors(dids, ctx.includeTakedowns),
+      this.actor.getActors(dids, includeTakedowns),
       this.label.getLabelsForSubjects(labelSubjectsForDid(dids), ctx.labelers),
       this.hydrateProfileViewers(dids, ctx),
     ])
-    if (!ctx.includeTakedowns) {
+    if (!includeTakedowns) {
       actionTakedownLabels(dids, actors, labels)
     }
     return mergeStates(profileViewersState ?? {}, {
@@ -743,12 +750,33 @@ export class Hydrator {
   // - like
   //   - profile
   //     - list basic
-  async hydrateLikes(uris: string[], ctx: HydrateCtx): Promise<HydrationState> {
+  async hydrateLikes(
+    authorDid: string,
+    uris: string[],
+    ctx: HydrateCtx,
+  ): Promise<HydrationState> {
     const [likes, profileState] = await Promise.all([
       this.feed.getLikes(uris, ctx.includeTakedowns),
       this.hydrateProfiles(uris.map(didFromUri), ctx),
     ])
-    return mergeStates(profileState, { likes, ctx })
+
+    const pairs: RelationshipPair[] = []
+    for (const [uri, like] of likes) {
+      if (like) {
+        pairs.push([authorDid, didFromUri(uri)])
+      }
+    }
+    const blocks = await this.graph.getBidirectionalBlocks(pairs)
+    const likeBlocks = new HydrationMap<LikeBlock>()
+    for (const [uri, like] of likes) {
+      if (like) {
+        likeBlocks.set(uri, blocks.isBlocked(authorDid, didFromUri(uri)))
+      } else {
+        likeBlocks.set(uri, null)
+      }
+    }
+
+    return mergeStates(profileState, { likes, likeBlocks, ctx })
   }
 
   // app.bsky.feed.getRepostedBy#repostedBy
@@ -1151,6 +1179,7 @@ export const mergeStates = (
     listViewers: mergeMaps(stateA.listViewers, stateB.listViewers),
     listItems: mergeMaps(stateA.listItems, stateB.listItems),
     likes: mergeMaps(stateA.likes, stateB.likes),
+    likeBlocks: mergeMaps(stateA.likeBlocks, stateB.likeBlocks),
     labels: mergeMaps(stateA.labels, stateB.labels),
     feedgens: mergeMaps(stateA.feedgens, stateB.feedgens),
     feedgenAggs: mergeMaps(stateA.feedgenAggs, stateB.feedgenAggs),

package/src/lexicon/lexicons.ts

@@ -8944,6 +8944,15 @@ export const schemaDict = {
         parameters: {
           type: 'params',
           properties: {
+            reasons: {
+              description: 'Notification reasons to include in response.',
+              type: 'array',
+              items: {
+                type: 'string',
+                description:
+                  'A reason that matches the reason property of #notification.',
+              },
+            },
             limit: {
               type: 'integer',
               minimum: 1,
@@ -10728,8 +10737,9 @@ export const schemaDict = {
       },
     },
   },
-}
-export const schemas: LexiconDoc[] = Object.values(schemaDict) as LexiconDoc[]
+} as const satisfies Record<string, LexiconDoc>
+
+export const schemas = Object.values(schemaDict)
 export const lexicons: Lexicons = new Lexicons(schemas)
 export const ids = {
   ComAtprotoAdminDefs: 'com.atproto.admin.defs',

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

@@ -11,6 +11,8 @@ import * as AppBskyActorDefs from '../actor/defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
 export interface QueryParams {
+  /** Notification reasons to include in response. */
+  reasons?: string[]
   limit: number
   priority?: boolean
   cursor?: string

package/tests/views/__snapshots__/notifications.test.ts.snap

@@ -1263,6 +1263,263 @@ Array [
 ]
 `;
 
+exports[`notification views filters notifications by multiple reasons 1`] = `
+Object {
+  "notifications": Array [
+    Object {
+      "author": Object {
+        "did": "user(0)",
+        "handle": "carol.test",
+        "labels": Array [],
+        "viewer": Object {
+          "blockedBy": false,
+          "followedBy": "record(2)",
+          "following": "record(1)",
+          "muted": false,
+        },
+      },
+      "cid": "cids(0)",
+      "indexedAt": "1970-01-01T00:00:00.000Z",
+      "isRead": false,
+      "labels": Array [],
+      "reason": "reply",
+      "reasonSubject": "record(3)",
+      "record": Object {
+        "$type": "app.bsky.feed.post",
+        "createdAt": "1970-01-01T00:00:00.000Z",
+        "reply": Object {
+          "parent": Object {
+            "cid": "cids(2)",
+            "uri": "record(3)",
+          },
+          "root": Object {
+            "cid": "cids(1)",
+            "uri": "record(4)",
+          },
+        },
+        "text": "indeed",
+      },
+      "uri": "record(0)",
+    },
+    Object {
+      "author": Object {
+        "did": "user(0)",
+        "handle": "carol.test",
+        "labels": Array [],
+        "viewer": Object {
+          "blockedBy": false,
+          "followedBy": "record(2)",
+          "following": "record(1)",
+          "muted": false,
+        },
+      },
+      "cid": "cids(3)",
+      "indexedAt": "1970-01-01T00:00:00.000Z",
+      "isRead": false,
+      "labels": Array [],
+      "reason": "reply",
+      "reasonSubject": "record(4)",
+      "record": Object {
+        "$type": "app.bsky.feed.post",
+        "createdAt": "1970-01-01T00:00:00.000Z",
+        "reply": Object {
+          "parent": Object {
+            "cid": "cids(1)",
+            "uri": "record(4)",
+          },
+          "root": Object {
+            "cid": "cids(1)",
+            "uri": "record(4)",
+          },
+        },
+        "text": "of course",
+      },
+      "uri": "record(5)",
+    },
+    Object {
+      "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(2)/cids(5)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
+        "description": "hi im bob label_me",
+        "did": "user(1)",
+        "displayName": "bobby",
+        "handle": "bob.test",
+        "indexedAt": "1970-01-01T00:00:00.000Z",
+        "labels": Array [],
+        "viewer": Object {
+          "blockedBy": false,
+          "followedBy": "record(8)",
+          "following": "record(7)",
+          "muted": false,
+        },
+      },
+      "cid": "cids(4)",
+      "indexedAt": "1970-01-01T00:00:00.000Z",
+      "isRead": false,
+      "labels": Array [
+        Object {
+          "cid": "cids(4)",
+          "cts": "1970-01-01T00:00:00.000Z",
+          "src": "did:example:labeler",
+          "uri": "record(6)",
+          "val": "test-label",
+        },
+        Object {
+          "cid": "cids(4)",
+          "cts": "1970-01-01T00:00:00.000Z",
+          "src": "did:example:labeler",
+          "uri": "record(6)",
+          "val": "test-label-2",
+        },
+      ],
+      "reason": "reply",
+      "reasonSubject": "record(4)",
+      "record": Object {
+        "$type": "app.bsky.feed.post",
+        "createdAt": "1970-01-01T00:00:00.000Z",
+        "embed": Object {
+          "$type": "app.bsky.embed.images",
+          "images": Array [
+            Object {
+              "alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
+              "image": Object {
+                "$type": "blob",
+                "mimeType": "image/jpeg",
+                "ref": Object {
+                  "$link": "cids(6)",
+                },
+                "size": 4114,
+              },
+            },
+          ],
+        },
+        "reply": Object {
+          "parent": Object {
+            "cid": "cids(1)",
+            "uri": "record(4)",
+          },
+          "root": Object {
+            "cid": "cids(1)",
+            "uri": "record(4)",
+          },
+        },
+        "text": "hear that label_me label_me_2",
+      },
+      "uri": "record(6)",
+    },
+    Object {
+      "author": Object {
+        "associated": Object {
+          "chat": Object {
+            "allowIncoming": "none",
+          },
+        },
+        "did": "user(3)",
+        "handle": "dan.test",
+        "labels": Array [],
+        "viewer": Object {
+          "blockedBy": false,
+          "following": "record(10)",
+          "muted": false,
+        },
+      },
+      "cid": "cids(7)",
+      "indexedAt": "1970-01-01T00:00:00.000Z",
+      "isRead": false,
+      "labels": Array [],
+      "reason": "mention",
+      "record": Object {
+        "$type": "app.bsky.feed.post",
+        "createdAt": "1970-01-01T00:00:00.000Z",
+        "embed": Object {
+          "$type": "app.bsky.embed.record",
+          "record": Object {
+            "cid": "cids(8)",
+            "uri": "record(11)",
+          },
+        },
+        "facets": Array [
+          Object {
+            "features": Array [
+              Object {
+                "$type": "app.bsky.richtext.facet#mention",
+                "did": "user(4)",
+              },
+            ],
+            "index": Object {
+              "byteEnd": 18,
+              "byteStart": 0,
+            },
+          },
+        ],
+        "text": "@alice.bluesky.xyz is the best",
+      },
+      "uri": "record(9)",
+    },
+  ],
+  "priority": false,
+  "seenAt": "1970-01-01T00:00:00.000Z",
+}
+`;
+
+exports[`notification views filters notifications by reason 1`] = `
+Object {
+  "notifications": Array [
+    Object {
+      "author": Object {
+        "associated": Object {
+          "chat": Object {
+            "allowIncoming": "none",
+          },
+        },
+        "did": "user(0)",
+        "handle": "dan.test",
+        "labels": Array [],
+        "viewer": Object {
+          "blockedBy": false,
+          "following": "record(1)",
+          "muted": false,
+        },
+      },
+      "cid": "cids(0)",
+      "indexedAt": "1970-01-01T00:00:00.000Z",
+      "isRead": false,
+      "labels": Array [],
+      "reason": "mention",
+      "record": Object {
+        "$type": "app.bsky.feed.post",
+        "createdAt": "1970-01-01T00:00:00.000Z",
+        "embed": Object {
+          "$type": "app.bsky.embed.record",
+          "record": Object {
+            "cid": "cids(1)",
+            "uri": "record(2)",
+          },
+        },
+        "facets": Array [
+          Object {
+            "features": Array [
+              Object {
+                "$type": "app.bsky.richtext.facet#mention",
+                "did": "user(1)",
+              },
+            ],
+            "index": Object {
+              "byteEnd": 18,
+              "byteStart": 0,
+            },
+          },
+        ],
+        "text": "@alice.bluesky.xyz is the best",
+      },
+      "uri": "record(0)",
+    },
+  ],
+  "priority": false,
+  "seenAt": "1970-01-01T00:00:00.000Z",
+}
+`;
+
 exports[`notification views generates notifications for quotes 1`] = `
 Array [
   Object {