npm - @atproto/bsky - Versions diffs - 0.0.280 → 0.0.281 - Mend

@atproto/bsky 0.0.280 → 0.0.281

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (90) hide show

package/dist/api/app/bsky/graph/getStarterPacksWithMembership.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getStarterPacksWithMembership.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/graph/getStarterPacksWithMembership.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,OAAO,EAAE,mBAAmB,EAAe,MAAM,sBAAsB,CAAA;AAEvE,OAAO,EAGL,eAAe,GAChB,MAAM,mCAAmC,CAAA;AAC1C,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAA;AACnD,OAAO,EAIL,cAAc,EACd,OAAO,GACR,MAAM,yBAAyB,CAAA;AAEhC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAEzE,MAAM,CAAC,OAAO,WAAW,MAAc,EAAE,GAAe;IACtD,MAAM,6BAA6B,GAAG,cAAc,CAClD,QAAQ,EACR,SAAS,EACT,OAAO,EACP,YAAY,CACb,CAAA;IACD,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,6BAA6B,EAAE;QACvD,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,QAAQ;QAC/B,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE;YACvC,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAA;YACnC,MAAM,QAAQ,GAAG,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;YACrC,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,aAAa,CAAC;gBAClD,QAAQ;gBACR,MAAM;aACP,CAAC,CAAA;YACF,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC;gBAC5B,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,CAC3B,6BAA6B,CAC3B,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,EACxC,GAAG,CACJ;gBACH,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,0BAA0B;aAC3C,CAAC,CAAA;YAEF,OAAO;gBACL,QAAQ,EAAE,kBAAkB;gBAC5B,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE,UAAU,CAAC,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC;aACvD,CAAA;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,QAAQ,GAAG,KAAK,EACpB,KAAuC,EACf,EAAE;IAC1B,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,KAAK,CAAA;IAC7B,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;IACnE,IAAI,CAAC,QAAQ;QAAE,MAAM,IAAI,mBAAmB,CAAC,mBAAmB,CAAC,CAAA;IAEjE,IAAI,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QACpC,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,EAAE,CAAA;IAC1C,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,GACrC,MAAM,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,oBAAoB,CAAC;QAChD,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC,MAAM;QAClC,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,KAAK,EAAE,MAAM,CAAC,KAAK;KACpB,CAAC,CAAA;IAEJ,OAAO;QACL,QAAQ;QACR,eAAe,EAAE,eAAgC;QACjD,MAAM~~,EAAE,MAAM,IAAI,SAAS~~;~~KAC5B~~,CAAA;AACH,CAAC,CAAA;AAED,MAAM,SAAS,GAAG,KAAK,EACrB,KAAuD,EACvD,EAAE;IACF,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAA;IACvC,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,QAAQ,CAAA;IAC9C,MAAM,gBAAgB,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,mBAAmB,CAC7D,eAAe,EACf,MAAM,CAAC,UAAU,CAClB,CAAA;IACD,MAAM,QAAQ,GAAG,UAAU,CACzB,eAAe,EACf,CAAC,GAAG,EAAE,EAAE,CAAC,gBAAgB,CAAC,YAAY,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,IAAI,CAC9D,CAAA;IACD,MAAM,4BAA4B,GAChC,MAAM,GAAG,CAAC,QAAQ,CAAC,sBAAsB,CACvC,QAAQ,EACR,QAAQ,EACR,MAAM,CAAC,UAAU,CAClB,CAAA;IACH,OAAO,eAAe,CAAC,gBAAgB,EAAE,4BAA4B,CAAC,CAAA;AACxE,CAAC,CAAA;AAED,MAAM,YAAY,GAAG,CACnB,KAA0D,EACA,EAAE;IAC5D,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,KAAK,CAAA;IAC1C,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAA;IAEtD,MAAM,0BAA0B,GAAG,UAAU,CAAC,eAAe,EAAE,CAAC,KAAK,EAAE,EAAE;QACvE,MAAM,OAAO,GAAG,SAAS,CAAC,YAAY,EAAE,GAAG,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,IAAI,CAAA;QAC/D,MAAM,WAAW,GAAG,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;QAC3D,IAAI,CAAC,OAAO,IAAI,CAAC,WAAW;YAAE,OAAM;QAEpC,MAAM,WAAW,GAAG,SAAS,CAAC,eAAe;YAC3C,EAAE,GAAG,CAAC,OAAO,CAAC;YACd,EAAE,GAAG,CAAC,QAAQ,CAAC,EAAE,gBAAgB,CAAA;QAEnC,OAAO;YACL,WAAW;YACX,QAAQ,EAAE,WAAW;gBACnB,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,WAAW,EAAE,QAAQ,EAAE,SAAS,CAAC;gBAC1D,CAAC,CAAC,SAAS;SACd,CAAA;IACH,CAAC,CAAC,CAAA;IACF,OAAO,EAAE,0BAA0B,EAAE,MAAM,EAAE,CAAA;AAC/C,CAAC,CAAA","sourcesContent":["import { mapDefined } from '@atproto/common'\nimport type { AtUriString, DidString } from '@atproto/syntax'\nimport { InvalidRequestError, type Server } from '@atproto/xrpc-server'\nimport type { AppContext } from '../../../../context.js'\nimport {\n type HydrateCtxWithViewer,\n type Hydrator,\n mergeManyStates,\n} from '../../../../hydration/hydrator.js'\nimport { app } from '../../../../lexicons/index.js'\nimport {\n type HydrationFnInput,\n type PresentationFnInput,\n type SkeletonFnInput,\n createPipeline,\n noRules,\n} from '../../../../pipeline.js'\nimport type { Views } from '../../../../views/index.js'\nimport { clearlyBadCursor, fillPage, resHeaders } from '../../../util.js'\n\nexport default function (server: Server, ctx: AppContext) {\n const getStarterPacksWithMembership = createPipeline(\n skeleton,\n hydration,\n noRules,\n presentation,\n )\n server.add(app.bsky.graph.getStarterPacksWithMembership, {\n auth: ctx.authVerifier.standard,\n handler: async ({ params, auth, req }) => {\n const viewer = auth.credentials.iss\n const labelers = ctx.reqLabelers(req)\n const hydrateCtx = await ctx.hydrator.createContext({\n labelers,\n viewer,\n })\n const result = await fillPage({\n cursor: params.cursor,\n limit: params.limit,\n fetch: ({ cursor, limit }) =>\n getStarterPacksWithMembership(\n { ...params, cursor, limit, hydrateCtx },\n ctx,\n ),\n items: (r) => r.starterPacksWithMembership,\n })\n\n return {\n encoding: 'application/json',\n body: result,\n headers: resHeaders({ labelers: hydrateCtx.labelers }),\n }\n },\n })\n}\n\nconst skeleton = async (\n input: SkeletonFnInput<Context, Params>,\n): Promise<SkeletonState> => {\n const { ctx, params } = input\n const [actorDid] = await ctx.hydrator.actor.getDids([params.actor])\n if (!actorDid) throw new InvalidRequestError('Profile not found')\n\n if (clearlyBadCursor(params.cursor)) {\n return { actorDid, starterPackUris: [] }\n }\n\n const { uris: starterPackUris, cursor } =\n await ctx.hydrator.dataplane.getActorStarterPacks({\n actorDid: params.hydrateCtx.viewer,\n cursor: params.cursor,\n limit: params.limit,\n })\n\n return {\n actorDid,\n starterPackUris: starterPackUris as AtUriString[],\n cursor~~: cursor \|\| undefined~~,\n }\n}\n\nconst hydration = async (\n input: HydrationFnInput<Context, Params, SkeletonState>,\n) => {\n const { ctx, params, skeleton } = input\n const { actorDid, starterPackUris } = skeleton\n const spHydrationState = await ctx.hydrator.hydrateStarterPacks(\n starterPackUris,\n params.hydrateCtx,\n )\n const listUris = mapDefined(\n starterPackUris,\n (uri) => spHydrationState.starterPacks?.get(uri)?.record.list,\n )\n const listMembershipHydrationState =\n await ctx.hydrator.hydrateListsMembership(\n listUris,\n actorDid,\n params.hydrateCtx,\n )\n return mergeManyStates(spHydrationState, listMembershipHydrationState)\n}\n\nconst presentation = (\n input: PresentationFnInput<Context, Params, SkeletonState>,\n): app.bsky.graph.getStarterPacksWithMembership.$OutputBody => {\n const { ctx, skeleton, hydration } = input\n const { actorDid, starterPackUris, cursor } = skeleton\n\n const starterPacksWithMembership = mapDefined(starterPackUris, (spUri) => {\n const listUri = hydration.starterPacks?.get(spUri)?.record.list\n const starterPack = ctx.views.starterPack(spUri, hydration)\n if (!listUri \|\| !starterPack) return\n\n const listItemUri = hydration.listMemberships\n ?.get(listUri)\n ?.get(actorDid)?.actorListItemUri\n\n return {\n starterPack,\n listItem: listItemUri\n ? ctx.views.listItemView(listItemUri, actorDid, hydration)\n : undefined,\n }\n })\n return { starterPacksWithMembership, cursor }\n}\n\ntype Context = {\n hydrator: Hydrator\n views: Views\n}\n\ntype Params = app.bsky.graph.getStarterPacksWithMembership.$Params & {\n hydrateCtx: HydrateCtxWithViewer\n}\n\ntype SkeletonState = {\n actorDid: DidString\n starterPackUris: AtUriString[]\n cursor?: string\n}\n"]}
1	+ {"version":3,"file":"getStarterPacksWithMembership.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/graph/getStarterPacksWithMembership.ts"],"names":[],"mappings":"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","sourcesContent":["import { mapDefined } from '@atproto/common'\nimport type { AtUriString, DidString } from '@atproto/syntax'\nimport { InvalidRequestError, type Server } from '@atproto/xrpc-server'\nimport type { AppContext } from '../../../../context.js'\nimport {\n type HydrateCtxWithViewer,\n type Hydrator,\n mergeManyStates,\n} from '../../../../hydration/hydrator.js'\nimport { app } from '../../../../lexicons/index.js'\nimport {\n type HydrationFnInput,\n type PresentationFnInput,\n type SkeletonFnInput,\n createPipeline,\n noRules,\n} from '../../../../pipeline.js'\nimport type { Views } from '../../../../views/index.js'\nimport { clearlyBadCursor, fillPage, resHeaders } from '../../../util.js'\n\nexport default function (server: Server, ctx: AppContext) {\n const getStarterPacksWithMembership = createPipeline(\n skeleton,\n hydration,\n noRules,\n presentation,\n )\n server.add(app.bsky.graph.getStarterPacksWithMembership, {\n auth: ctx.authVerifier.standard,\n handler: async ({ params, auth, req }) => {\n const viewer = auth.credentials.iss\n const labelers = ctx.reqLabelers(req)\n const hydrateCtx = await ctx.hydrator.createContext({\n labelers,\n viewer,\n })\n const result = await fillPage({\n cursor: params.cursor,\n limit: params.limit,\n fetch: ({ cursor, limit }) =>\n getStarterPacksWithMembership(\n { ...params, cursor, limit, hydrateCtx },\n ctx,\n ),\n items: (r) => r.starterPacksWithMembership,\n })\n\n return {\n encoding: 'application/json',\n body: result,\n headers: resHeaders({ labelers: hydrateCtx.labelers }),\n }\n },\n })\n}\n\nconst skeleton = async (\n input: SkeletonFnInput<Context, Params>,\n): Promise<SkeletonState> => {\n const { ctx, params } = input\n const [actorDid] = await ctx.hydrator.actor.getDids([params.actor])\n if (!actorDid) throw new InvalidRequestError('Profile not found')\n\n if (clearlyBadCursor(params.cursor)) {\n return { actorDid, starterPackUris: [] }\n }\n\n const { uris: starterPackUris, cursor } =\n await ctx.hydrator.dataplane.getActorStarterPacks({\n actorDid: params.hydrateCtx.viewer,\n cursor: params.cursor,\n limit: params.limit,\n })\n\n return {\n actorDid,\n starterPackUris: starterPackUris as AtUriString[],\n cursor,\n }\n}\n\nconst hydration = async (\n input: HydrationFnInput<Context, Params, SkeletonState>,\n) => {\n const { ctx, params, skeleton } = input\n const { actorDid, starterPackUris } = skeleton\n const spHydrationState = await ctx.hydrator.hydrateStarterPacks(\n starterPackUris,\n params.hydrateCtx,\n )\n const listUris = mapDefined(\n starterPackUris,\n (uri) => spHydrationState.starterPacks?.get(uri)?.record.list,\n )\n const listMembershipHydrationState =\n await ctx.hydrator.hydrateListsMembership(\n listUris,\n actorDid,\n params.hydrateCtx,\n )\n return mergeManyStates(spHydrationState, listMembershipHydrationState)\n}\n\nconst presentation = (\n input: PresentationFnInput<Context, Params, SkeletonState>,\n): app.bsky.graph.getStarterPacksWithMembership.$OutputBody => {\n const { ctx, skeleton, hydration } = input\n const { actorDid, starterPackUris, cursor } = skeleton\n\n const starterPacksWithMembership = mapDefined(starterPackUris, (spUri) => {\n const listUri = hydration.starterPacks?.get(spUri)?.record.list\n const starterPack = ctx.views.starterPack(spUri, hydration)\n if (!listUri \|\| !starterPack) return\n\n const listItemUri = hydration.listMemberships\n ?.get(listUri)\n ?.get(actorDid)?.actorListItemUri\n\n return {\n starterPack,\n listItem: listItemUri\n ? ctx.views.listItemView(listItemUri, actorDid, hydration)\n : undefined,\n }\n })\n return { starterPacksWithMembership, cursor }\n}\n\ntype Context = {\n hydrator: Hydrator\n views: Views\n}\n\ntype Params = app.bsky.graph.getStarterPacksWithMembership.$Params & {\n hydrateCtx: HydrateCtxWithViewer\n}\n\ntype SkeletonState = {\n actorDid: DidString\n starterPackUris: AtUriString[]\n cursor?: string\n}\n"]}

package/dist/api/app/bsky/notification/getPreferences.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { type Server } from '@atproto/xrpc-server';
+import type { Server } from '@atproto/xrpc-server';
 import type { AppContext } from '../../../../context.js';
 export default function (server: Server, ctx: AppContext): void;
 //# sourceMappingURL=getPreferences.d.ts.map

package/dist/api/app/bsky/notification/getPreferences.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getPreferences.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/notification/getPreferences.ts"],"names":[],"mappings":"~~AAEA~~,OAAO,EAAE,~~KAAK,~~MAAM,~~EAAwB~~,MAAM,sBAAsB,CAAA;~~AACxE~~,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;~~AAKxD~~,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAcvD"}
1	+ {"version":3,"file":"getPreferences.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/notification/getPreferences.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAIxD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAcvD"}

package/dist/api/app/bsky/notification/getPreferences.js CHANGED Viewed

@@ -1,13 +1,11 @@
-import assert from 'node:assert';
-import { UpstreamFailureError } from '@atproto/xrpc-server';
 import { app } from '../../../../lexicons/index.js';
-import { protobufToLex } from './util.js';
+import { getNotificationPreferences } from './util.js';
 export default function (server, ctx) {
     server.add(app.bsky.notification.getPreferences, {
         auth: ctx.authVerifier.standard,
         handler: async ({ auth }) => {
             const actorDid = auth.credentials.iss;
-            const preferences = await computePreferences(ctx, actorDid);
+            const preferences = await getNotificationPreferences(ctx, actorDid);
             return {
                 encoding: 'application/json',
                 body: {
@@ -17,18 +15,4 @@ export default function (server, ctx) {
         },
     });
 }
-const computePreferences = async (ctx, actorDid) => {
-    let res;
-    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;
-};
 //# sourceMappingURL=getPreferences.js.map

package/dist/api/app/bsky/notification/getPreferences.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getPreferences.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/notification/getPreferences.ts"],"names":[],"mappings":"~~AAAA~~,OAAO,~~MAAM,MAAM,aAAa,CAAA;AAEhC,OAAO,EAAe,oBAAoB,~~EAAE,~~MAAM,sBAAsB,CAAA;AAExE,OAAO,EAAE,~~GAAG,EAAE,MAAM,+BAA+B,CAAA;~~AAEnD~~,OAAO,EAAE,~~aAAa~~,EAAE,MAAM,WAAW,CAAA;~~AAEzC~~,MAAM,CAAC,OAAO,WAAW,MAAc,EAAE,GAAe;IACtD,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE;QAC/C,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,QAAQ;QAC/B,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;YAC1B,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAA;YACrC,MAAM,WAAW,GAAG,MAAM,~~kBAAkB~~,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;~~YAC3D~~,OAAO;gBACL,QAAQ,EAAE,kBAAkB;gBAC5B,IAAI,EAAE;oBACJ,WAAW;iBACZ;aACF,CAAA;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,kBAAkB,GAAG,KAAK,EAC9B,GAAe,EACf,QAAgB,EAC2C,EAAE;IAC7D,IAAI,GAAuC,CAAA;IAC3C,IAAI,CAAC;QACH,GAAG,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,0BAA0B,CAAC;YACnD,IAAI,EAAE,CAAC,QAAQ,CAAC;SACjB,CAAC,CAAA;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,IAAI,oBAAoB,CAC5B,6CAA6C,EAC7C,+BAA+B,EAC/B,EAAE,KAAK,EAAE,GAAG,EAAE,CACf,CAAA;IACH,CAAC;IAED,MAAM,CACJ,GAAG,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,EAC5B,+CAA+C,GAAG,CAAC,WAAW,CAAC,MAAM,EAAE,CACxE,CAAA;IAED,MAAM,kBAAkB,GAAG,aAAa,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA;IAC5D,OAAO,kBAAkB,CAAA;AAC3B,CAAC,CAAA","sourcesContent":["import ~~assert from 'node:assert'\nimport~~ type { ~~Un$Typed } from '@atproto/lex'\nimport { type~~ Server, ~~UpstreamFailureError~~ } from '@atproto/xrpc-server'\nimport type { AppContext } from '../../../../context.js'\nimport { app } from '../../../../lexicons/index.js'\nimport ~~type~~ { ~~GetNotificationPreferencesResponse~~ } from '~~../../../../proto/bsky_pb.js'\nimport { protobufToLex } from '~~./util.js'\n\nexport default function (server: Server, ctx: AppContext) {\n server.add(app.bsky.notification.getPreferences, {\n auth: ctx.authVerifier.standard,\n handler: async ({ auth }) => {\n const actorDid = auth.credentials.iss\n const preferences = await ~~computePreferences~~(ctx, actorDid)\n return {\n encoding: 'application/json',\n body: {\n preferences,\n },\n }\n },\n })\n}\n\nconst computePreferences = async (\n ctx: AppContext,\n actorDid: string,\n): Promise<Un$Typed<app.bsky.notification.defs.Preferences>> => {\n let res: GetNotificationPreferencesResponse\n try {\n res = await ctx.dataplane.getNotificationPreferences({\n dids: [actorDid],\n })\n } catch (err) {\n throw new UpstreamFailureError(\n 'cannot get current notification preferences',\n 'NotificationPreferencesFailed',\n { cause: err },\n )\n }\n\n assert(\n res.preferences.length === 1,\n `expected exactly one preferences entry, got ${res.preferences.length}`,\n )\n\n const currentPreferences = protobufToLex(res.preferences[0])\n return currentPreferences\n}\n"]}
1	+ {"version":3,"file":"getPreferences.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/notification/getPreferences.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAA;AACnD,OAAO,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAA;AAEtD,MAAM,CAAC,OAAO,WAAW,MAAc,EAAE,GAAe;IACtD,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE;QAC/C,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,QAAQ;QAC/B,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;YAC1B,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAA;YACrC,MAAM,WAAW,GAAG,MAAM,0BAA0B,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;YACnE,OAAO;gBACL,QAAQ,EAAE,kBAAkB;gBAC5B,IAAI,EAAE;oBACJ,WAAW;iBACZ;aACF,CAAA;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import type { Server } from '@atproto/xrpc-server'\nimport type { AppContext } from '../../../../context.js'\nimport { app } from '../../../../lexicons/index.js'\nimport { getNotificationPreferences } from './util.js'\n\nexport default function (server: Server, ctx: AppContext) {\n server.add(app.bsky.notification.getPreferences, {\n auth: ctx.authVerifier.standard,\n handler: async ({ auth }) => {\n const actorDid = auth.credentials.iss\n const preferences = await getNotificationPreferences(ctx, actorDid)\n return {\n encoding: 'application/json',\n body: {\n preferences,\n },\n }\n },\n })\n}\n"]}

package/dist/api/app/bsky/notification/listActivitySubscriptions.js CHANGED Viewed

@@ -41,7 +41,7 @@ const skeleton = async (input) => {
     return {
         actorDid,
         dids: dids,
-        cursor: cursor || undefined,
+        cursor,
     };
 };
 const hydration = async (input) => {

package/dist/api/app/bsky/notification/listActivitySubscriptions.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"listActivitySubscriptions.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/notification/listActivitySubscriptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAQ5C,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAA;AACnD,OAAO,EAKL,cAAc,GACf,MAAM,yBAAyB,CAAA;AAEhC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAEzE,MAAM,CAAC,OAAO,WAAW,MAAc,EAAE,GAAe;IACtD,MAAM,yBAAyB,GAAG,cAAc,CAC9C,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,YAAY,CACb,CAAA;IACD,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,yBAAyB,EAAE;QAC1D,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,QAAQ;QAC/B,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE;YACvC,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAA;YACnC,MAAM,QAAQ,GAAG,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;YACrC,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,aAAa,CAAC;gBAClD,QAAQ;gBACR,MAAM;aACP,CAAC,CAAA;YAEF,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC;gBAC5B,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,CAC3B,yBAAyB,CACvB,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,EACxC,GAAG,CACJ;gBACH,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa;aAC9B,CAAC,CAAA;YAEF,OAAO;gBACL,QAAQ,EAAE,kBAAkB;gBAC5B,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE,UAAU,CAAC,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC;aACvD,CAAA;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,QAAQ,GAAG,KAAK,EACpB,KAAuC,EACf,EAAE;IAC1B,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,CAAA;IAC7B,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAA;IACzC,IAAI,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QACpC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,EAAE,CAAA;IAC/B,CAAC;IACD,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GACpB,MAAM,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,2BAA2B,CAAC;QACvD,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC,MAAM;QAClC,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,MAAM,EAAE,MAAM,CAAC,MAAM;KACtB,CAAC,CAAA;IACJ,OAAO;QACL,QAAQ;QACR,IAAI,EAAE,IAAmB;QACzB,MAAM~~,EAAE,MAAM,IAAI,SAAS~~;~~KAC5B~~,CAAA;AACH,CAAC,CAAA;AAED,MAAM,SAAS,GAAG,KAAK,EACrB,KAAuD,EACvD,EAAE;IACF,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAA;IACvC,MAAM,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAA;IACzB,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,uBAAuB,CACtD,IAAI,EACJ,MAAM,CAAC,UAAU,CAClB,CAAA;IACD,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAED,MAAM,QAAQ,GAAG,CAAC,KAAmD,EAAE,EAAE;IACvE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,KAAK,CAAA;IAC1C,QAAQ,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAClC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC,GAAG,EAAE,SAAS,CAAC,CACtD,CAAA;IACD,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AAED,MAAM,YAAY,GAAG,CACnB,KAA0D,EAC1D,EAAE;IACF,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAA;IAC1C,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAA;IACjC,MAAM,aAAa,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE;QAC7C,OAAO,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;IAC1C,CAAC,CAAC,CAAA;IACF,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,CAAA;AAClC,CAAC,CAAA","sourcesContent":["import { mapDefined } from '@atproto/common'\nimport type { DidString } from '@atproto/syntax'\nimport type { Server } from '@atproto/xrpc-server'\nimport type { AppContext } from '../../../../context.js'\nimport type {\n HydrateCtxWithViewer,\n Hydrator,\n} from '../../../../hydration/hydrator.js'\nimport { app } from '../../../../lexicons/index.js'\nimport {\n type HydrationFnInput,\n type PresentationFnInput,\n type RulesFnInput,\n type SkeletonFnInput,\n createPipeline,\n} from '../../../../pipeline.js'\nimport type { Views } from '../../../../views/index.js'\nimport { clearlyBadCursor, fillPage, resHeaders } from '../../../util.js'\n\nexport default function (server: Server, ctx: AppContext) {\n const listActivitySubscriptions = createPipeline(\n skeleton,\n hydration,\n noBlocks,\n presentation,\n )\n server.add(app.bsky.notification.listActivitySubscriptions, {\n auth: ctx.authVerifier.standard,\n handler: async ({ params, auth, req }) => {\n const viewer = auth.credentials.iss\n const labelers = ctx.reqLabelers(req)\n const hydrateCtx = await ctx.hydrator.createContext({\n labelers,\n viewer,\n })\n\n const result = await fillPage({\n cursor: params.cursor,\n limit: params.limit,\n fetch: ({ cursor, limit }) =>\n listActivitySubscriptions(\n { ...params, cursor, limit, hydrateCtx },\n ctx,\n ),\n items: (r) => r.subscriptions,\n })\n\n return {\n encoding: 'application/json',\n body: result,\n headers: resHeaders({ labelers: hydrateCtx.labelers }),\n }\n },\n })\n}\n\nconst skeleton = async (\n input: SkeletonFnInput<Context, Params>,\n): Promise<SkeletonState> => {\n const { params, ctx } = input\n const actorDid = params.hydrateCtx.viewer\n if (clearlyBadCursor(params.cursor)) {\n return { actorDid, dids: [] }\n }\n const { dids, cursor } =\n await ctx.hydrator.dataplane.getActivitySubscriptionDids({\n actorDid: params.hydrateCtx.viewer,\n limit: params.limit,\n cursor: params.cursor,\n })\n return {\n actorDid,\n dids: dids as DidString[],\n cursor~~: cursor \|\| undefined~~,\n }\n}\n\nconst hydration = async (\n input: HydrationFnInput<Context, Params, SkeletonState>,\n) => {\n const { ctx, params, skeleton } = input\n const { dids } = skeleton\n const state = await ctx.hydrator.hydrateProfilesDetailed(\n dids,\n params.hydrateCtx,\n )\n return state\n}\n\nconst noBlocks = (input: RulesFnInput<Context, Params, SkeletonState>) => {\n const { skeleton, hydration, ctx } = input\n skeleton.dids = skeleton.dids.filter(\n (did) => !ctx.views.viewerBlockExists(did, hydration),\n )\n return skeleton\n}\n\nconst presentation = (\n input: PresentationFnInput<Context, Params, SkeletonState>,\n) => {\n const { ctx, hydration, skeleton } = input\n const { dids, cursor } = skeleton\n const subscriptions = mapDefined(dids, (did) => {\n return ctx.views.profile(did, hydration)\n })\n return { subscriptions, cursor }\n}\n\ntype Context = {\n hydrator: Hydrator\n views: Views\n}\n\ntype Params = app.bsky.notification.listActivitySubscriptions.$Params & {\n hydrateCtx: HydrateCtxWithViewer\n}\n\ntype SkeletonState = {\n actorDid: DidString\n dids: DidString[]\n cursor?: string\n}\n"]}
1	+ {"version":3,"file":"listActivitySubscriptions.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/notification/listActivitySubscriptions.ts"],"names":[],"mappings":"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","sourcesContent":["import { mapDefined } from '@atproto/common'\nimport type { DidString } from '@atproto/syntax'\nimport type { Server } from '@atproto/xrpc-server'\nimport type { AppContext } from '../../../../context.js'\nimport type {\n HydrateCtxWithViewer,\n Hydrator,\n} from '../../../../hydration/hydrator.js'\nimport { app } from '../../../../lexicons/index.js'\nimport {\n type HydrationFnInput,\n type PresentationFnInput,\n type RulesFnInput,\n type SkeletonFnInput,\n createPipeline,\n} from '../../../../pipeline.js'\nimport type { Views } from '../../../../views/index.js'\nimport { clearlyBadCursor, fillPage, resHeaders } from '../../../util.js'\n\nexport default function (server: Server, ctx: AppContext) {\n const listActivitySubscriptions = createPipeline(\n skeleton,\n hydration,\n noBlocks,\n presentation,\n )\n server.add(app.bsky.notification.listActivitySubscriptions, {\n auth: ctx.authVerifier.standard,\n handler: async ({ params, auth, req }) => {\n const viewer = auth.credentials.iss\n const labelers = ctx.reqLabelers(req)\n const hydrateCtx = await ctx.hydrator.createContext({\n labelers,\n viewer,\n })\n\n const result = await fillPage({\n cursor: params.cursor,\n limit: params.limit,\n fetch: ({ cursor, limit }) =>\n listActivitySubscriptions(\n { ...params, cursor, limit, hydrateCtx },\n ctx,\n ),\n items: (r) => r.subscriptions,\n })\n\n return {\n encoding: 'application/json',\n body: result,\n headers: resHeaders({ labelers: hydrateCtx.labelers }),\n }\n },\n })\n}\n\nconst skeleton = async (\n input: SkeletonFnInput<Context, Params>,\n): Promise<SkeletonState> => {\n const { params, ctx } = input\n const actorDid = params.hydrateCtx.viewer\n if (clearlyBadCursor(params.cursor)) {\n return { actorDid, dids: [] }\n }\n const { dids, cursor } =\n await ctx.hydrator.dataplane.getActivitySubscriptionDids({\n actorDid: params.hydrateCtx.viewer,\n limit: params.limit,\n cursor: params.cursor,\n })\n return {\n actorDid,\n dids: dids as DidString[],\n cursor,\n }\n}\n\nconst hydration = async (\n input: HydrationFnInput<Context, Params, SkeletonState>,\n) => {\n const { ctx, params, skeleton } = input\n const { dids } = skeleton\n const state = await ctx.hydrator.hydrateProfilesDetailed(\n dids,\n params.hydrateCtx,\n )\n return state\n}\n\nconst noBlocks = (input: RulesFnInput<Context, Params, SkeletonState>) => {\n const { skeleton, hydration, ctx } = input\n skeleton.dids = skeleton.dids.filter(\n (did) => !ctx.views.viewerBlockExists(did, hydration),\n )\n return skeleton\n}\n\nconst presentation = (\n input: PresentationFnInput<Context, Params, SkeletonState>,\n) => {\n const { ctx, hydration, skeleton } = input\n const { dids, cursor } = skeleton\n const subscriptions = mapDefined(dids, (did) => {\n return ctx.views.profile(did, hydration)\n })\n return { subscriptions, cursor }\n}\n\ntype Context = {\n hydrator: Hydrator\n views: Views\n}\n\ntype Params = app.bsky.notification.listActivitySubscriptions.$Params & {\n hydrateCtx: HydrateCtxWithViewer\n}\n\ntype SkeletonState = {\n actorDid: DidString\n dids: DidString[]\n cursor?: string\n}\n"]}

package/dist/api/app/bsky/notification/listNotifications.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"listNotifications.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/notification/listNotifications.ts"],"names":[],"mappings":"AAEA,OAAO,EAAuB,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAEvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAmBxD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,~~QA2CvD~~;~~AA0BD~~;;;;;GAKG;AACH,eAAO,MAAM,WAAW,cACX,MAAM,GAAG,SAAS,WACpB,MAAM,KACd,MAMF,CAAA"}
1	+ {"version":3,"file":"listNotifications.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/notification/listNotifications.ts"],"names":[],"mappings":"AAEA,OAAO,EAAuB,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAEvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAmBxD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAuCvD;AAwBD;;;;;GAKG;AACH,eAAO,MAAM,WAAW,cACX,MAAM,GAAG,SAAS,WACpB,MAAM,KACd,MAMF,CAAA"}

package/dist/api/app/bsky/notification/listNotifications.js CHANGED Viewed

@@ -16,10 +16,6 @@ export default function (server, ctx) {
             const viewer = auth.credentials.iss;
             const labelers = ctx.reqLabelers(req);
             const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer });
-            // @NOTE the viewer's priority setting and last-seen time don't change
-            // across the pages that fillPage() may fetch, so they're read once here
-            // rather than on every page.
-            const priority = params.priority ?? (await getPriority(ctx, viewer));
             const lastSeenRes = await ctx.hydrator.dataplane.getNotificationSeen({
                 actorDid: viewer,
             });
@@ -27,7 +23,7 @@ export default function (server, ctx) {
             const result = await fillPage({
                 cursor: params.cursor,
                 limit: params.limit,
-                fetch: ({ cursor, limit }) => listNotifications({ ...params, cursor, limit, hydrateCtx, priority, lastSeen }, ctx),
+                fetch: ({ cursor, limit }) => listNotifications({ ...params, cursor, limit, hydrateCtx, lastSeen }, ctx),
                 items: (r) => r.notifications,
             });
             return {
@@ -39,10 +35,9 @@ export default function (server, ctx) {
     });
 }
 const paginateNotifications = async (opts) => {
-    const { ctx, priority, reasons, limit, viewer } = opts;
+    const { ctx, reasons, limit, viewer } = opts;
     const res = await ctx.hydrator.dataplane.getNotifications({
         actorDid: viewer,
-        priority,
         cursor: opts.cursor,
         limit,
     });
@@ -73,10 +68,8 @@ const skeleton = async (input) => {
     const originalCursor = params.cursor;
     const delayedCursor = delayCursor(originalCursor, ctx.cfg.notificationsDelayMs);
     const viewer = params.hydrateCtx.viewer;
-    const { priority } = params;
     const res = await paginateNotifications({
         ctx,
-        priority,
         reasons: params.reasons,
         cursor: delayedCursor,
         limit: params.limit,
@@ -90,8 +83,7 @@ const skeleton = async (input) => {
     }
     return {
         notifs: res.notifications,
-        cursor: res.cursor || undefined,
-        priority,
+        cursor: res.cursor,
         lastSeenNotifs: lastSeenDate
             ? lastSeenDate.toISOString()
             : undefined,
@@ -167,14 +159,7 @@ const presentation = (input) => {
     return {
         notifications,
         cursor,
-        priority: skeleton.priority,
         seenAt: skeleton.lastSeenNotifs,
     };
 };
-const getPriority = async (ctx, did) => {
-    const actors = await ctx.hydrator.actor.getActors([did], {
-        skipCacheForDids: [did],
-    });
-    return !!actors.get(did)?.priorityNotifications;
-};
 //# sourceMappingURL=listNotifications.js.map

package/dist/api/app/bsky/notification/listNotifications.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"listNotifications.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/notification/listNotifications.ts"],"names":[],"mappings":"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","sourcesContent":["import { mapDefined } from '@atproto/common'\nimport type { AtUriString, DatetimeString, DidString } from '@atproto/syntax'\nimport { InvalidRequestError, type Server } from '@atproto/xrpc-server'\nimport type { ServerConfig } from '../../../../config.js'\nimport type { AppContext } from '../../../../context.js'\nimport type {\n HydrateCtxWithViewer,\n Hydrator,\n} from '../../../../hydration/hydrator.js'\nimport { app } from '../../../../lexicons/index.js'\nimport {\n type HydrationFnInput,\n type PresentationFnInput,\n type RulesFnInput,\n type SkeletonFnInput,\n createPipeline,\n} from '../../../../pipeline.js'\nimport type { Notification } from '../../../../proto/bsky_pb.js'\nimport { uriToDid as didFromUri } from '../../../../util/uris.js'\nimport type { Views } from '../../../../views/index.js'\nimport { isPostRecordType } from '../../../../views/types.js'\nimport { fillPage, resHeaders } from '../../../util.js'\n\nexport default function (server: Server, ctx: AppContext) {\n const listNotifications = createPipeline(\n skeleton,\n hydration,\n noBlockOrMutesOrNeedsFiltering,\n presentation,\n )\n server.add(app.bsky.notification.listNotifications, {\n auth: ctx.authVerifier.standard,\n handler: async ({ params, auth, req }) => {\n if (params.seenAt) {\n throw new InvalidRequestError('The seenAt parameter is unsupported')\n }\n const viewer = auth.credentials.iss\n const labelers = ctx.reqLabelers(req)\n const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer })\n\n // @NOTE the viewer's priority setting and last-seen time don't change\n // across the pages that fillPage() may fetch, so they're read once here\n // rather than on every page.\n const priority = params.priority ?? (await getPriority(ctx, viewer))\n const lastSeenRes = await ctx.hydrator.dataplane.getNotificationSeen({\n actorDid: viewer,\n })\n const lastSeen = lastSeenRes.timestamp?.toDate()\n\n const result = await fillPage({\n cursor: params.cursor,\n limit: params.limit,\n fetch: ({ cursor, limit }) =>\n listNotifications(\n { ...params, cursor, limit, hydrateCtx, priority, lastSeen },\n ctx,\n ),\n items: (r) => r.notifications,\n })\n return {\n encoding: 'application/json',\n body: result,\n headers: resHeaders({ labelers: hydrateCtx.labelers }),\n }\n },\n })\n}\n\nconst paginateNotifications = async (opts: {\n ctx: Context\n priority: boolean\n reasons?: string[]\n cursor?: string\n limit: number\n viewer: string\n}) => {\n const { ctx, priority, reasons, limit, viewer } = opts\n\n const res = await ctx.hydrator.dataplane.getNotifications({\n actorDid: viewer,\n priority,\n cursor: opts.cursor,\n limit,\n })\n return {\n notifications: reasons\n ? res.notifications.filter((notif) => reasons.includes(notif.reason))\n : res.notifications,\n cursor: res.cursor,\n }\n}\n\n/*\n Applies a configurable delay to the datetime string of a cursor,\n * effectively allowing for a delay on listing the notifications.\n * This is useful to allow time for services to process notifications\n * before they are listed to the user.\n */\nexport const delayCursor = (\n cursorStr: string \| undefined,\n delayMs: number,\n): string => {\n const nowMinusDelay = Date.now() - delayMs\n if (cursorStr === undefined) return new Date(nowMinusDelay).toISOString()\n const cursor = new Date(cursorStr).getTime()\n if (isNaN(cursor)) return cursorStr\n return new Date(Math.min(cursor, nowMinusDelay)).toISOString()\n}\n\nconst skeleton = async (\n input: SkeletonFnInput<Context, Params>,\n): Promise<SkeletonState> => {\n const { params, ctx } = input\n const originalCursor = params.cursor\n const delayedCursor = delayCursor(\n originalCursor,\n ctx.cfg.notificationsDelayMs,\n )\n const viewer = params.hydrateCtx.viewer\n const { priority } = params\n const res = await paginateNotifications({\n ctx,\n priority,\n reasons: params.reasons,\n cursor: delayedCursor,\n limit: params.limit,\n viewer,\n })\n // @NOTE for the first page of results if there's no last-seen time, consider top notification unread\n // rather than all notifications. bit of a hack to be more graceful when seen times are out of sync.\n let lastSeenDate = params.lastSeen\n if (!lastSeenDate && !originalCursor) {\n lastSeenDate = res.notifications.at(0)?.timestamp?.toDate()\n }\n return {\n notifs: res.notifications,\n cursor: res.cursor \|\| undefined,\n priority,\n lastSeenNotifs: lastSeenDate\n ? (lastSeenDate.toISOString() as DatetimeString)\n : undefined,\n }\n}\n\nconst hydration = async (\n input: HydrationFnInput<Context, Params, SkeletonState>,\n) => {\n const { skeleton, params, ctx } = input\n return ctx.hydrator.hydrateNotifications(skeleton.notifs, params.hydrateCtx)\n}\n\nconst noBlockOrMutesOrNeedsFiltering = (\n input: RulesFnInput<Context, Params, SkeletonState>,\n) => {\n const { skeleton, hydration, ctx, params } = input\n skeleton.notifs = skeleton.notifs.filter((item) => {\n const uri = item.uri as AtUriString\n const did = didFromUri(uri)\n if (\n ctx.views.viewerBlockExists(did, hydration) \|\|\n ctx.views.viewerMuteExists(did, hydration)\n ) {\n return false\n }\n // Filter out hidden replies only if the viewer owns\n // the threadgate and they hid the reply.\n if (item.reason === 'reply') {\n const post = hydration.posts?.get(uri)\n if (post) {\n const rootPostUri = isPostRecordType(post.record)\n ? post.record.reply?.root.uri\n : undefined\n const isRootPostByViewer =\n rootPostUri && didFromUri(rootPostUri) === params.hydrateCtx?.viewer\n const isHiddenByThreadgate = isRootPostByViewer\n ? ctx.views.replyIsHiddenByThreadgate(uri, rootPostUri, hydration)\n : false\n if (isHiddenByThreadgate) {\n return false\n }\n }\n }\n // Filter out notifications from users that have thread hide tags and are from people they\n // are not following\n if (\n item.reason === 'reply' \|\|\n item.reason === 'quote' \|\|\n item.reason === 'mention'\n ) {\n const post = hydration.posts?.get(uri)\n if (post) {\n for (const [tag] of post.tags.entries()) {\n if (ctx.cfg.threadTagsHide.has(tag)) {\n if (!hydration.profileViewers?.get(did)?.following) {\n return false\n } else {\n break\n }\n }\n }\n }\n }\n // Filter out notifications from users that need review unless moots\n if (\n item.reason === 'reply' \|\|\n item.reason === 'quote' \|\|\n item.reason === 'mention' \|\|\n item.reason === 'like' \|\|\n item.reason === 'follow'\n ) {\n if (!ctx.views.viewerSeesNeedsReview({ did, uri }, hydration)) {\n return false\n }\n }\n return true\n })\n return skeleton\n}\n\nconst presentation = (\n input: PresentationFnInput<Context, Params, SkeletonState>,\n): app.bsky.notification.listNotifications.$OutputBody => {\n const { skeleton, hydration, ctx } = input\n const { notifs, lastSeenNotifs, cursor } = skeleton\n const notifications = mapDefined(notifs, (notif) =>\n ctx.views.notification(notif, lastSeenNotifs, hydration),\n )\n return {\n notifications,\n cursor,\n priority: skeleton.priority,\n seenAt: skeleton.lastSeenNotifs,\n }\n}\n\ntype Context = {\n hydrator: Hydrator\n views: Views\n cfg: ServerConfig\n}\n\ntype Params = Omit<\n app.bsky.notification.listNotifications.$Params,\n 'priority'\n> & {\n hydrateCtx: HydrateCtxWithViewer\n priority: boolean\n lastSeen?: Date\n}\n\ntype SkeletonState = {\n notifs: Notification[]\n priority: boolean\n lastSeenNotifs?: DatetimeString\n cursor?: string\n}\n\nconst getPriority = async (ctx: Context, did: DidString) => {\n const actors = await ctx.hydrator.actor.getActors([did], {\n skipCacheForDids: [did],\n })\n return !!actors.get(did)?.priorityNotifications\n}\n"]}
1	+ {"version":3,"file":"listNotifications.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/notification/listNotifications.ts"],"names":[],"mappings":"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","sourcesContent":["import { mapDefined } from '@atproto/common'\nimport type { AtUriString, DatetimeString } from '@atproto/syntax'\nimport { InvalidRequestError, type Server } from '@atproto/xrpc-server'\nimport type { ServerConfig } from '../../../../config.js'\nimport type { AppContext } from '../../../../context.js'\nimport type {\n HydrateCtxWithViewer,\n Hydrator,\n} from '../../../../hydration/hydrator.js'\nimport { app } from '../../../../lexicons/index.js'\nimport {\n type HydrationFnInput,\n type PresentationFnInput,\n type RulesFnInput,\n type SkeletonFnInput,\n createPipeline,\n} from '../../../../pipeline.js'\nimport type { Notification } from '../../../../proto/bsky_pb.js'\nimport { uriToDid as didFromUri } from '../../../../util/uris.js'\nimport type { Views } from '../../../../views/index.js'\nimport { isPostRecordType } from '../../../../views/types.js'\nimport { fillPage, resHeaders } from '../../../util.js'\n\nexport default function (server: Server, ctx: AppContext) {\n const listNotifications = createPipeline(\n skeleton,\n hydration,\n noBlockOrMutesOrNeedsFiltering,\n presentation,\n )\n server.add(app.bsky.notification.listNotifications, {\n auth: ctx.authVerifier.standard,\n handler: async ({ params, auth, req }) => {\n if (params.seenAt) {\n throw new InvalidRequestError('The seenAt parameter is unsupported')\n }\n const viewer = auth.credentials.iss\n const labelers = ctx.reqLabelers(req)\n const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer })\n\n const lastSeenRes = await ctx.hydrator.dataplane.getNotificationSeen({\n actorDid: viewer,\n })\n const lastSeen = lastSeenRes.timestamp?.toDate()\n\n const result = await fillPage({\n cursor: params.cursor,\n limit: params.limit,\n fetch: ({ cursor, limit }) =>\n listNotifications(\n { ...params, cursor, limit, hydrateCtx, lastSeen },\n ctx,\n ),\n items: (r) => r.notifications,\n })\n return {\n encoding: 'application/json',\n body: result,\n headers: resHeaders({ labelers: hydrateCtx.labelers }),\n }\n },\n })\n}\n\nconst paginateNotifications = async (opts: {\n ctx: Context\n reasons?: string[]\n cursor?: string\n limit: number\n viewer: string\n}) => {\n const { ctx, reasons, limit, viewer } = opts\n\n const res = await ctx.hydrator.dataplane.getNotifications({\n actorDid: viewer,\n cursor: opts.cursor,\n limit,\n })\n return {\n notifications: reasons\n ? res.notifications.filter((notif) => reasons.includes(notif.reason))\n : res.notifications,\n cursor: res.cursor,\n }\n}\n\n/*\n Applies a configurable delay to the datetime string of a cursor,\n * effectively allowing for a delay on listing the notifications.\n * This is useful to allow time for services to process notifications\n * before they are listed to the user.\n */\nexport const delayCursor = (\n cursorStr: string \| undefined,\n delayMs: number,\n): string => {\n const nowMinusDelay = Date.now() - delayMs\n if (cursorStr === undefined) return new Date(nowMinusDelay).toISOString()\n const cursor = new Date(cursorStr).getTime()\n if (isNaN(cursor)) return cursorStr\n return new Date(Math.min(cursor, nowMinusDelay)).toISOString()\n}\n\nconst skeleton = async (\n input: SkeletonFnInput<Context, Params>,\n): Promise<SkeletonState> => {\n const { params, ctx } = input\n const originalCursor = params.cursor\n const delayedCursor = delayCursor(\n originalCursor,\n ctx.cfg.notificationsDelayMs,\n )\n const viewer = params.hydrateCtx.viewer\n const res = await paginateNotifications({\n ctx,\n reasons: params.reasons,\n cursor: delayedCursor,\n limit: params.limit,\n viewer,\n })\n // @NOTE for the first page of results if there's no last-seen time, consider top notification unread\n // rather than all notifications. bit of a hack to be more graceful when seen times are out of sync.\n let lastSeenDate = params.lastSeen\n if (!lastSeenDate && !originalCursor) {\n lastSeenDate = res.notifications.at(0)?.timestamp?.toDate()\n }\n return {\n notifs: res.notifications,\n cursor: res.cursor,\n lastSeenNotifs: lastSeenDate\n ? (lastSeenDate.toISOString() as DatetimeString)\n : undefined,\n }\n}\n\nconst hydration = async (\n input: HydrationFnInput<Context, Params, SkeletonState>,\n) => {\n const { skeleton, params, ctx } = input\n return ctx.hydrator.hydrateNotifications(skeleton.notifs, params.hydrateCtx)\n}\n\nconst noBlockOrMutesOrNeedsFiltering = (\n input: RulesFnInput<Context, Params, SkeletonState>,\n) => {\n const { skeleton, hydration, ctx, params } = input\n skeleton.notifs = skeleton.notifs.filter((item) => {\n const uri = item.uri as AtUriString\n const did = didFromUri(uri)\n if (\n ctx.views.viewerBlockExists(did, hydration) \|\|\n ctx.views.viewerMuteExists(did, hydration)\n ) {\n return false\n }\n // Filter out hidden replies only if the viewer owns\n // the threadgate and they hid the reply.\n if (item.reason === 'reply') {\n const post = hydration.posts?.get(uri)\n if (post) {\n const rootPostUri = isPostRecordType(post.record)\n ? post.record.reply?.root.uri\n : undefined\n const isRootPostByViewer =\n rootPostUri && didFromUri(rootPostUri) === params.hydrateCtx?.viewer\n const isHiddenByThreadgate = isRootPostByViewer\n ? ctx.views.replyIsHiddenByThreadgate(uri, rootPostUri, hydration)\n : false\n if (isHiddenByThreadgate) {\n return false\n }\n }\n }\n // Filter out notifications from users that have thread hide tags and are from people they\n // are not following\n if (\n item.reason === 'reply' \|\|\n item.reason === 'quote' \|\|\n item.reason === 'mention'\n ) {\n const post = hydration.posts?.get(uri)\n if (post) {\n for (const [tag] of post.tags.entries()) {\n if (ctx.cfg.threadTagsHide.has(tag)) {\n if (!hydration.profileViewers?.get(did)?.following) {\n return false\n } else {\n break\n }\n }\n }\n }\n }\n // Filter out notifications from users that need review unless moots\n if (\n item.reason === 'reply' \|\|\n item.reason === 'quote' \|\|\n item.reason === 'mention' \|\|\n item.reason === 'like' \|\|\n item.reason === 'follow'\n ) {\n if (!ctx.views.viewerSeesNeedsReview({ did, uri }, hydration)) {\n return false\n }\n }\n return true\n })\n return skeleton\n}\n\nconst presentation = (\n input: PresentationFnInput<Context, Params, SkeletonState>,\n): app.bsky.notification.listNotifications.$OutputBody => {\n const { skeleton, hydration, ctx } = input\n const { notifs, lastSeenNotifs, cursor } = skeleton\n const notifications = mapDefined(notifs, (notif) =>\n ctx.views.notification(notif, lastSeenNotifs, hydration),\n )\n return {\n notifications,\n cursor,\n seenAt: skeleton.lastSeenNotifs,\n }\n}\n\ntype Context = {\n hydrator: Hydrator\n views: Views\n cfg: ServerConfig\n}\n\ntype Params = app.bsky.notification.listNotifications.$Params & {\n hydrateCtx: HydrateCtxWithViewer\n lastSeen?: Date\n}\n\ntype SkeletonState = {\n notifs: Notification[]\n lastSeenNotifs?: DatetimeString\n cursor?: string\n}\n"]}

package/dist/api/app/bsky/notification/putPreferences.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"putPreferences.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/notification/putPreferences.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;~~AAGxD~~,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,~~QAYvD~~"}
1	+ {"version":3,"file":"putPreferences.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/notification/putPreferences.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAKxD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAsBvD"}

package/dist/api/app/bsky/notification/putPreferences.js CHANGED Viewed

@@ -1,13 +1,25 @@
 import { app } from '../../../../lexicons/index.js';
+import { Namespaces } from '../../../../stash.js';
+import { getNotificationPreferences } from './util.js';
 export default function (server, ctx) {
     server.add(app.bsky.notification.putPreferences, {
         auth: ctx.authVerifier.standard,
         handler: async ({ input, auth }) => {
             const { priority } = input.body;
             const viewer = auth.credentials.iss;
-            await ctx.bsyncClient.addNotifOperation({
+            const currentPreferences = await getNotificationPreferences(ctx, viewer);
+            const include = priority ? 'follows' : 'all';
+            const preferences = {
+                ...currentPreferences,
+                reply: { ...currentPreferences.reply, include },
+                mention: { ...currentPreferences.mention, include },
+                quote: { ...currentPreferences.quote, include },
+            };
+            await ctx.stashClient.update({
                 actorDid: viewer,
-                priority,
+                namespace: Namespaces.AppBskyNotificationDefsPreferences,
+                key: 'self',
+                payload: preferences,
             });
         },
     });

package/dist/api/app/bsky/notification/putPreferences.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"putPreferences.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/notification/putPreferences.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAA;~~AAEnD~~,MAAM,CAAC,OAAO,WAAW,MAAc,EAAE,GAAe;IACtD,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE;QAC/C,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,QAAQ;QAC/B,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE;YACjC,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC,IAAI,CAAA;YAC/B,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAA;YACnC,MAAM,GAAG,CAAC,WAAW,CAAC,~~iBAAiB~~,CAAC;~~gBACtC~~,QAAQ,EAAE,MAAM;gBAChB,~~QAAQ~~;~~aACT~~,CAAC,CAAA;QACJ,CAAC;KACF,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import type { Server } from '@atproto/xrpc-server'\nimport type { AppContext } from '../../../../context.js'\nimport { app } from '../../../../lexicons/index.js'\n\nexport default function (server: Server, ctx: AppContext) {\n server.add(app.bsky.notification.putPreferences, {\n auth: ctx.authVerifier.standard,\n handler: async ({ input, auth }) => {\n const { priority } = input.body\n const viewer = auth.credentials.iss\n await ctx.~~bsyncClient~~.~~addNotifOperation~~({\n actorDid: viewer,\n ~~priority~~,\n })\n },\n })\n}\n"]}
1	+ {"version":3,"file":"putPreferences.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/notification/putPreferences.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAA;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAA;AAEtD,MAAM,CAAC,OAAO,WAAW,MAAc,EAAE,GAAe;IACtD,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE;QAC/C,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,QAAQ;QAC/B,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE;YACjC,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC,IAAI,CAAA;YAC/B,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAA;YACnC,MAAM,kBAAkB,GAAG,MAAM,0BAA0B,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;YACxE,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAA;YAC5C,MAAM,WAAW,GAAG;gBAClB,GAAG,kBAAkB;gBACrB,KAAK,EAAE,EAAE,GAAG,kBAAkB,CAAC,KAAK,EAAE,OAAO,EAAE;gBAC/C,OAAO,EAAE,EAAE,GAAG,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE;gBACnD,KAAK,EAAE,EAAE,GAAG,kBAAkB,CAAC,KAAK,EAAE,OAAO,EAAE;aAChD,CAAA;YACD,MAAM,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC;gBAC3B,QAAQ,EAAE,MAAM;gBAChB,SAAS,EAAE,UAAU,CAAC,kCAAkC;gBACxD,GAAG,EAAE,MAAM;gBACX,OAAO,EAAE,WAAW;aACrB,CAAC,CAAA;QACJ,CAAC;KACF,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import type { Server } from '@atproto/xrpc-server'\nimport type { AppContext } from '../../../../context.js'\nimport { app } from '../../../../lexicons/index.js'\nimport { Namespaces } from '../../../../stash.js'\nimport { getNotificationPreferences } from './util.js'\n\nexport default function (server: Server, ctx: AppContext) {\n server.add(app.bsky.notification.putPreferences, {\n auth: ctx.authVerifier.standard,\n handler: async ({ input, auth }) => {\n const { priority } = input.body\n const viewer = auth.credentials.iss\n const currentPreferences = await getNotificationPreferences(ctx, viewer)\n const include = priority ? 'follows' : 'all'\n const preferences = {\n ...currentPreferences,\n reply: { ...currentPreferences.reply, include },\n mention: { ...currentPreferences.mention, include },\n quote: { ...currentPreferences.quote, include },\n }\n await ctx.stashClient.update({\n actorDid: viewer,\n namespace: Namespaces.AppBskyNotificationDefsPreferences,\n key: 'self',\n payload: preferences,\n })\n },\n })\n}\n"]}

package/dist/api/app/bsky/notification/putPreferencesV2.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { type Server } from '@atproto/xrpc-server';
+import type { Server } from '@atproto/xrpc-server';
 import type { AppContext } from '../../../../context.js';
 export default function (server: Server, ctx: AppContext): void;
 //# sourceMappingURL=putPreferencesV2.d.ts.map

package/dist/api/app/bsky/notification/putPreferencesV2.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"putPreferencesV2.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/notification/putPreferencesV2.ts"],"names":[],"mappings":"~~AAEA~~,OAAO,EAAE,~~KAAK,~~MAAM,~~EAAwB~~,MAAM,sBAAsB,CAAA;~~AACxE~~,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;~~AAMxD~~,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAuBvD"}
1	+ {"version":3,"file":"putPreferencesV2.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/notification/putPreferencesV2.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AASxD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAuBvD"}

package/dist/api/app/bsky/notification/putPreferencesV2.js CHANGED Viewed

@@ -1,8 +1,6 @@
-import assert from 'node:assert';
-import { UpstreamFailureError } from '@atproto/xrpc-server';
 import { app } from '../../../../lexicons/index.js';
 import { Namespaces } from '../../../../stash.js';
-import { DEFAULT_CHAT_PREFERENCE, protobufToLex } from './util.js';
+import { DEFAULT_CHAT_PREFERENCE, getNotificationPreferences, mergeNotificationPreferences, } from './util.js';
 export default function (server, ctx) {
     server.add(app.bsky.notification.putPreferencesV2, {
         auth: ctx.authVerifier.standard,
@@ -26,18 +24,8 @@ export default function (server, ctx) {
     });
 }
 const computePreferences = async (ctx, actorDid, input) => {
-    let res;
-    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 };
+    const currentPreferences = await getNotificationPreferences(ctx, actorDid);
+    const preferences = mergeNotificationPreferences(currentPreferences, input.body);
     // NOTE: See the deprecation notice on the lexicon. This field returns a static default value and shouldn't be used.
     // Use the chat.bsky.notification.defs#preferences type instead.
     preferences.chat = DEFAULT_CHAT_PREFERENCE;

package/dist/api/app/bsky/notification/putPreferencesV2.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"putPreferencesV2.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/notification/putPreferencesV2.ts"],"names":[],"mappings":"~~AAAA~~,OAAO,~~MAAM,MAAM,aAAa,CAAA;AAEhC,OAAO,EAAe,oBAAoB,~~EAAE,~~MAAM,sBAAsB,CAAA;AAExE,OAAO,EAAE,~~GAAG,EAAE,MAAM,+BAA+B,CAAA;~~AAEnD~~,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,~~EAAE~~,uBAAuB,~~EAAE~~,~~aAAa~~,~~EAAE~~,MAAM,WAAW,CAAA;~~AAElE~~,MAAM,CAAC,OAAO,WAAW,MAAc,EAAE,GAAe;IACtD,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE;QACjD,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,QAAQ;QAC/B,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;YACjC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAA;YACrC,MAAM,WAAW,GAAG,MAAM,kBAAkB,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAA;YAElE,oGAAoG;YACpG,MAAM,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC;gBAC3B,QAAQ;gBACR,SAAS,EAAE,UAAU,CAAC,kCAAkC;gBACxD,GAAG,EAAE,MAAM;gBACX,OAAO,EAAE,WAAW;aACrB,CAAC,CAAA;YAEF,OAAO;gBACL,QAAQ,EAAE,kBAAkB;gBAC5B,IAAI,EAAE;oBACJ,WAAW;iBACZ;aACF,CAAA;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,kBAAkB,GAAG,KAAK,EAC9B,GAAe,EACf,QAAgB,EAChB,KAAoD,EACO,EAAE;IAC7D,~~IAAI~~,~~GAAuC~~,~~CAAA;IAC3C,IAAI,CAAC;QACH,~~GAAG,~~GAAG,~~MAAM,~~GAAG,CAAC,SAAS,CAAC,~~0BAA0B,CAAC~~;YACnD~~,~~IAAI~~,EAAE,~~CAAC,~~QAAQ,CAAC~~;SACjB~~,~~CAAC,~~CAAA;~~IACJ~~,~~CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,~~MAAM,~~IAAI,oBAAoB,CAC5B,6CAA6C,EAC7C,+BAA+B,EAC/B,EAAE,KAAK,EAAE,GAAG,EAAE,CACf,CAAA;IACH,CAAC;IAED,MAAM,CACJ,GAAG,CAAC,~~WAAW,~~CAAC,MAAM,KAAK,CAAC,EAC5B,+CAA+C,~~GAAG,~~CAAC~~,~~WAAW~~,~~CAAC,MAAM,EAAE,CACxE,CAAA;IAED,MAAM,~~kBAAkB,~~GAAG~~,~~aAAa,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA;IAC5D,MAAM,WAAW,GAAG,EAAE,GAAG,kBAAkB,EAAE,GAAG,~~KAAK,CAAC,IAAI,~~EAAE~~,CAAA;~~IAC5D~~,oHAAoH;IACpH,gEAAgE;IAChE,WAAW,CAAC,IAAI,GAAG,uBAAuB,CAAA;IAC1C,OAAO,WAAW,CAAA;AACpB,CAAC,CAAA","sourcesContent":["import ~~assert from 'node:assert'\nimport~~ type { Un$Typed } from '@atproto/lex'\nimport { ~~type~~ Server, ~~UpstreamFailureError~~ } from '@atproto/xrpc-server'\nimport type { AppContext } from '../../../../context.js'\nimport { app } from '../../../../lexicons/index.js'\nimport ~~type~~ { ~~GetNotificationPreferencesResponse } from '../../../../proto/bsky_pb.js'\nimport {~~ Namespaces } from '../../../../stash.js'\nimport { DEFAULT_CHAT_PREFERENCE~~, protobufToLex~~ } from './util.js'\n\nexport default function (server: Server, ctx: AppContext) {\n server.add(app.bsky.notification.putPreferencesV2, {\n auth: ctx.authVerifier.standard,\n handler: async ({ auth, input }) => {\n const actorDid = auth.credentials.iss\n const preferences = await computePreferences(ctx, actorDid, input)\n\n // Notification preferences are created automatically on the dataplane on signup, so we just update.\n await ctx.stashClient.update({\n actorDid,\n namespace: Namespaces.AppBskyNotificationDefsPreferences,\n key: 'self',\n payload: preferences,\n })\n\n return {\n encoding: 'application/json',\n body: {\n preferences,\n },\n }\n },\n })\n}\n\nconst computePreferences = async (\n ctx: AppContext,\n actorDid: string,\n input: app.bsky.notification.putPreferencesV2.$Input,\n): Promise<Un$Typed<app.bsky.notification.defs.Preferences>> => {\n ~~let~~ ~~res:~~ ~~GetNotificationPreferencesResponse\n try {\n res~~ = await ~~ctx.dataplane.~~getNotificationPreferences(~~{\n dids:~~ [actorDid~~],\n }~~)\n } ~~catch (err) {\n throw new UpstreamFailureError(\n 'cannot get current notification~~ preferences~~',\n 'NotificationPreferencesFailed',\n {~~ ~~cause:~~ ~~err },\n )\n }\n\n assert~~(\n ~~res.preferences.length === 1~~,\n ~~`expected exactly one preferences entry, got ${res~~.~~preferences.length}`,\~~n )\n\n ~~const currentPreferences = protobufToLex(res.preferences[0])\n const preferences = { ...currentPreferences, ...input.body }\n~~ // NOTE: See the deprecation notice on the lexicon. This field returns a static default value and shouldn't be used.\n // Use the chat.bsky.notification.defs#preferences type instead.\n preferences.chat = DEFAULT_CHAT_PREFERENCE\n return preferences\n}\n"]}
1	+ {"version":3,"file":"putPreferencesV2.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/notification/putPreferencesV2.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAA;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EACL,uBAAuB,EACvB,0BAA0B,EAC1B,4BAA4B,GAC7B,MAAM,WAAW,CAAA;AAElB,MAAM,CAAC,OAAO,WAAW,MAAc,EAAE,GAAe;IACtD,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE;QACjD,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,QAAQ;QAC/B,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;YACjC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAA;YACrC,MAAM,WAAW,GAAG,MAAM,kBAAkB,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAA;YAElE,oGAAoG;YACpG,MAAM,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC;gBAC3B,QAAQ;gBACR,SAAS,EAAE,UAAU,CAAC,kCAAkC;gBACxD,GAAG,EAAE,MAAM;gBACX,OAAO,EAAE,WAAW;aACrB,CAAC,CAAA;YAEF,OAAO;gBACL,QAAQ,EAAE,kBAAkB;gBAC5B,IAAI,EAAE;oBACJ,WAAW;iBACZ;aACF,CAAA;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,kBAAkB,GAAG,KAAK,EAC9B,GAAe,EACf,QAAgB,EAChB,KAAoD,EACO,EAAE;IAC7D,MAAM,kBAAkB,GAAG,MAAM,0BAA0B,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;IAC1E,MAAM,WAAW,GAAG,4BAA4B,CAC9C,kBAAkB,EAClB,KAAK,CAAC,IAAI,CACX,CAAA;IACD,oHAAoH;IACpH,gEAAgE;IAChE,WAAW,CAAC,IAAI,GAAG,uBAAuB,CAAA;IAC1C,OAAO,WAAW,CAAA;AACpB,CAAC,CAAA","sourcesContent":["import type { Un$Typed } from '@atproto/lex'\nimport type { Server } from '@atproto/xrpc-server'\nimport type { AppContext } from '../../../../context.js'\nimport { app } from '../../../../lexicons/index.js'\nimport { Namespaces } from '../../../../stash.js'\nimport {\n DEFAULT_CHAT_PREFERENCE,\n getNotificationPreferences,\n mergeNotificationPreferences,\n} from './util.js'\n\nexport default function (server: Server, ctx: AppContext) {\n server.add(app.bsky.notification.putPreferencesV2, {\n auth: ctx.authVerifier.standard,\n handler: async ({ auth, input }) => {\n const actorDid = auth.credentials.iss\n const preferences = await computePreferences(ctx, actorDid, input)\n\n // Notification preferences are created automatically on the dataplane on signup, so we just update.\n await ctx.stashClient.update({\n actorDid,\n namespace: Namespaces.AppBskyNotificationDefsPreferences,\n key: 'self',\n payload: preferences,\n })\n\n return {\n encoding: 'application/json',\n body: {\n preferences,\n },\n }\n },\n })\n}\n\nconst computePreferences = async (\n ctx: AppContext,\n actorDid: string,\n input: app.bsky.notification.putPreferencesV2.$Input,\n): Promise<Un$Typed<app.bsky.notification.defs.Preferences>> => {\n const currentPreferences = await getNotificationPreferences(ctx, actorDid)\n const preferences = mergeNotificationPreferences(\n currentPreferences,\n input.body,\n )\n // NOTE: See the deprecation notice on the lexicon. This field returns a static default value and shouldn't be used.\n // Use the chat.bsky.notification.defs#preferences type instead.\n preferences.chat = DEFAULT_CHAT_PREFERENCE\n return preferences\n}\n"]}

package/dist/api/app/bsky/notification/util.d.ts CHANGED Viewed

@@ -1,9 +1,14 @@
+import type { Un$Typed } from '@atproto/lex';
+import type { AppContext } from '../../../../context.js';
 import type { app } from '../../../../lexicons/index.js';
 import { type NotificationPreferences } from '../../../../proto/bsky_pb.js';
 import { AppPlatform } from '../../../../proto/courier_pb.js';
 type DeepPartial<T> = T extends object ? {
     [P in keyof T]?: DeepPartial<T[P]>;
 } : T;
+type LexNotificationPreferences = Un$Typed<app.bsky.notification.defs.Preferences>;
+export declare const mergeNotificationPreferences: (current: LexNotificationPreferences, updates: Partial<LexNotificationPreferences>) => LexNotificationPreferences;
+export declare const getNotificationPreferences: (ctx: AppContext, actorDid: string) => Promise<LexNotificationPreferences>;
 export declare const DEFAULT_CHAT_PREFERENCE: app.bsky.notification.defs.ChatPreference;
 export declare const protobufToLex: (res: DeepPartial<NotificationPreferences>) => app.bsky.notification.defs.Preferences;
 type LexPlatform = 'ios' | 'android' | 'web';

package/dist/api/app/bsky/notification/util.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/notification/util.ts"],"names":[],"mappings":"~~AAAA~~,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAA;AACxD,OAAO,~~EAIL~~,KAAK,uBAAuB,EAC7B,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAA;AAE7D,KAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,GAClC;KACG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACnC,GACD,CAAC,CAAA;~~AA0DL~~,eAAO,MAAM,uBAAuB,EAAE,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,cAI9D,CAAA;AAqBH,eAAO,MAAM,aAAa,QACnB,WAAW,CAAC,uBAAuB,CAAC,KACxC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,WAkB7B,CAAA;AAED,KAAK,WAAW,GAAG,KAAK,GAAG,SAAS,GAAG,KAAK,CAAA;AAE5C,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,QAAQ,IAAI,WAAW,CAIjC;AAED,eAAO,MAAM,0BAA0B,aAAc,MAAM,KAAG,WAKvC,CAAA"}
1	+ {"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/notification/util.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAE5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AACxD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAA;AACxD,OAAO,EAKL,KAAK,uBAAuB,EAC7B,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAA;AAE7D,KAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,GAClC;KACG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACnC,GACD,CAAC,CAAA;AAEL,KAAK,0BAA0B,GAC7B,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;AAoBlD,eAAO,MAAM,4BAA4B,YAC9B,0BAA0B,WAC1B,OAAO,CAAC,0BAA0B,CAAC,KAC3C,0BAQF,CAAA;AAED,eAAO,MAAM,0BAA0B,QAChC,UAAU,YACL,MAAM,KACf,OAAO,CAAC,0BAA0B,CAoBpC,CAAA;AA0DD,eAAO,MAAM,uBAAuB,EAAE,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,cAI9D,CAAA;AAqBH,eAAO,MAAM,aAAa,QACnB,WAAW,CAAC,uBAAuB,CAAC,KACxC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,WAkB7B,CAAA;AAED,KAAK,WAAW,GAAG,KAAK,GAAG,SAAS,GAAG,KAAK,CAAA;AAE5C,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,QAAQ,IAAI,WAAW,CAIjC;AAED,eAAO,MAAM,0BAA0B,aAAc,MAAM,KAAG,WAKvC,CAAA"}

package/dist/api/app/bsky/notification/util.js CHANGED Viewed

@@ -1,5 +1,44 @@
+import assert from 'node:assert';
+import { UpstreamFailureError } from '@atproto/xrpc-server';
 import { NotificationInclude, } from '../../../../proto/bsky_pb.js';
 import { AppPlatform } from '../../../../proto/courier_pb.js';
+const notificationPreferenceKeys = Object.keys({
+    chat: true,
+    follow: true,
+    like: true,
+    likeViaRepost: true,
+    mention: true,
+    quote: true,
+    reply: true,
+    repost: true,
+    repostViaRepost: true,
+    starterpackJoined: true,
+    subscribedPost: true,
+    unverified: true,
+    verified: true,
+});
+export const mergeNotificationPreferences = (current, updates) => {
+    const preferences = { ...current };
+    for (const key of notificationPreferenceKeys) {
+        if (updates[key] !== undefined) {
+            Object.assign(preferences, { [key]: updates[key] });
+        }
+    }
+    return preferences;
+};
+export const getNotificationPreferences = async (ctx, actorDid) => {
+    let res;
+    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}`);
+    return protobufToLex(res.preferences[0]);
+};
 const ensureChatPreference = (p) => {
     const includeValues = ['all', 'accepted'];
     return {

package/dist/api/app/bsky/notification/util.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"util.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/notification/util.ts"],"names":[],"mappings":"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","sourcesContent":["import type { app } from '../../../../lexicons/index.js'\nimport {\n type FilterableNotificationPreference,\n NotificationInclude,\n type NotificationPreference,\n type NotificationPreferences,\n} from '../../../../proto/bsky_pb.js'\nimport { AppPlatform } from '../../../../proto/courier_pb.js'\n\ntype DeepPartial<T> = T extends object\n ? {\n [P in keyof T]?: DeepPartial<T[P]>\n }\n : T\n\nconst ensureChatPreference = (\n p?: DeepPartial<app.bsky.notification.defs.ChatPreference>,\n): app.bsky.notification.defs.ChatPreference => {\n const includeValues = ['all', 'accepted']\n return {\n include:\n typeof p?.include === 'string' && includeValues.includes(p.include)\n ? p.include\n : 'all',\n push: p?.push ?? true,\n }\n}\n\nconst ensureFilterablePreference = (\n p?: DeepPartial<app.bsky.notification.defs.FilterablePreference>,\n): app.bsky.notification.defs.FilterablePreference => {\n const includeValues = ['all', 'follows']\n return {\n include:\n typeof p?.include === 'string' && includeValues.includes(p.include)\n ? p.include\n : 'all',\n list: p?.list ?? true,\n push: p?.push ?? true,\n }\n}\n\nconst ensurePreference = (\n p?: DeepPartial<app.bsky.notification.defs.Preference>,\n): app.bsky.notification.defs.Preference => {\n return {\n list: p?.list ?? true,\n push: p?.push ?? true,\n }\n}\n\nconst ensurePreferences = (\n p: DeepPartial<app.bsky.notification.defs.Preferences>,\n): app.bsky.notification.defs.Preferences => {\n return {\n chat: ensureChatPreference(p.chat),\n follow: ensureFilterablePreference(p.follow),\n like: ensureFilterablePreference(p.like),\n likeViaRepost: ensureFilterablePreference(p.likeViaRepost),\n mention: ensureFilterablePreference(p.mention),\n quote: ensureFilterablePreference(p.quote),\n reply: ensureFilterablePreference(p.reply),\n repost: ensureFilterablePreference(p.repost),\n repostViaRepost: ensureFilterablePreference(p.repostViaRepost),\n starterpackJoined: ensurePreference(p.starterpackJoined),\n subscribedPost: ensurePreference(p.subscribedPost),\n unverified: ensurePreference(p.unverified),\n verified: ensurePreference(p.verified),\n }\n}\n\nexport const DEFAULT_CHAT_PREFERENCE: app.bsky.notification.defs.ChatPreference =\n {\n include: 'all',\n push: true,\n }\n\nconst protobufFilterablePreferenceToLex = (\n p?: DeepPartial<FilterableNotificationPreference>,\n): Partial<app.bsky.notification.defs.FilterablePreference> => {\n return {\n include: p?.include === NotificationInclude.FOLLOWS ? 'follows' : 'all',\n list: p?.list?.enabled,\n push: p?.push?.enabled,\n }\n}\n\nconst protobufPreferenceToLex = (\n p?: DeepPartial<NotificationPreference>,\n): Partial<app.bsky.notification.defs.Preference> => {\n return {\n list: p?.list?.enabled,\n push: p?.push?.enabled,\n }\n}\n\nexport const protobufToLex = (\n res: DeepPartial<NotificationPreferences>,\n): app.bsky.notification.defs.Preferences => {\n return ensurePreferences({\n // NOTE: See the deprecation notice on the lexicon. This field returns a static default value and shouldn't be used.\n // Use the chat.bsky.notification.defs#preferences type instead.\n chat: DEFAULT_CHAT_PREFERENCE,\n follow: protobufFilterablePreferenceToLex(res.follow),\n like: protobufFilterablePreferenceToLex(res.like),\n likeViaRepost: protobufFilterablePreferenceToLex(res.likeViaRepost),\n mention: protobufFilterablePreferenceToLex(res.mention),\n quote: protobufFilterablePreferenceToLex(res.quote),\n reply: protobufFilterablePreferenceToLex(res.reply),\n repost: protobufFilterablePreferenceToLex(res.repost),\n repostViaRepost: protobufFilterablePreferenceToLex(res.repostViaRepost),\n starterpackJoined: protobufPreferenceToLex(res.starterpackJoined),\n subscribedPost: protobufPreferenceToLex(res.subscribedPost),\n unverified: protobufPreferenceToLex(res.unverified),\n verified: protobufPreferenceToLex(res.verified),\n })\n}\n\ntype LexPlatform = 'ios' \| 'android' \| 'web'\n\nexport function assertLexPlatform(\n platform: string,\n): asserts platform is LexPlatform {\n if (platform !== 'ios' && platform !== 'android' && platform !== 'web') {\n throw new Error('Unsupported platform: must be \"ios\", \"android\", or \"web\".')\n }\n}\n\nexport const lexPlatformToProtoPlatform = (platform: string): AppPlatform =>\n platform === 'ios'\n ? AppPlatform.IOS\n : platform === 'android'\n ? AppPlatform.ANDROID\n : AppPlatform.WEB\n"]}
1	+ {"version":3,"file":"util.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/notification/util.ts"],"names":[],"mappings":"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","sourcesContent":["import assert from 'node:assert'\nimport type { Un$Typed } from '@atproto/lex'\nimport { UpstreamFailureError } from '@atproto/xrpc-server'\nimport type { AppContext } from '../../../../context.js'\nimport type { app } from '../../../../lexicons/index.js'\nimport {\n type FilterableNotificationPreference,\n type GetNotificationPreferencesResponse,\n NotificationInclude,\n type NotificationPreference,\n type NotificationPreferences,\n} from '../../../../proto/bsky_pb.js'\nimport { AppPlatform } from '../../../../proto/courier_pb.js'\n\ntype DeepPartial<T> = T extends object\n ? {\n [P in keyof T]?: DeepPartial<T[P]>\n }\n : T\n\ntype LexNotificationPreferences =\n Un$Typed<app.bsky.notification.defs.Preferences>\n\nconst notificationPreferenceKeys = Object.keys({\n chat: true,\n follow: true,\n like: true,\n likeViaRepost: true,\n mention: true,\n quote: true,\n reply: true,\n repost: true,\n repostViaRepost: true,\n starterpackJoined: true,\n subscribedPost: true,\n unverified: true,\n verified: true,\n} satisfies Record<keyof LexNotificationPreferences, true>) as Array<\n keyof LexNotificationPreferences\n>\n\nexport const mergeNotificationPreferences = (\n current: LexNotificationPreferences,\n updates: Partial<LexNotificationPreferences>,\n): LexNotificationPreferences => {\n const preferences = { ...current }\n for (const key of notificationPreferenceKeys) {\n if (updates[key] !== undefined) {\n Object.assign(preferences, { [key]: updates[key] })\n }\n }\n return preferences\n}\n\nexport const getNotificationPreferences = async (\n ctx: AppContext,\n actorDid: string,\n): Promise<LexNotificationPreferences> => {\n let res: GetNotificationPreferencesResponse\n try {\n res = await ctx.dataplane.getNotificationPreferences({\n dids: [actorDid],\n })\n } catch (err) {\n throw new UpstreamFailureError(\n 'cannot get current notification preferences',\n 'NotificationPreferencesFailed',\n { cause: err },\n )\n }\n\n assert(\n res.preferences.length === 1,\n `expected exactly one preferences entry, got ${res.preferences.length}`,\n )\n\n return protobufToLex(res.preferences[0])\n}\n\nconst ensureChatPreference = (\n p?: DeepPartial<app.bsky.notification.defs.ChatPreference>,\n): app.bsky.notification.defs.ChatPreference => {\n const includeValues = ['all', 'accepted']\n return {\n include:\n typeof p?.include === 'string' && includeValues.includes(p.include)\n ? p.include\n : 'all',\n push: p?.push ?? true,\n }\n}\n\nconst ensureFilterablePreference = (\n p?: DeepPartial<app.bsky.notification.defs.FilterablePreference>,\n): app.bsky.notification.defs.FilterablePreference => {\n const includeValues = ['all', 'follows']\n return {\n include:\n typeof p?.include === 'string' && includeValues.includes(p.include)\n ? p.include\n : 'all',\n list: p?.list ?? true,\n push: p?.push ?? true,\n }\n}\n\nconst ensurePreference = (\n p?: DeepPartial<app.bsky.notification.defs.Preference>,\n): app.bsky.notification.defs.Preference => {\n return {\n list: p?.list ?? true,\n push: p?.push ?? true,\n }\n}\n\nconst ensurePreferences = (\n p: DeepPartial<app.bsky.notification.defs.Preferences>,\n): app.bsky.notification.defs.Preferences => {\n return {\n chat: ensureChatPreference(p.chat),\n follow: ensureFilterablePreference(p.follow),\n like: ensureFilterablePreference(p.like),\n likeViaRepost: ensureFilterablePreference(p.likeViaRepost),\n mention: ensureFilterablePreference(p.mention),\n quote: ensureFilterablePreference(p.quote),\n reply: ensureFilterablePreference(p.reply),\n repost: ensureFilterablePreference(p.repost),\n repostViaRepost: ensureFilterablePreference(p.repostViaRepost),\n starterpackJoined: ensurePreference(p.starterpackJoined),\n subscribedPost: ensurePreference(p.subscribedPost),\n unverified: ensurePreference(p.unverified),\n verified: ensurePreference(p.verified),\n }\n}\n\nexport const DEFAULT_CHAT_PREFERENCE: app.bsky.notification.defs.ChatPreference =\n {\n include: 'all',\n push: true,\n }\n\nconst protobufFilterablePreferenceToLex = (\n p?: DeepPartial<FilterableNotificationPreference>,\n): Partial<app.bsky.notification.defs.FilterablePreference> => {\n return {\n include: p?.include === NotificationInclude.FOLLOWS ? 'follows' : 'all',\n list: p?.list?.enabled,\n push: p?.push?.enabled,\n }\n}\n\nconst protobufPreferenceToLex = (\n p?: DeepPartial<NotificationPreference>,\n): Partial<app.bsky.notification.defs.Preference> => {\n return {\n list: p?.list?.enabled,\n push: p?.push?.enabled,\n }\n}\n\nexport const protobufToLex = (\n res: DeepPartial<NotificationPreferences>,\n): app.bsky.notification.defs.Preferences => {\n return ensurePreferences({\n // NOTE: See the deprecation notice on the lexicon. This field returns a static default value and shouldn't be used.\n // Use the chat.bsky.notification.defs#preferences type instead.\n chat: DEFAULT_CHAT_PREFERENCE,\n follow: protobufFilterablePreferenceToLex(res.follow),\n like: protobufFilterablePreferenceToLex(res.like),\n likeViaRepost: protobufFilterablePreferenceToLex(res.likeViaRepost),\n mention: protobufFilterablePreferenceToLex(res.mention),\n quote: protobufFilterablePreferenceToLex(res.quote),\n reply: protobufFilterablePreferenceToLex(res.reply),\n repost: protobufFilterablePreferenceToLex(res.repost),\n repostViaRepost: protobufFilterablePreferenceToLex(res.repostViaRepost),\n starterpackJoined: protobufPreferenceToLex(res.starterpackJoined),\n subscribedPost: protobufPreferenceToLex(res.subscribedPost),\n unverified: protobufPreferenceToLex(res.unverified),\n verified: protobufPreferenceToLex(res.verified),\n })\n}\n\ntype LexPlatform = 'ios' \| 'android' \| 'web'\n\nexport function assertLexPlatform(\n platform: string,\n): asserts platform is LexPlatform {\n if (platform !== 'ios' && platform !== 'android' && platform !== 'web') {\n throw new Error('Unsupported platform: must be \"ios\", \"android\", or \"web\".')\n }\n}\n\nexport const lexPlatformToProtoPlatform = (platform: string): AppPlatform =>\n platform === 'ios'\n ? AppPlatform.IOS\n : platform === 'android'\n ? AppPlatform.ANDROID\n : AppPlatform.WEB\n"]}

package/dist/api/util.js CHANGED Viewed

@@ -27,7 +27,7 @@ export const fillPage = async (opts) => {
         limit: opts.limit,
     }));
     const items = opts.items(result);
-    let cursor = result.cursor;
+    let cursor = result.cursor || undefined;
     for (let requests = 1; requests < maxRequests && cursor && items.length < enoughItems; requests++) {
         const previousCursor = cursor;
         const page = (await opts.fetch({
@@ -35,7 +35,7 @@ export const fillPage = async (opts) => {
             limit: opts.limit - items.length,
         }));
         items.push(...opts.items(page));
-        cursor = page.cursor;
+        cursor = page.cursor || undefined;
         if (cursor === previousCursor) {
             cursor = undefined;
             break;

package/dist/api/util.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/api/util.ts"],"names":[],"mappings":"AAEA,OAAO,EAAuB,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAErE,MAAM,CAAC,MAAM,eAAe,GAAG,aAAa,CAAA;AAC5C,MAAM,CAAC,MAAM,wBAAwB,GAAG,0BAA0B,CAAA;AAClE,MAAM,CAAC,MAAM,gBAAgB,GAAG,kBAAkB,CAAA;AAOlD,MAAM,CAAC,MAAM,UAAU,GAAG,CACxB,IAA4B,EACJ,EAAE;IAC1B,MAAM,OAAO,GAAG,EAAE,CAAA;IAClB,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;QAClB,OAAO,CAAC,wBAAwB,CAAC,GAAG,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IACxE,CAAC;IACD,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,OAAO,CAAC,gBAAgB,CAAC,GAAG,IAAI,CAAC,OAAO,CAAA;IAC1C,CAAC;IACD,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,MAAe,EAAE,EAAE;IAClD,8EAA8E;IAC9E,OAAO,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAA;AACjC,CAAC,CAAA;AAED,MAAM,8BAA8B,GAAG,EAAE,CAAA;AAOzC,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAG3B,IAMD,EAAmC,EAAE;IACpC,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,IAAI,8BAA8B,CAAA;IACtE,0EAA0E;IAC1E,iEAAiE;IACjE,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAA;IAC7C,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC;QAC/B,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,KAAK,EAAE,IAAI,CAAC,KAAK;KAClB,CAAC,CAA2B,CAAA;IAC7B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;IAChC,IAAI,MAAM,GAAG,MAAM,CAAC,MAAM,CAAA;~~IAC1B~~,KACE,IAAI,QAAQ,GAAG,CAAC,EAChB,QAAQ,GAAG,WAAW,IAAI,MAAM,IAAI,KAAK,CAAC,MAAM,GAAG,WAAW,EAC9D,QAAQ,EAAE,EACV,CAAC;QACD,MAAM,cAAc,GAAG,MAAM,CAAA;QAC7B,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC;YAC7B,MAAM;YACN,KAAK,EAAE,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,MAAM;SACjC,CAAC,CAA2B,CAAA;QAC7B,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;QAC/B,MAAM,GAAG,IAAI,CAAC,MAAM,CAAA;~~QACpB~~,IAAI,MAAM,KAAK,cAAc,EAAE,CAAC;YAC9B,MAAM,GAAG,SAAS,CAAA;YAClB,MAAK;QACP,CAAC;QACD,IAAI,CAAC,MAAM;YAAE,MAAK;IACpB,CAAC;IACD,OAAO,EAAE,GAAG,MAAM,EAAE,MAAM,EAA4B,CAAA;AACxD,CAAC,CAAA;AAED,4EAA4E;AAC5E,qFAAqF;AACrF,MAAM,yBAAyB,GAAG,2BAA2B,CAAA;AAE7D,MAAM,CAAC,MAAM,uBAAuB,GAAG,CACrC,GAAqC,EACrC,GAAiB,EACR,EAAE;IACX,MAAM,QAAQ,GAAG,GAAG,CAAC,sBAAsB,CAAA;IAC3C,IAAI,CAAC,QAAQ;QAAE,OAAO,KAAK,CAAA;IAC3B,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAA;IACpD,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;IAC7D,OAAO,MAAM,KAAK,QAAQ,CAAA;AAC5B,CAAC,CAAA","sourcesContent":["import type { IncomingHttpHeaders } from 'node:http'\nimport type { ServerConfig } from '../config.js'\nimport { type ParsedLabelers, formatLabelerHeader } from '../util.js'\n\nexport const BSKY_USER_AGENT = 'BskyAppView'\nexport const ATPROTO_CONTENT_LABELERS = 'Atproto-Content-Labelers'\nexport const ATPROTO_REPO_REV = 'Atproto-Repo-Rev'\n\ntype ResHeaderOpts = {\n labelers: ParsedLabelers\n repoRev: string \| null\n}\n\nexport const resHeaders = (\n opts: Partial<ResHeaderOpts>,\n): Record<string, string> => {\n const headers = {}\n if (opts.labelers) {\n headers[ATPROTO_CONTENT_LABELERS] = formatLabelerHeader(opts.labelers)\n }\n if (opts.repoRev) {\n headers[ATPROTO_REPO_REV] = opts.repoRev\n }\n return headers\n}\n\nexport const clearlyBadCursor = (cursor?: string) => {\n // hallmark of v1 cursor, highly unlikely in v2 cursors based on time or rkeys\n return !!cursor?.includes('::')\n}\n\nconst DEFAULT_FILL_PAGE_MAX_REQUESTS = 10\n\ntype PageFetch<R extends { cursor?: string }> = (params: {\n cursor?: string\n limit: number\n}) => Promise<R>\n\nexport const fillPage = async <\n F extends PageFetch<{ cursor?: string }>,\n T,\n>(opts: {\n cursor?: string\n limit: number\n maxRequests?: number\n fetch: F\n items: (result: Awaited<ReturnType<F>>) => T[]\n}): Promise<Awaited<ReturnType<F>>> => {\n const maxRequests = opts.maxRequests ?? DEFAULT_FILL_PAGE_MAX_REQUESTS\n // Refilling is only worth its cost while the page is mostly empty: a page\n // that already holds half of what was asked for is served as is.\n const enoughItems = Math.ceil(opts.limit / 2)\n const result = (await opts.fetch({\n cursor: opts.cursor,\n limit: opts.limit,\n })) as Awaited<ReturnType<F>>\n const items = opts.items(result)\n let cursor = result.cursor\n for (\n let requests = 1;\n requests < maxRequests && cursor && items.length < enoughItems;\n requests++\n ) {\n const previousCursor = cursor\n const page = (await opts.fetch({\n cursor,\n limit: opts.limit - items.length,\n })) as Awaited<ReturnType<F>>\n items.push(...opts.items(page))\n cursor = page.cursor\n if (cursor === previousCursor) {\n cursor = undefined\n break\n }\n if (!cursor) break\n }\n return { ...result, cursor } as Awaited<ReturnType<F>>\n}\n\n// @TEMPORARY backdoor to force search v2 via a request header, gated by the\n// BSKY_SEARCH_V2_OVERRIDE_HEADER env var. Remove once search v2 is fully rolled out.\nconst SEARCH_V2_OVERRIDE_HEADER = 'x-bsky-search-v2-override'\n\nexport const resolveSearchV2Override = (\n req: { headers: IncomingHttpHeaders },\n cfg: ServerConfig,\n): boolean => {\n const expected = cfg.searchV2OverrideHeader\n if (!expected) return false\n const value = req.headers[SEARCH_V2_OVERRIDE_HEADER]\n const header = Array.isArray(value) ? value.join(',') : value\n return header === expected\n}\n"]}
1	+ {"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/api/util.ts"],"names":[],"mappings":"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","sourcesContent":["import type { IncomingHttpHeaders } from 'node:http'\nimport type { ServerConfig } from '../config.js'\nimport { type ParsedLabelers, formatLabelerHeader } from '../util.js'\n\nexport const BSKY_USER_AGENT = 'BskyAppView'\nexport const ATPROTO_CONTENT_LABELERS = 'Atproto-Content-Labelers'\nexport const ATPROTO_REPO_REV = 'Atproto-Repo-Rev'\n\ntype ResHeaderOpts = {\n labelers: ParsedLabelers\n repoRev: string \| null\n}\n\nexport const resHeaders = (\n opts: Partial<ResHeaderOpts>,\n): Record<string, string> => {\n const headers = {}\n if (opts.labelers) {\n headers[ATPROTO_CONTENT_LABELERS] = formatLabelerHeader(opts.labelers)\n }\n if (opts.repoRev) {\n headers[ATPROTO_REPO_REV] = opts.repoRev\n }\n return headers\n}\n\nexport const clearlyBadCursor = (cursor?: string) => {\n // hallmark of v1 cursor, highly unlikely in v2 cursors based on time or rkeys\n return !!cursor?.includes('::')\n}\n\nconst DEFAULT_FILL_PAGE_MAX_REQUESTS = 10\n\ntype PageFetch<R extends { cursor?: string }> = (params: {\n cursor?: string\n limit: number\n}) => Promise<R>\n\nexport const fillPage = async <\n F extends PageFetch<{ cursor?: string }>,\n T,\n>(opts: {\n cursor?: string\n limit: number\n maxRequests?: number\n fetch: F\n items: (result: Awaited<ReturnType<F>>) => T[]\n}): Promise<Awaited<ReturnType<F>>> => {\n const maxRequests = opts.maxRequests ?? DEFAULT_FILL_PAGE_MAX_REQUESTS\n // Refilling is only worth its cost while the page is mostly empty: a page\n // that already holds half of what was asked for is served as is.\n const enoughItems = Math.ceil(opts.limit / 2)\n const result = (await opts.fetch({\n cursor: opts.cursor,\n limit: opts.limit,\n })) as Awaited<ReturnType<F>>\n const items = opts.items(result)\n let cursor = result.cursor \|\| undefined\n for (\n let requests = 1;\n requests < maxRequests && cursor && items.length < enoughItems;\n requests++\n ) {\n const previousCursor = cursor\n const page = (await opts.fetch({\n cursor,\n limit: opts.limit - items.length,\n })) as Awaited<ReturnType<F>>\n items.push(...opts.items(page))\n cursor = page.cursor \|\| undefined\n if (cursor === previousCursor) {\n cursor = undefined\n break\n }\n if (!cursor) break\n }\n return { ...result, cursor } as Awaited<ReturnType<F>>\n}\n\n// @TEMPORARY backdoor to force search v2 via a request header, gated by the\n// BSKY_SEARCH_V2_OVERRIDE_HEADER env var. Remove once search v2 is fully rolled out.\nconst SEARCH_V2_OVERRIDE_HEADER = 'x-bsky-search-v2-override'\n\nexport const resolveSearchV2Override = (\n req: { headers: IncomingHttpHeaders },\n cfg: ServerConfig,\n): boolean => {\n const expected = cfg.searchV2OverrideHeader\n if (!expected) return false\n const value = req.headers[SEARCH_V2_OVERRIDE_HEADER]\n const header = Array.isArray(value) ? value.join(',') : value\n return header === expected\n}\n"]}

package/dist/data-plane/server/bsync-subscription.d.ts CHANGED Viewed

@@ -3,7 +3,6 @@ import type { Database } from './db/index.js';
 export type BsyncCursors = {
     op?: string;
     mute?: string;
-    notif?: string;
 };
 export declare class BsyncSubscription {
     opts: {
@@ -39,8 +38,6 @@ export declare class BsyncSubscription {
     private runScanner;
     private scanMuteOperations;
     private processMuteOperations;
-    private scanNotifOperations;
-    private processNotifOperations;
     private scanOperations;
     private processOperations;
 }

package/dist/data-plane/server/bsync-subscription.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"bsync-subscription.d.ts","sourceRoot":"","sources":["../../../src/data-plane/server/bsync-subscription.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;~~AAWnD~~,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAG7C,MAAM,MAAM,YAAY,GAAG;IACzB,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,IAAI,CAAC,EAAE,MAAM,CAAA;~~IACb~~,~~KAAK,CAAC,EAAE,MAAM,~~CAAA;~~CACf,CAAA;~~AAED,qBAAa,iBAAiB;IAQT,IAAI,EAAE;QAAE,EAAE,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,YAAY,CAAA;KAAE;IAP/D,OAAO,CAAC,EAAE,CAA6B;IACvC,OAAO,CAAC,YAAY,CAA2B;IAC/C,OAAO,CAAC,WAAW,CAAa;IAChC,OAAO,CAAC,EAAE,CAAU;IAEpB,OAAO,CAAC,OAAO,CAAmB;IAElC,YAAmB,IAAI,EAAE;QAAE,EAAE,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,YAAY,CAAA;KAAE,EAY9D;IAED,IAAI,OAAO,YAEV;IAED,KAAK,~~SAMJ~~;IAED;;;;;OAKG;IACG,UAAU,CAAC,OAAO,EAAE,YAAY,EAAE,OAAO,SAAO,iBAWrD;IAED,OAAO,CAAC,UAAU;~~IAQZ~~,OAAO,kBAOZ;IAED;;;;OAIG;IACH,OAAO,CAAC,aAAa;YAmBP,UAAU;IAuBxB,OAAO,CAAC,kBAAkB;YAcZ,qBAAqB;IAgFnC,OAAO,CAAC,~~mBAAmB;YAcb,sBAAsB;IAmBpC,OAAO,CAAC,~~cAAc;YAWR,iBAAiB;CAmChC"}
1	+ {"version":3,"file":"bsync-subscription.d.ts","sourceRoot":"","sources":["../../../src/data-plane/server/bsync-subscription.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAUnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAG7C,MAAM,MAAM,YAAY,GAAG;IACzB,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,CAAA;AAED,qBAAa,iBAAiB;IAQT,IAAI,EAAE;QAAE,EAAE,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,YAAY,CAAA;KAAE;IAP/D,OAAO,CAAC,EAAE,CAA6B;IACvC,OAAO,CAAC,YAAY,CAA2B;IAC/C,OAAO,CAAC,WAAW,CAAa;IAChC,OAAO,CAAC,EAAE,CAAU;IAEpB,OAAO,CAAC,OAAO,CAAmB;IAElC,YAAmB,IAAI,EAAE;QAAE,EAAE,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,YAAY,CAAA;KAAE,EAY9D;IAED,IAAI,OAAO,YAEV;IAED,KAAK,SAKJ;IAED;;;;;OAKG;IACG,UAAU,CAAC,OAAO,EAAE,YAAY,EAAE,OAAO,SAAO,iBAWrD;IAED,OAAO,CAAC,UAAU;IAOZ,OAAO,kBAOZ;IAED;;;;OAIG;IACH,OAAO,CAAC,aAAa;YAmBP,UAAU;IAuBxB,OAAO,CAAC,kBAAkB;YAcZ,qBAAqB;IAgFnC,OAAO,CAAC,cAAc;YAWR,iBAAiB;CAmChC"}