@atproto/pds 0.4.215 → 0.4.217

package/dist/api/app/bsky/feed/getFeed.js

@@ -3,28 +3,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const oauth_provider_1 = require("@atproto/oauth-provider");
 const syntax_1 = require("@atproto/syntax");
-const lexicons_1 = require("../../../../lexicon/lexicons");
+const index_js_1 = require("../../../../lexicons/index.js");
 const pipethrough_1 = require("../../../../pipethrough");
 function default_1(server, ctx) {
     const { bskyAppView } = ctx;
     if (!bskyAppView)
         return;
-    server.app.bsky.feed.getFeed({
+    server.add(index_js_1.app.bsky.feed.getFeed, {
         auth: ctx.authVerifier.authorization({
             authorize: (permissions, { req }) => {
-                const lxm = lexicons_1.ids.AppBskyFeedGetFeed;
+                const lxm = index_js_1.app.bsky.feed.getFeed.$lxm;
                 const aud = (0, pipethrough_1.computeProxyTo)(ctx, req, lxm);
                 permissions.assertRpc({ aud, lxm });
-                permissions.assertRpc({ aud, lxm: lexicons_1.ids.AppBskyFeedGetFeedSkeleton });
+                permissions.assertRpc({ aud, lxm: index_js_1.app.bsky.feed.getFeedSkeleton.$lxm });
             },
         }),
         handler: async ({ params, auth, req }) => {
             const requester = auth.credentials.did;
             const feedUrl = new syntax_1.AtUri(params.feed);
-            const { data } = await bskyAppView.agent.com.atproto.repo.getRecord({
-                repo: feedUrl.hostname,
-                collection: feedUrl.collection,
-                rkey: feedUrl.rkey,
+            const data = await bskyAppView.client.call(index_js_1.com.atproto.repo.getRecord, {
+                repo: feedUrl.host,
+                collection: feedUrl.collectionSafe,
+                rkey: feedUrl.rkeySafe,
             });
             const feedDid = data.value['did'];
             if (typeof feedDid !== 'string') {
@@ -33,7 +33,7 @@ function default_1(server, ctx) {
             return (0, pipethrough_1.pipethrough)(ctx, req, {
                 iss: requester,
                 aud: feedDid,
-                lxm: lexicons_1.ids.AppBskyFeedGetFeedSkeleton,
+                lxm: index_js_1.app.bsky.feed.getFeedSkeleton.$lxm,
             });
         },
     });

package/dist/api/app/bsky/feed/getFeed.js.map

@@ -1 +1 @@
-{"version":3,"file":"getFeed.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/getFeed.ts"],"names":[],"mappings":";;AAOA,4BAqCC;AA5CD,4DAA6D;AAC7D,4CAAuC;AAGvC,2DAAkD;AAClD,yDAAqE;AAErE,mBAAyB,MAAc,EAAE,GAAe;IACtD,MAAM,EAAE,WAAW,EAAE,GAAG,GAAG,CAAA;IAC3B,IAAI,CAAC,WAAW;QAAE,OAAM;IAExB,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;QAC3B,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,aAAa,CAAC;YACnC,SAAS,EAAE,CAAC,WAAW,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE;gBAClC,MAAM,GAAG,GAAG,cAAG,CAAC,kBAAkB,CAAA;gBAClC,MAAM,GAAG,GAAG,IAAA,4BAAc,EAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;gBACzC,WAAW,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAA;gBACnC,WAAW,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,cAAG,CAAC,0BAA0B,EAAE,CAAC,CAAA;YACrE,CAAC;SACF,CAAC;QACF,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE;YACvC,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAA;YAEtC,MAAM,OAAO,GAAG,IAAI,cAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;YACtC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC;gBAClE,IAAI,EAAE,OAAO,CAAC,QAAQ;gBACtB,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,IAAI,EAAE,OAAO,CAAC,IAAI;aACnB,CAAC,CAAA;YACF,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;YACjC,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;gBAChC,MAAM,IAAI,oCAAmB,CAC3B,4BAA4B,EAC5B,aAAa,CACd,CAAA;YACH,CAAC;YAED,OAAO,IAAA,yBAAW,EAAC,GAAG,EAAE,GAAG,EAAE;gBAC3B,GAAG,EAAE,SAAS;gBACd,GAAG,EAAE,OAAO;gBACZ,GAAG,EAAE,cAAG,CAAC,0BAA0B;aACpC,CAAC,CAAA;QACJ,CAAC;KACF,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import { InvalidRequestError } from '@atproto/oauth-provider'\nimport { AtUri } from '@atproto/syntax'\nimport { AppContext } from '../../../../context'\nimport { Server } from '../../../../lexicon'\nimport { ids } from '../../../../lexicon/lexicons'\nimport { computeProxyTo, pipethrough } from '../../../../pipethrough'\n\nexport default function (server: Server, ctx: AppContext) {\n  const { bskyAppView } = ctx\n  if (!bskyAppView) return\n\n  server.app.bsky.feed.getFeed({\n    auth: ctx.authVerifier.authorization({\n      authorize: (permissions, { req }) => {\n        const lxm = ids.AppBskyFeedGetFeed\n        const aud = computeProxyTo(ctx, req, lxm)\n        permissions.assertRpc({ aud, lxm })\n        permissions.assertRpc({ aud, lxm: ids.AppBskyFeedGetFeedSkeleton })\n      },\n    }),\n    handler: async ({ params, auth, req }) => {\n      const requester = auth.credentials.did\n\n      const feedUrl = new AtUri(params.feed)\n      const { data } = await bskyAppView.agent.com.atproto.repo.getRecord({\n        repo: feedUrl.hostname,\n        collection: feedUrl.collection,\n        rkey: feedUrl.rkey,\n      })\n      const feedDid = data.value['did']\n      if (typeof feedDid !== 'string') {\n        throw new InvalidRequestError(\n          'could not resolve feed did',\n          'UnknownFeed',\n        )\n      }\n\n      return pipethrough(ctx, req, {\n        iss: requester,\n        aud: feedDid,\n        lxm: ids.AppBskyFeedGetFeedSkeleton,\n      })\n    },\n  })\n}\n"]}
+{"version":3,"file":"getFeed.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/getFeed.ts"],"names":[],"mappings":";;AAOA,4BAuCC;AA9CD,4DAA6D;AAC7D,4CAAuC;AAGvC,4DAAwD;AACxD,yDAAqE;AAErE,mBAAyB,MAAc,EAAE,GAAe;IACtD,MAAM,EAAE,WAAW,EAAE,GAAG,GAAG,CAAA;IAC3B,IAAI,CAAC,WAAW;QAAE,OAAM;IAExB,MAAM,CAAC,GAAG,CAAC,cAAG,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;QAChC,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,aAAa,CAAC;YACnC,SAAS,EAAE,CAAC,WAAW,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE;gBAClC,MAAM,GAAG,GAAG,cAAG,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAA;gBACtC,MAAM,GAAG,GAAG,IAAA,4BAAc,EAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;gBACzC,WAAW,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAA;gBACnC,WAAW,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,cAAG,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,CAAA;YACzE,CAAC;SACF,CAAC;QACF,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE;YACvC,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAA;YAEtC,MAAM,OAAO,GAAG,IAAI,cAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;YAEtC,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,cAAG,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE;gBACrE,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,UAAU,EAAE,OAAO,CAAC,cAAc;gBAClC,IAAI,EAAE,OAAO,CAAC,QAAQ;aACvB,CAAC,CAAA;YAEF,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;YACjC,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;gBAChC,MAAM,IAAI,oCAAmB,CAC3B,4BAA4B,EAC5B,aAAa,CACd,CAAA;YACH,CAAC;YAED,OAAO,IAAA,yBAAW,EAAC,GAAG,EAAE,GAAG,EAAE;gBAC3B,GAAG,EAAE,SAAS;gBACd,GAAG,EAAE,OAAO;gBACZ,GAAG,EAAE,cAAG,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI;aACxC,CAAC,CAAA;QACJ,CAAC;KACF,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import { InvalidRequestError } from '@atproto/oauth-provider'\nimport { AtUri } from '@atproto/syntax'\nimport { Server } from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context'\nimport { app, com } from '../../../../lexicons/index.js'\nimport { computeProxyTo, pipethrough } from '../../../../pipethrough'\n\nexport default function (server: Server, ctx: AppContext) {\n  const { bskyAppView } = ctx\n  if (!bskyAppView) return\n\n  server.add(app.bsky.feed.getFeed, {\n    auth: ctx.authVerifier.authorization({\n      authorize: (permissions, { req }) => {\n        const lxm = app.bsky.feed.getFeed.$lxm\n        const aud = computeProxyTo(ctx, req, lxm)\n        permissions.assertRpc({ aud, lxm })\n        permissions.assertRpc({ aud, lxm: app.bsky.feed.getFeedSkeleton.$lxm })\n      },\n    }),\n    handler: async ({ params, auth, req }) => {\n      const requester = auth.credentials.did\n\n      const feedUrl = new AtUri(params.feed)\n\n      const data = await bskyAppView.client.call(com.atproto.repo.getRecord, {\n        repo: feedUrl.host,\n        collection: feedUrl.collectionSafe,\n        rkey: feedUrl.rkeySafe,\n      })\n\n      const feedDid = data.value['did']\n      if (typeof feedDid !== 'string') {\n        throw new InvalidRequestError(\n          'could not resolve feed did',\n          'UnknownFeed',\n        )\n      }\n\n      return pipethrough(ctx, req, {\n        iss: requester,\n        aud: feedDid,\n        lxm: app.bsky.feed.getFeedSkeleton.$lxm,\n      })\n    },\n  })\n}\n"]}

package/dist/api/app/bsky/feed/getPostThread.d.ts

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

package/dist/api/app/bsky/feed/getPostThread.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getPostThread.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/getPostThread.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AA0B5C,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAwDvD"}
+{"version":3,"file":"getPostThread.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/getPostThread.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAehD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAqEvD"}

package/dist/api/app/bsky/feed/getPostThread.js

@@ -5,36 +5,42 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const node_assert_1 = __importDefault(require("node:assert"));
+const lex_1 = require("@atproto/lex");
 const syntax_1 = require("@atproto/syntax");
-const lexicons_1 = require("../../../../lexicon/lexicons");
-const defs_1 = require("../../../../lexicon/types/app/bsky/feed/defs");
+const index_js_1 = require("../../../../lexicons/index.js");
 const pipethrough_1 = require("../../../../pipethrough");
 const read_after_write_1 = require("../../../../read-after-write");
 function default_1(server, ctx) {
     if (!ctx.bskyAppView)
         return;
-    server.app.bsky.feed.getPostThread({
+    server.add(index_js_1.app.bsky.feed.getPostThread, {
         auth: ctx.authVerifier.authorization({
             authorize: (permissions, { req }) => {
-                const lxm = lexicons_1.ids.AppBskyFeedGetPostThread;
+                const lxm = index_js_1.app.bsky.feed.getPostThread.$lxm;
                 const aud = (0, pipethrough_1.computeProxyTo)(ctx, req, lxm);
                 permissions.assertRpc({ aud, lxm });
             },
         }),
+        opts: {
+            // @TODO remove after grace period has passed, behavior is non-standard.
+            // temporarily added for compat w/ previous version of xrpc-server to avoid breakage of a few specified parties.
+            paramsParseLoose: true,
+        },
         handler: async (reqCtx) => {
             try {
-                return await (0, read_after_write_1.pipethroughReadAfterWrite)(ctx, reqCtx, getPostThreadMunge);
+                return await (0, read_after_write_1.pipethroughReadAfterWrite)(ctx, reqCtx, index_js_1.app.bsky.feed.getPostThread, getPostThreadMunge);
             }
             catch (err) {
                 if (err instanceof pipethrough_1.PipethroughUpstreamError &&
                     err.error === 'NotFound') {
                     const { auth, params } = reqCtx;
                     const requester = auth.credentials.did;
-                    const rev = (0, read_after_write_1.getRepoRev)(err.headers);
+                    const rev = err.headers?.['atproto-repo-rev'];
                     if (!rev)
                         throw err;
                     const uri = new syntax_1.AtUri(params.uri);
-                    if (!uri.hostname.startsWith('did:')) {
+                    if (!uri.hostname.startsWith('did:') &&
+                        (0, lex_1.isHandleString)(uri.hostname)) {
                         const account = await ctx.accountManager.getAccount(uri.hostname);
                         if (account) {
                             uri.hostname = account.did;
@@ -65,7 +71,7 @@ function default_1(server, ctx) {
 const getPostThreadMunge = async (localViewer, original, local) => {
     // @TODO if is NotFoundPost, handle similarly to error
     // @NOTE not necessary right now as we never return those for the requested uri
-    if (!(0, defs_1.isThreadViewPost)(original.thread)) {
+    if (!index_js_1.app.bsky.feed.defs.threadViewPost.$isTypeOf(original.thread)) {
         return original;
     }
     const thread = await addPostsToThread(localViewer, original.thread, local.posts);
@@ -91,7 +97,8 @@ const findPostsInThread = (thread, posts) => {
             return false;
         if (rootUri === thread.post.uri)
             return true;
-        return thread.post.record.reply?.root.uri === rootUri;
+        return (thread.post.record.reply?.root.uri ===
+            rootUri);
     });
 };
 const insertIntoThreadReplies = async (localViewer, view, descript) => {
@@ -107,7 +114,7 @@ const insertIntoThreadReplies = async (localViewer, view, descript) => {
     }
     if (!view.replies)
         return view;
-    const replies = await Promise.all(view.replies.map(async (reply) => (0, defs_1.isThreadViewPost)(reply)
+    const replies = await Promise.all(view.replies.map(async (reply) => index_js_1.app.bsky.feed.defs.threadViewPost.$isTypeOf(reply)
         ? await insertIntoThreadReplies(localViewer, reply, descript)
         : reply));
     return {
@@ -119,10 +126,9 @@ const threadPostView = async (localViewer, descript) => {
     const postView = await localViewer.getPost(descript);
     if (!postView)
         return null;
-    return {
-        $type: 'app.bsky.feed.defs#threadViewPost',
+    return index_js_1.app.bsky.feed.defs.threadViewPost.$build({
         post: postView,
-    };
+    });
 };
 // Read after write on error
 // ---------------------
@@ -143,8 +149,8 @@ const readAfterWriteNotFound = async (ctx, localViewer, params, requester, rev,
     if (highestParent) {
         try {
             (0, node_assert_1.default)(ctx.bskyAppView);
-            const parentsRes = await ctx.bskyAppView.agent.app.bsky.feed.getPostThread({ uri: highestParent, parentHeight: params.parentHeight, depth: 0 }, await ctx.appviewAuthHeaders(requester, lexicons_1.ids.AppBskyFeedGetPostThread));
-            thread.parent = parentsRes.data.thread;
+            const parentsRes = await ctx.bskyAppView.client.call(index_js_1.app.bsky.feed.getPostThread, { uri: highestParent, parentHeight: params.parentHeight, depth: 0 }, await ctx.appviewAuthHeaders(requester, index_js_1.app.bsky.feed.getPostThread.$lxm));
+            thread.parent = parentsRes.thread;
         }
         catch (err) {
             // do nothing
@@ -158,11 +164,15 @@ const readAfterWriteNotFound = async (ctx, localViewer, params, requester, rev,
     };
 };
 const getHighestParent = (thread) => {
-    if ((0, defs_1.isThreadViewPost)(thread.parent)) {
-        return getHighestParent(thread.parent);
+    while (thread.parent &&
+        index_js_1.app.bsky.feed.defs.threadViewPost.$isTypeOf(thread.parent)) {
+        thread = thread.parent;
     }
-    else {
-        return thread.post.record.reply?.parent.uri;
+    // @NOTE we might get away with type casting here, but being safe to avoid
+    // potential issues
+    if (!index_js_1.app.bsky.feed.post.$matches(thread.post.record)) {
+        return undefined;
     }
+    return thread.post.record.reply?.parent.uri;
 };
 //# sourceMappingURL=getPostThread.js.map

package/dist/api/app/bsky/feed/getPostThread.js.map

@@ -1 +1 @@
-{"version":3,"file":"getPostThread.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/getPostThread.ts"],"names":[],"mappings":"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","sourcesContent":["import assert from 'node:assert'\nimport { AtUri } from '@atproto/syntax'\nimport { AppContext } from '../../../../context'\nimport { Server } from '../../../../lexicon'\nimport { ids } from '../../../../lexicon/lexicons'\nimport {\n  ThreadViewPost,\n  isThreadViewPost,\n} from '../../../../lexicon/types/app/bsky/feed/defs'\nimport {\n  OutputSchema,\n  QueryParams,\n} from '../../../../lexicon/types/app/bsky/feed/getPostThread'\nimport { Record as PostRecord } from '../../../../lexicon/types/app/bsky/feed/post'\nimport { $Typed } from '../../../../lexicon/util'\nimport {\n  PipethroughUpstreamError,\n  computeProxyTo,\n} from '../../../../pipethrough'\nimport {\n  LocalRecords,\n  LocalViewer,\n  RecordDescript,\n  formatMungedResponse,\n  getLocalLag,\n  getRepoRev,\n  pipethroughReadAfterWrite,\n} from '../../../../read-after-write'\n\nexport default function (server: Server, ctx: AppContext) {\n  if (!ctx.bskyAppView) return\n\n  server.app.bsky.feed.getPostThread({\n    auth: ctx.authVerifier.authorization({\n      authorize: (permissions, { req }) => {\n        const lxm = ids.AppBskyFeedGetPostThread\n        const aud = computeProxyTo(ctx, req, lxm)\n        permissions.assertRpc({ aud, lxm })\n      },\n    }),\n    handler: async (reqCtx) => {\n      try {\n        return await pipethroughReadAfterWrite(ctx, reqCtx, getPostThreadMunge)\n      } catch (err) {\n        if (\n          err instanceof PipethroughUpstreamError &&\n          err.error === 'NotFound'\n        ) {\n          const { auth, params } = reqCtx\n          const requester = auth.credentials.did\n\n          const rev = getRepoRev(err.headers)\n          if (!rev) throw err\n\n          const uri = new AtUri(params.uri)\n          if (!uri.hostname.startsWith('did:')) {\n            const account = await ctx.accountManager.getAccount(uri.hostname)\n            if (account) {\n              uri.hostname = account.did\n            }\n          }\n          if (uri.hostname !== requester) throw err\n\n          const local = await ctx.actorStore.read(requester, (store) => {\n            const localViewer = ctx.localViewer(store)\n            return readAfterWriteNotFound(\n              ctx,\n              localViewer,\n              params,\n              requester,\n              rev,\n              uri,\n            )\n          })\n          if (local === null) {\n            throw err\n          } else {\n            return formatMungedResponse(local.data, local.lag)\n          }\n        } else {\n          throw err\n        }\n      }\n    },\n  })\n}\n\n// READ AFTER WRITE\n// ----------------\n\nconst getPostThreadMunge = async (\n  localViewer: LocalViewer,\n  original: OutputSchema,\n  local: LocalRecords,\n): Promise<OutputSchema> => {\n  // @TODO if is NotFoundPost, handle similarly to error\n  // @NOTE not necessary right now as we never return those for the requested uri\n  if (!isThreadViewPost(original.thread)) {\n    return original\n  }\n  const thread = await addPostsToThread(\n    localViewer,\n    original.thread,\n    local.posts,\n  )\n  return {\n    ...original,\n    thread,\n  }\n}\n\nconst addPostsToThread = async (\n  localViewer: LocalViewer,\n  original: $Typed<ThreadViewPost>,\n  posts: RecordDescript<PostRecord>[],\n) => {\n  const inThread = findPostsInThread(original, posts)\n  if (inThread.length === 0) return original\n  let thread: $Typed<ThreadViewPost> = original\n  for (const record of inThread) {\n    thread = await insertIntoThreadReplies(localViewer, thread, record)\n  }\n  return thread\n}\n\nconst findPostsInThread = (\n  thread: ThreadViewPost,\n  posts: RecordDescript<PostRecord>[],\n): RecordDescript<PostRecord>[] => {\n  return posts.filter((post) => {\n    const rootUri = post.record.reply?.root.uri\n    if (!rootUri) return false\n    if (rootUri === thread.post.uri) return true\n    return (thread.post.record as PostRecord).reply?.root.uri === rootUri\n  })\n}\n\nconst insertIntoThreadReplies = async (\n  localViewer: LocalViewer,\n  view: $Typed<ThreadViewPost>,\n  descript: RecordDescript<PostRecord>,\n): Promise<$Typed<ThreadViewPost>> => {\n  if (descript.record.reply?.parent.uri === view.post.uri) {\n    const postView = await threadPostView(localViewer, descript)\n    if (!postView) return view\n    const replies = [postView, ...(view.replies ?? [])]\n    return {\n      ...view,\n      replies,\n    }\n  }\n  if (!view.replies) return view\n  const replies = await Promise.all(\n    view.replies.map(async (reply) =>\n      isThreadViewPost(reply)\n        ? await insertIntoThreadReplies(localViewer, reply, descript)\n        : reply,\n    ),\n  )\n  return {\n    ...view,\n    replies,\n  }\n}\n\nconst threadPostView = async (\n  localViewer: LocalViewer,\n  descript: RecordDescript<PostRecord>,\n): Promise<$Typed<ThreadViewPost> | null> => {\n  const postView = await localViewer.getPost(descript)\n  if (!postView) return null\n  return {\n    $type: 'app.bsky.feed.defs#threadViewPost',\n    post: postView,\n  }\n}\n\n// Read after write on error\n// ---------------------\n\nconst readAfterWriteNotFound = async (\n  ctx: AppContext,\n  localViewer: LocalViewer,\n  params: QueryParams,\n  requester: string,\n  rev: string,\n  resolvedUri: AtUri,\n): Promise<{ data: OutputSchema; lag?: number } | null> => {\n  if (resolvedUri.hostname !== requester) {\n    return null\n  }\n  const local = await localViewer.getRecordsSinceRev(rev)\n  const found = local.posts.find(\n    (p) => p.uri.toString() === resolvedUri.toString(),\n  )\n  if (!found) return null\n  let thread = await threadPostView(localViewer, found)\n  if (!thread) return null\n  const rest = local.posts.filter(\n    (p) => p.uri.toString() !== resolvedUri.toString(),\n  )\n  thread = await addPostsToThread(localViewer, thread, rest)\n  const highestParent = getHighestParent(thread)\n  if (highestParent) {\n    try {\n      assert(ctx.bskyAppView)\n      const parentsRes =\n        await ctx.bskyAppView.agent.app.bsky.feed.getPostThread(\n          { uri: highestParent, parentHeight: params.parentHeight, depth: 0 },\n          await ctx.appviewAuthHeaders(requester, ids.AppBskyFeedGetPostThread),\n        )\n      thread.parent = parentsRes.data.thread\n    } catch (err) {\n      // do nothing\n    }\n  }\n  return {\n    data: {\n      thread,\n    },\n    lag: getLocalLag(local),\n  }\n}\n\nconst getHighestParent = (thread: ThreadViewPost): string | undefined => {\n  if (isThreadViewPost(thread.parent)) {\n    return getHighestParent(thread.parent)\n  } else {\n    return (thread.post.record as PostRecord).reply?.parent.uri\n  }\n}\n"]}
+{"version":3,"file":"getPostThread.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/getPostThread.ts"],"names":[],"mappings":"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","sourcesContent":["import assert from 'node:assert'\nimport { isHandleString, l } from '@atproto/lex'\nimport { AtUri, AtUriString } from '@atproto/syntax'\nimport { Server } from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context'\nimport { app } from '../../../../lexicons/index.js'\nimport {\n  PipethroughUpstreamError,\n  computeProxyTo,\n} from '../../../../pipethrough'\nimport {\n  LocalViewer,\n  MungeFn,\n  RecordDescript,\n  formatMungedResponse,\n  getLocalLag,\n  pipethroughReadAfterWrite,\n} from '../../../../read-after-write'\n\nexport default function (server: Server, ctx: AppContext) {\n  if (!ctx.bskyAppView) return\n\n  server.add(app.bsky.feed.getPostThread, {\n    auth: ctx.authVerifier.authorization({\n      authorize: (permissions, { req }) => {\n        const lxm = app.bsky.feed.getPostThread.$lxm\n        const aud = computeProxyTo(ctx, req, lxm)\n        permissions.assertRpc({ aud, lxm })\n      },\n    }),\n    opts: {\n      // @TODO remove after grace period has passed, behavior is non-standard.\n      // temporarily added for compat w/ previous version of xrpc-server to avoid breakage of a few specified parties.\n      paramsParseLoose: true,\n    },\n    handler: async (reqCtx) => {\n      try {\n        return await pipethroughReadAfterWrite(\n          ctx,\n          reqCtx,\n          app.bsky.feed.getPostThread,\n          getPostThreadMunge,\n        )\n      } catch (err) {\n        if (\n          err instanceof PipethroughUpstreamError &&\n          err.error === 'NotFound'\n        ) {\n          const { auth, params } = reqCtx\n          const requester = auth.credentials.did\n\n          const rev = err.headers?.['atproto-repo-rev']\n          if (!rev) throw err\n\n          const uri = new AtUri(params.uri)\n          if (\n            !uri.hostname.startsWith('did:') &&\n            isHandleString(uri.hostname)\n          ) {\n            const account = await ctx.accountManager.getAccount(uri.hostname)\n            if (account) {\n              uri.hostname = account.did\n            }\n          }\n          if (uri.hostname !== requester) throw err\n\n          const local = await ctx.actorStore.read(requester, (store) => {\n            const localViewer = ctx.localViewer(store)\n            return readAfterWriteNotFound(\n              ctx,\n              localViewer,\n              params,\n              requester,\n              rev,\n              uri,\n            )\n          })\n          if (local === null) {\n            throw err\n          } else {\n            return formatMungedResponse(local.data, local.lag)\n          }\n        } else {\n          throw err\n        }\n      }\n    },\n  })\n}\n\n// READ AFTER WRITE\n// ----------------\n\nconst getPostThreadMunge: MungeFn<\n  app.bsky.feed.getPostThread.$OutputBody\n> = async (localViewer, original, local) => {\n  // @TODO if is NotFoundPost, handle similarly to error\n  // @NOTE not necessary right now as we never return those for the requested uri\n  if (!app.bsky.feed.defs.threadViewPost.$isTypeOf(original.thread)) {\n    return original\n  }\n  const thread = await addPostsToThread(\n    localViewer,\n    original.thread,\n    local.posts,\n  )\n  return {\n    ...original,\n    thread,\n  }\n}\n\nconst addPostsToThread = async (\n  localViewer: LocalViewer,\n  original: l.$Typed<app.bsky.feed.defs.ThreadViewPost>,\n  posts: RecordDescript<app.bsky.feed.post.Main>[],\n) => {\n  const inThread = findPostsInThread(original, posts)\n  if (inThread.length === 0) return original\n  let thread: l.$Typed<app.bsky.feed.defs.ThreadViewPost> = original\n  for (const record of inThread) {\n    thread = await insertIntoThreadReplies(localViewer, thread, record)\n  }\n  return thread\n}\n\nconst findPostsInThread = (\n  thread: app.bsky.feed.defs.ThreadViewPost,\n  posts: RecordDescript<app.bsky.feed.post.Main>[],\n): RecordDescript<app.bsky.feed.post.Main>[] => {\n  return posts.filter((post) => {\n    const rootUri = post.record.reply?.root.uri\n    if (!rootUri) return false\n    if (rootUri === thread.post.uri) return true\n    return (\n      (thread.post.record as app.bsky.feed.post.Main).reply?.root.uri ===\n      rootUri\n    )\n  })\n}\n\nconst insertIntoThreadReplies = async (\n  localViewer: LocalViewer,\n  view: l.$Typed<app.bsky.feed.defs.ThreadViewPost>,\n  descript: RecordDescript<app.bsky.feed.post.Main>,\n): Promise<l.$Typed<app.bsky.feed.defs.ThreadViewPost>> => {\n  if (descript.record.reply?.parent.uri === view.post.uri) {\n    const postView = await threadPostView(localViewer, descript)\n    if (!postView) return view\n    const replies = [postView, ...(view.replies ?? [])]\n    return {\n      ...view,\n      replies,\n    }\n  }\n  if (!view.replies) return view\n  const replies = await Promise.all(\n    view.replies.map(async (reply) =>\n      app.bsky.feed.defs.threadViewPost.$isTypeOf(reply)\n        ? await insertIntoThreadReplies(localViewer, reply, descript)\n        : reply,\n    ),\n  )\n  return {\n    ...view,\n    replies,\n  }\n}\n\nconst threadPostView = async (\n  localViewer: LocalViewer,\n  descript: RecordDescript<app.bsky.feed.post.Main>,\n): Promise<l.$Typed<app.bsky.feed.defs.ThreadViewPost> | null> => {\n  const postView = await localViewer.getPost(descript)\n  if (!postView) return null\n  return app.bsky.feed.defs.threadViewPost.$build({\n    post: postView,\n  })\n}\n\n// Read after write on error\n// ---------------------\n\nconst readAfterWriteNotFound = async (\n  ctx: AppContext,\n  localViewer: LocalViewer,\n  params: app.bsky.feed.getPostThread.$Params,\n  requester: string,\n  rev: string,\n  resolvedUri: AtUri,\n): Promise<{\n  data: app.bsky.feed.getPostThread.$OutputBody\n  lag?: number\n} | null> => {\n  if (resolvedUri.hostname !== requester) {\n    return null\n  }\n  const local = await localViewer.getRecordsSinceRev(rev)\n  const found = local.posts.find(\n    (p) => p.uri.toString() === resolvedUri.toString(),\n  )\n  if (!found) return null\n  let thread = await threadPostView(localViewer, found)\n  if (!thread) return null\n  const rest = local.posts.filter(\n    (p) => p.uri.toString() !== resolvedUri.toString(),\n  )\n  thread = await addPostsToThread(localViewer, thread, rest)\n  const highestParent = getHighestParent(thread)\n  if (highestParent) {\n    try {\n      assert(ctx.bskyAppView)\n      const parentsRes = await ctx.bskyAppView.client.call(\n        app.bsky.feed.getPostThread,\n        { uri: highestParent, parentHeight: params.parentHeight, depth: 0 },\n        await ctx.appviewAuthHeaders(\n          requester,\n          app.bsky.feed.getPostThread.$lxm,\n        ),\n      )\n      thread.parent = parentsRes.thread\n    } catch (err) {\n      // do nothing\n    }\n  }\n  return {\n    data: {\n      thread,\n    },\n    lag: getLocalLag(local),\n  }\n}\n\nconst getHighestParent = (\n  thread: app.bsky.feed.defs.ThreadViewPost,\n): AtUriString | undefined => {\n  while (\n    thread.parent &&\n    app.bsky.feed.defs.threadViewPost.$isTypeOf(thread.parent)\n  ) {\n    thread = thread.parent\n  }\n\n  // @NOTE we might get away with type casting here, but being safe to avoid\n  // potential issues\n  if (!app.bsky.feed.post.$matches(thread.post.record)) {\n    return undefined\n  }\n\n  return thread.post.record.reply?.parent.uri\n}\n"]}

package/dist/api/app/bsky/feed/getTimeline.d.ts

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

package/dist/api/app/bsky/feed/getTimeline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getTimeline.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/getTimeline.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAU5C,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAevD"}
+{"version":3,"file":"getTimeline.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/getTimeline.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAQhD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAyBvD"}

package/dist/api/app/bsky/feed/getTimeline.js

@@ -1,22 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
-const lexicons_1 = require("../../../../lexicon/lexicons");
+const index_js_1 = require("../../../../lexicons/index.js");
 const pipethrough_1 = require("../../../../pipethrough");
 const read_after_write_1 = require("../../../../read-after-write");
 function default_1(server, ctx) {
     if (!ctx.bskyAppView)
         return;
-    server.app.bsky.feed.getTimeline({
+    server.add(index_js_1.app.bsky.feed.getTimeline, {
         auth: ctx.authVerifier.authorization({
             authorize: (permissions, { req }) => {
-                const lxm = lexicons_1.ids.AppBskyFeedGetTimeline;
+                const lxm = index_js_1.app.bsky.feed.getTimeline.$lxm;
                 const aud = (0, pipethrough_1.computeProxyTo)(ctx, req, lxm);
                 permissions.assertRpc({ aud, lxm });
             },
         }),
+        opts: {
+            // @TODO remove after grace period has passed, behavior is non-standard.
+            // temporarily added for compat w/ previous version of xrpc-server to avoid breakage of a few specified parties.
+            paramsParseLoose: true,
+        },
         handler: async (reqCtx) => {
-            return (0, read_after_write_1.pipethroughReadAfterWrite)(ctx, reqCtx, getTimelineMunge);
+            return (0, read_after_write_1.pipethroughReadAfterWrite)(ctx, reqCtx, index_js_1.app.bsky.feed.getTimeline, getTimelineMunge);
         },
     });
 }

package/dist/api/app/bsky/feed/getTimeline.js.map

@@ -1 +1 @@
-{"version":3,"file":"getTimeline.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/getTimeline.ts"],"names":[],"mappings":";;AAWA,4BAeC;AAxBD,2DAAkD;AAElD,yDAAwD;AACxD,mEAIqC;AAErC,mBAAyB,MAAc,EAAE,GAAe;IACtD,IAAI,CAAC,GAAG,CAAC,WAAW;QAAE,OAAM;IAE5B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC;QAC/B,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,aAAa,CAAC;YACnC,SAAS,EAAE,CAAC,WAAW,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE;gBAClC,MAAM,GAAG,GAAG,cAAG,CAAC,sBAAsB,CAAA;gBACtC,MAAM,GAAG,GAAG,IAAA,4BAAc,EAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;gBACzC,WAAW,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAA;YACrC,CAAC;SACF,CAAC;QACF,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;YACxB,OAAO,IAAA,4CAAyB,EAAC,GAAG,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAA;QACjE,CAAC;KACF,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,gBAAgB,GAAG,KAAK,EAC5B,WAAwB,EACxB,QAAsB,EACtB,KAAmB,EACI,EAAE;IACzB,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,0BAA0B,CACvD,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,EAClB,KAAK,CAAC,KAAK,CACZ,CAAA;IACD,OAAO;QACL,GAAG,QAAQ;QACX,IAAI;KACL,CAAA;AACH,CAAC,CAAA","sourcesContent":["import { AppContext } from '../../../../context'\nimport { Server } from '../../../../lexicon'\nimport { ids } from '../../../../lexicon/lexicons'\nimport { OutputSchema } from '../../../../lexicon/types/app/bsky/feed/getTimeline'\nimport { computeProxyTo } from '../../../../pipethrough'\nimport {\n  LocalRecords,\n  LocalViewer,\n  pipethroughReadAfterWrite,\n} from '../../../../read-after-write'\n\nexport default function (server: Server, ctx: AppContext) {\n  if (!ctx.bskyAppView) return\n\n  server.app.bsky.feed.getTimeline({\n    auth: ctx.authVerifier.authorization({\n      authorize: (permissions, { req }) => {\n        const lxm = ids.AppBskyFeedGetTimeline\n        const aud = computeProxyTo(ctx, req, lxm)\n        permissions.assertRpc({ aud, lxm })\n      },\n    }),\n    handler: async (reqCtx) => {\n      return pipethroughReadAfterWrite(ctx, reqCtx, getTimelineMunge)\n    },\n  })\n}\n\nconst getTimelineMunge = async (\n  localViewer: LocalViewer,\n  original: OutputSchema,\n  local: LocalRecords,\n): Promise<OutputSchema> => {\n  const feed = await localViewer.formatAndInsertPostsInFeed(\n    [...original.feed],\n    local.posts,\n  )\n  return {\n    ...original,\n    feed,\n  }\n}\n"]}
+{"version":3,"file":"getTimeline.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/getTimeline.ts"],"names":[],"mappings":";;AASA,4BAyBC;AAhCD,4DAAmD;AACnD,yDAAwD;AACxD,mEAGqC;AAErC,mBAAyB,MAAc,EAAE,GAAe;IACtD,IAAI,CAAC,GAAG,CAAC,WAAW;QAAE,OAAM;IAE5B,MAAM,CAAC,GAAG,CAAC,cAAG,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;QACpC,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,aAAa,CAAC;YACnC,SAAS,EAAE,CAAC,WAAW,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE;gBAClC,MAAM,GAAG,GAAG,cAAG,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAA;gBAC1C,MAAM,GAAG,GAAG,IAAA,4BAAc,EAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;gBACzC,WAAW,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAA;YACrC,CAAC;SACF,CAAC;QACF,IAAI,EAAE;YACJ,wEAAwE;YACxE,gHAAgH;YAChH,gBAAgB,EAAE,IAAI;SACvB;QACD,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;YACxB,OAAO,IAAA,4CAAyB,EAC9B,GAAG,EACH,MAAM,EACN,cAAG,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EACzB,gBAAgB,CACjB,CAAA;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,gBAAgB,GAAmD,KAAK,EAC5E,WAAW,EACX,QAAQ,EACR,KAAK,EACL,EAAE;IACF,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,0BAA0B,CACvD,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,EAClB,KAAK,CAAC,KAAK,CACZ,CAAA;IACD,OAAO;QACL,GAAG,QAAQ;QACX,IAAI;KACL,CAAA;AACH,CAAC,CAAA","sourcesContent":["import { Server } from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context'\nimport { app } from '../../../../lexicons/index.js'\nimport { computeProxyTo } from '../../../../pipethrough'\nimport {\n  MungeFn,\n  pipethroughReadAfterWrite,\n} from '../../../../read-after-write'\n\nexport default function (server: Server, ctx: AppContext) {\n  if (!ctx.bskyAppView) return\n\n  server.add(app.bsky.feed.getTimeline, {\n    auth: ctx.authVerifier.authorization({\n      authorize: (permissions, { req }) => {\n        const lxm = app.bsky.feed.getTimeline.$lxm\n        const aud = computeProxyTo(ctx, req, lxm)\n        permissions.assertRpc({ aud, lxm })\n      },\n    }),\n    opts: {\n      // @TODO remove after grace period has passed, behavior is non-standard.\n      // temporarily added for compat w/ previous version of xrpc-server to avoid breakage of a few specified parties.\n      paramsParseLoose: true,\n    },\n    handler: async (reqCtx) => {\n      return pipethroughReadAfterWrite(\n        ctx,\n        reqCtx,\n        app.bsky.feed.getTimeline,\n        getTimelineMunge,\n      )\n    },\n  })\n}\n\nconst getTimelineMunge: MungeFn<app.bsky.feed.getTimeline.$OutputBody> = async (\n  localViewer,\n  original,\n  local,\n) => {\n  const feed = await localViewer.formatAndInsertPostsInFeed(\n    [...original.feed],\n    local.posts,\n  )\n  return {\n    ...original,\n    feed,\n  }\n}\n"]}

package/dist/api/app/bsky/feed/index.d.ts

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

package/dist/api/app/bsky/feed/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAO5C,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAMvD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAOhD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAMvD"}

package/dist/api/app/bsky/feed/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/index.ts"],"names":[],"mappings":";;;;;AAQA,4BAMC;AAZD,oEAA2C;AAC3C,oEAA2C;AAC3C,wDAA+B;AAC/B,oEAA2C;AAC3C,gEAAuC;AAEvC,mBAAyB,MAAc,EAAE,GAAe;IACtD,IAAA,uBAAa,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC1B,IAAA,uBAAa,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC1B,IAAA,iBAAO,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACpB,IAAA,uBAAa,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC1B,IAAA,qBAAW,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AAC1B,CAAC","sourcesContent":["import { AppContext } from '../../../../context'\nimport { Server } from '../../../../lexicon'\nimport getActorLikes from './getActorLikes'\nimport getAuthorFeed from './getAuthorFeed'\nimport getFeed from './getFeed'\nimport getPostThread from './getPostThread'\nimport getTimeline from './getTimeline'\n\nexport default function (server: Server, ctx: AppContext) {\n  getActorLikes(server, ctx)\n  getAuthorFeed(server, ctx)\n  getFeed(server, ctx)\n  getPostThread(server, ctx)\n  getTimeline(server, ctx)\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/index.ts"],"names":[],"mappings":";;;;;AAQA,4BAMC;AAZD,oEAA2C;AAC3C,oEAA2C;AAC3C,wDAA+B;AAC/B,oEAA2C;AAC3C,gEAAuC;AAEvC,mBAAyB,MAAc,EAAE,GAAe;IACtD,IAAA,uBAAa,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC1B,IAAA,uBAAa,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC1B,IAAA,iBAAO,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACpB,IAAA,uBAAa,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC1B,IAAA,qBAAW,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AAC1B,CAAC","sourcesContent":["import { Server } from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context'\nimport getActorLikes from './getActorLikes'\nimport getAuthorFeed from './getAuthorFeed'\nimport getFeed from './getFeed'\nimport getPostThread from './getPostThread'\nimport getTimeline from './getTimeline'\n\nexport default function (server: Server, ctx: AppContext) {\n  getActorLikes(server, ctx)\n  getAuthorFeed(server, ctx)\n  getFeed(server, ctx)\n  getPostThread(server, ctx)\n  getTimeline(server, ctx)\n}\n"]}

package/dist/api/app/bsky/index.d.ts

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

package/dist/api/app/bsky/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/api/app/bsky/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAKzC,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAIvD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/api/app/bsky/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAK7C,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAIvD"}

package/dist/api/app/bsky/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/app/bsky/index.ts"],"names":[],"mappings":";;;;;AAMA,4BAIC;AARD,oDAA2B;AAC3B,kDAAyB;AACzB,kEAAyC;AAEzC,mBAAyB,MAAc,EAAE,GAAe;IACtD,IAAA,eAAK,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAClB,IAAA,cAAI,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACjB,IAAA,sBAAY,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AAC3B,CAAC","sourcesContent":["import { AppContext } from '../../../context'\nimport { Server } from '../../../lexicon'\nimport actor from './actor'\nimport feed from './feed'\nimport notification from './notification'\n\nexport default function (server: Server, ctx: AppContext) {\n  actor(server, ctx)\n  feed(server, ctx)\n  notification(server, ctx)\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/app/bsky/index.ts"],"names":[],"mappings":";;;;;AAMA,4BAIC;AARD,oDAA2B;AAC3B,kDAAyB;AACzB,kEAAyC;AAEzC,mBAAyB,MAAc,EAAE,GAAe;IACtD,IAAA,eAAK,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAClB,IAAA,cAAI,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACjB,IAAA,sBAAY,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AAC3B,CAAC","sourcesContent":["import { Server } from '@atproto/xrpc-server'\nimport { AppContext } from '../../../context'\nimport actor from './actor'\nimport feed from './feed'\nimport notification from './notification'\n\nexport default function (server: Server, ctx: AppContext) {\n  actor(server, ctx)\n  feed(server, ctx)\n  notification(server, ctx)\n}\n"]}

package/dist/api/app/bsky/notification/index.d.ts

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

package/dist/api/app/bsky/notification/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/notification/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAG5C,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAEvD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/notification/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAGhD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAEvD"}

package/dist/api/app/bsky/notification/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/notification/index.ts"],"names":[],"mappings":";;;;;AAIA,4BAEC;AAJD,kEAAyC;AAEzC,mBAAyB,MAAc,EAAE,GAAe;IACtD,IAAA,sBAAY,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AAC3B,CAAC","sourcesContent":["import { AppContext } from '../../../../context'\nimport { Server } from '../../../../lexicon'\nimport registerPush from './registerPush'\n\nexport default function (server: Server, ctx: AppContext) {\n  registerPush(server, ctx)\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/notification/index.ts"],"names":[],"mappings":";;;;;AAIA,4BAEC;AAJD,kEAAyC;AAEzC,mBAAyB,MAAc,EAAE,GAAe;IACtD,IAAA,sBAAY,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AAC3B,CAAC","sourcesContent":["import { Server } from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context'\nimport registerPush from './registerPush'\n\nexport default function (server: Server, ctx: AppContext) {\n  registerPush(server, ctx)\n}\n"]}

package/dist/api/app/bsky/notification/registerPush.d.ts

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

package/dist/api/app/bsky/notification/registerPush.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registerPush.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/notification/registerPush.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAI5C,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QA+CvD"}
+{"version":3,"file":"registerPush.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/notification/registerPush.ts"],"names":[],"mappings":"AAEA,OAAO,EAAuB,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAElE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAIhD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAmDvD"}

package/dist/api/app/bsky/notification/registerPush.js

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
-const api_1 = require("@atproto/api");
 const identity_1 = require("@atproto/identity");
+const lex_1 = require("@atproto/lex");
 const xrpc_server_1 = require("@atproto/xrpc-server");
 const auth_scope_1 = require("../../../../auth-scope");
-const lexicons_1 = require("../../../../lexicon/lexicons");
+const index_js_1 = require("../../../../lexicons/index.js");
 const resolver_1 = require("../util/resolver");
 function default_1(server, ctx) {
     const { bskyAppView } = ctx;
     if (!bskyAppView)
         return;
-    server.app.bsky.notification.registerPush({
+    server.add(index_js_1.app.bsky.notification.registerPush, {
         auth: ctx.authVerifier.authorization({
             additional: [auth_scope_1.AuthScope.SignupQueued],
             authorize: () => {
@@ -21,28 +21,27 @@ function default_1(server, ctx) {
                 // assert permissions here.
             },
         }),
-        handler: async ({ auth, input }) => {
-            const { serviceDid } = input.body;
+        handler: async ({ auth, input: { body } }) => {
+            const { serviceDid } = body;
             const { did } = auth.credentials;
             if (auth.credentials.type === 'oauth') {
                 auth.credentials.permissions.assertRpc({
                     aud: `${serviceDid}#bsky_notif`,
-                    lxm: lexicons_1.ids.AppBskyNotificationRegisterPush,
+                    lxm: index_js_1.app.bsky.notification.registerPush.$lxm,
                 });
             }
-            const authHeaders = await ctx.serviceAuthHeaders(did, serviceDid, lexicons_1.ids.AppBskyNotificationRegisterPush);
+            const { headers } = await ctx.serviceAuthHeaders(did, serviceDid, index_js_1.app.bsky.notification.registerPush.$lxm);
             if (bskyAppView.did === serviceDid) {
-                await bskyAppView.agent.app.bsky.notification.registerPush(input.body, {
-                    ...authHeaders,
-                    encoding: 'application/json',
-                });
+                await bskyAppView.client.call(index_js_1.app.bsky.notification.registerPush, body, { headers });
                 return;
             }
             const notifEndpoint = await getEndpoint(ctx, serviceDid);
-            const agent = new api_1.AtpAgent({ service: notifEndpoint });
-            await agent.api.app.bsky.notification.registerPush(input.body, {
-                ...authHeaders,
-                encoding: 'application/json',
+            await (0, lex_1.xrpc)(notifEndpoint, index_js_1.app.bsky.notification.registerPush, {
+                validateRequest: ctx.cfg.service.devMode,
+                validateResponse: ctx.cfg.service.devMode,
+                strictResponseProcessing: ctx.cfg.service.devMode,
+                body,
+                headers,
             });
         },
     });

package/dist/api/app/bsky/notification/registerPush.js.map

@@ -1 +1 @@
-{"version":3,"file":"registerPush.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/notification/registerPush.ts"],"names":[],"mappings":";;AASA,4BA+CC;AAxDD,sCAAuC;AACvC,gDAA4C;AAC5C,sDAA0D;AAC1D,uDAAkD;AAGlD,2DAAkD;AAClD,+CAA4C;AAE5C,mBAAyB,MAAc,EAAE,GAAe;IACtD,MAAM,EAAE,WAAW,EAAE,GAAG,GAAG,CAAA;IAC3B,IAAI,CAAC,WAAW;QAAE,OAAM;IAExB,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC;QACxC,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,aAAa,CAAC;YACnC,UAAU,EAAE,CAAC,sBAAS,CAAC,YAAY,CAAC;YACpC,SAAS,EAAE,GAAG,EAAE;gBACd,uEAAuE;gBACvE,wEAAwE;gBACxE,mEAAmE;gBACnE,2BAA2B;YAC7B,CAAC;SACF,CAAC;QACF,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;YACjC,MAAM,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC,IAAI,CAAA;YACjC,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,WAAW,CAAA;YAEhC,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBACtC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,SAAS,CAAC;oBACrC,GAAG,EAAE,GAAG,UAAU,aAAa;oBAC/B,GAAG,EAAE,cAAG,CAAC,+BAA+B;iBACzC,CAAC,CAAA;YACJ,CAAC;YAED,MAAM,WAAW,GAAG,MAAM,GAAG,CAAC,kBAAkB,CAC9C,GAAG,EACH,UAAU,EACV,cAAG,CAAC,+BAA+B,CACpC,CAAA;YAED,IAAI,WAAW,CAAC,GAAG,KAAK,UAAU,EAAE,CAAC;gBACnC,MAAM,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,EAAE;oBACrE,GAAG,WAAW;oBACd,QAAQ,EAAE,kBAAkB;iBAC7B,CAAC,CAAA;gBACF,OAAM;YACR,CAAC;YAED,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,GAAG,EAAE,UAAU,CAAC,CAAA;YACxD,MAAM,KAAK,GAAG,IAAI,cAAQ,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAA;YACtD,MAAM,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,EAAE;gBAC7D,GAAG,WAAW;gBACd,QAAQ,EAAE,kBAAkB;aAC7B,CAAC,CAAA;QACJ,CAAC;KACF,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,WAAW,GAAG,KAAK,EAAE,GAAe,EAAE,UAAkB,EAAE,EAAE;IAChE,MAAM,GAAG,GAAG,MAAM,IAAA,oBAAS,EAAC,GAAG,EAAE,UAAU,CAAC,CAAA;IAC5C,MAAM,aAAa,GAAG,IAAA,mBAAQ,EAAC,GAAG,CAAC,CAAA;IACnC,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,IAAI,iCAAmB,CAC3B,yDAAyD,UAAU,EAAE,CACtE,CAAA;IACH,CAAC;IACD,OAAO,aAAa,CAAA;AACtB,CAAC,CAAA","sourcesContent":["import { AtpAgent } from '@atproto/api'\nimport { getNotif } from '@atproto/identity'\nimport { InvalidRequestError } from '@atproto/xrpc-server'\nimport { AuthScope } from '../../../../auth-scope'\nimport { AppContext } from '../../../../context'\nimport { Server } from '../../../../lexicon'\nimport { ids } from '../../../../lexicon/lexicons'\nimport { getDidDoc } from '../util/resolver'\n\nexport default function (server: Server, ctx: AppContext) {\n  const { bskyAppView } = ctx\n  if (!bskyAppView) return\n\n  server.app.bsky.notification.registerPush({\n    auth: ctx.authVerifier.authorization({\n      additional: [AuthScope.SignupQueued],\n      authorize: () => {\n        // @NOTE this endpoint predates generic service proxying but we want to\n        // map the permission to the \"RPC\" scope for consistency. However, since\n        // the service info is only available in the request body, we can't\n        // assert permissions here.\n      },\n    }),\n    handler: async ({ auth, input }) => {\n      const { serviceDid } = input.body\n      const { did } = auth.credentials\n\n      if (auth.credentials.type === 'oauth') {\n        auth.credentials.permissions.assertRpc({\n          aud: `${serviceDid}#bsky_notif`,\n          lxm: ids.AppBskyNotificationRegisterPush,\n        })\n      }\n\n      const authHeaders = await ctx.serviceAuthHeaders(\n        did,\n        serviceDid,\n        ids.AppBskyNotificationRegisterPush,\n      )\n\n      if (bskyAppView.did === serviceDid) {\n        await bskyAppView.agent.app.bsky.notification.registerPush(input.body, {\n          ...authHeaders,\n          encoding: 'application/json',\n        })\n        return\n      }\n\n      const notifEndpoint = await getEndpoint(ctx, serviceDid)\n      const agent = new AtpAgent({ service: notifEndpoint })\n      await agent.api.app.bsky.notification.registerPush(input.body, {\n        ...authHeaders,\n        encoding: 'application/json',\n      })\n    },\n  })\n}\n\nconst getEndpoint = async (ctx: AppContext, serviceDid: string) => {\n  const doc = await getDidDoc(ctx, serviceDid)\n  const notifEndpoint = getNotif(doc)\n  if (!notifEndpoint) {\n    throw new InvalidRequestError(\n      `invalid notification service details in did document: ${serviceDid}`,\n    )\n  }\n  return notifEndpoint\n}\n"]}
+{"version":3,"file":"registerPush.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/notification/registerPush.ts"],"names":[],"mappings":";;AAQA,4BAmDC;AA3DD,gDAA4C;AAC5C,sCAAmC;AACnC,sDAAkE;AAClE,uDAAkD;AAElD,4DAAmD;AACnD,+CAA4C;AAE5C,mBAAyB,MAAc,EAAE,GAAe;IACtD,MAAM,EAAE,WAAW,EAAE,GAAG,GAAG,CAAA;IAC3B,IAAI,CAAC,WAAW;QAAE,OAAM;IAExB,MAAM,CAAC,GAAG,CAAC,cAAG,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE;QAC7C,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,aAAa,CAAC;YACnC,UAAU,EAAE,CAAC,sBAAS,CAAC,YAAY,CAAC;YACpC,SAAS,EAAE,GAAG,EAAE;gBACd,uEAAuE;gBACvE,wEAAwE;gBACxE,mEAAmE;gBACnE,2BAA2B;YAC7B,CAAC;SACF,CAAC;QACF,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE;YAC3C,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAA;YAC3B,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,WAAW,CAAA;YAEhC,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBACtC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,SAAS,CAAC;oBACrC,GAAG,EAAE,GAAG,UAAU,aAAa;oBAC/B,GAAG,EAAE,cAAG,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,IAAI;iBAC7C,CAAC,CAAA;YACJ,CAAC;YAED,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,GAAG,CAAC,kBAAkB,CAC9C,GAAG,EACH,UAAU,EACV,cAAG,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,IAAI,CACxC,CAAA;YAED,IAAI,WAAW,CAAC,GAAG,KAAK,UAAU,EAAE,CAAC;gBACnC,MAAM,WAAW,CAAC,MAAM,CAAC,IAAI,CAC3B,cAAG,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,EAClC,IAAI,EACJ,EAAE,OAAO,EAAE,CACZ,CAAA;gBACD,OAAM;YACR,CAAC;YAED,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,GAAG,EAAE,UAAU,CAAC,CAAA;YAExD,MAAM,IAAA,UAAI,EAAC,aAAa,EAAE,cAAG,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE;gBAC5D,eAAe,EAAE,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO;gBACxC,gBAAgB,EAAE,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO;gBACzC,wBAAwB,EAAE,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO;gBACjD,IAAI;gBACJ,OAAO;aACR,CAAC,CAAA;QACJ,CAAC;KACF,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,WAAW,GAAG,KAAK,EAAE,GAAe,EAAE,UAAkB,EAAE,EAAE;IAChE,MAAM,GAAG,GAAG,MAAM,IAAA,oBAAS,EAAC,GAAG,EAAE,UAAU,CAAC,CAAA;IAC5C,MAAM,aAAa,GAAG,IAAA,mBAAQ,EAAC,GAAG,CAAC,CAAA;IACnC,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,IAAI,iCAAmB,CAC3B,yDAAyD,UAAU,EAAE,CACtE,CAAA;IACH,CAAC;IACD,OAAO,aAAa,CAAA;AACtB,CAAC,CAAA","sourcesContent":["import { getNotif } from '@atproto/identity'\nimport { xrpc } from '@atproto/lex'\nimport { InvalidRequestError, Server } from '@atproto/xrpc-server'\nimport { AuthScope } from '../../../../auth-scope'\nimport { AppContext } from '../../../../context'\nimport { app } from '../../../../lexicons/index.js'\nimport { getDidDoc } from '../util/resolver'\n\nexport default function (server: Server, ctx: AppContext) {\n  const { bskyAppView } = ctx\n  if (!bskyAppView) return\n\n  server.add(app.bsky.notification.registerPush, {\n    auth: ctx.authVerifier.authorization({\n      additional: [AuthScope.SignupQueued],\n      authorize: () => {\n        // @NOTE this endpoint predates generic service proxying but we want to\n        // map the permission to the \"RPC\" scope for consistency. However, since\n        // the service info is only available in the request body, we can't\n        // assert permissions here.\n      },\n    }),\n    handler: async ({ auth, input: { body } }) => {\n      const { serviceDid } = body\n      const { did } = auth.credentials\n\n      if (auth.credentials.type === 'oauth') {\n        auth.credentials.permissions.assertRpc({\n          aud: `${serviceDid}#bsky_notif`,\n          lxm: app.bsky.notification.registerPush.$lxm,\n        })\n      }\n\n      const { headers } = await ctx.serviceAuthHeaders(\n        did,\n        serviceDid,\n        app.bsky.notification.registerPush.$lxm,\n      )\n\n      if (bskyAppView.did === serviceDid) {\n        await bskyAppView.client.call(\n          app.bsky.notification.registerPush,\n          body,\n          { headers },\n        )\n        return\n      }\n\n      const notifEndpoint = await getEndpoint(ctx, serviceDid)\n\n      await xrpc(notifEndpoint, app.bsky.notification.registerPush, {\n        validateRequest: ctx.cfg.service.devMode,\n        validateResponse: ctx.cfg.service.devMode,\n        strictResponseProcessing: ctx.cfg.service.devMode,\n        body,\n        headers,\n      })\n    },\n  })\n}\n\nconst getEndpoint = async (ctx: AppContext, serviceDid: string) => {\n  const doc = await getDidDoc(ctx, serviceDid)\n  const notifEndpoint = getNotif(doc)\n  if (!notifEndpoint) {\n    throw new InvalidRequestError(\n      `invalid notification service details in did document: ${serviceDid}`,\n    )\n  }\n  return notifEndpoint\n}\n"]}

package/dist/api/com/atproto/admin/deleteAccount.d.ts

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

package/dist/api/com/atproto/admin/deleteAccount.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deleteAccount.d.ts","sourceRoot":"","sources":["../../../../../src/api/com/atproto/admin/deleteAccount.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAE5C,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAcvD"}
+{"version":3,"file":"deleteAccount.d.ts","sourceRoot":"","sources":["../../../../../src/api/com/atproto/admin/deleteAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAE7C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAGhD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAcvD"}

package/dist/api/com/atproto/admin/deleteAccount.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const account_manager_1 = require("../../../../account-manager/account-manager");
+const index_js_1 = require("../../../../lexicons/index.js");
 function default_1(server, ctx) {
-    server.com.atproto.admin.deleteAccount({
+    server.add(index_js_1.com.atproto.admin.deleteAccount, {
         auth: ctx.authVerifier.adminToken,
         handler: async ({ input }) => {
             const { did } = input.body;

package/dist/api/com/atproto/admin/deleteAccount.js.map

@@ -1 +1 @@
-{"version":3,"file":"deleteAccount.js","sourceRoot":"","sources":["../../../../../src/api/com/atproto/admin/deleteAccount.ts"],"names":[],"mappings":";;AAIA,4BAcC;AAlBD,iFAA2E;AAI3E,mBAAyB,MAAc,EAAE,GAAe;IACtD,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC;QACrC,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,UAAU;QACjC,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;YAC3B,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC,IAAI,CAAA;YAC1B,MAAM,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;YACjC,MAAM,GAAG,CAAC,cAAc,CAAC,aAAa,CAAC,GAAG,CAAC,CAAA;YAC3C,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,kBAAkB,CACvD,GAAG,EACH,+BAAa,CAAC,OAAO,CACtB,CAAA;YACD,MAAM,GAAG,CAAC,SAAS,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,CAAC,CAAA;QACzD,CAAC;KACF,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import { AccountStatus } from '../../../../account-manager/account-manager'\nimport { AppContext } from '../../../../context'\nimport { Server } from '../../../../lexicon'\n\nexport default function (server: Server, ctx: AppContext) {\n  server.com.atproto.admin.deleteAccount({\n    auth: ctx.authVerifier.adminToken,\n    handler: async ({ input }) => {\n      const { did } = input.body\n      await ctx.actorStore.destroy(did)\n      await ctx.accountManager.deleteAccount(did)\n      const accountSeq = await ctx.sequencer.sequenceAccountEvt(\n        did,\n        AccountStatus.Deleted,\n      )\n      await ctx.sequencer.deleteAllForUser(did, [accountSeq])\n    },\n  })\n}\n"]}
+{"version":3,"file":"deleteAccount.js","sourceRoot":"","sources":["../../../../../src/api/com/atproto/admin/deleteAccount.ts"],"names":[],"mappings":";;AAKA,4BAcC;AAlBD,iFAA2E;AAE3E,4DAAmD;AAEnD,mBAAyB,MAAc,EAAE,GAAe;IACtD,MAAM,CAAC,GAAG,CAAC,cAAG,CAAC,OAAO,CAAC,KAAK,CAAC,aAAa,EAAE;QAC1C,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,UAAU;QACjC,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;YAC3B,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC,IAAI,CAAA;YAC1B,MAAM,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;YACjC,MAAM,GAAG,CAAC,cAAc,CAAC,aAAa,CAAC,GAAG,CAAC,CAAA;YAC3C,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,kBAAkB,CACvD,GAAG,EACH,+BAAa,CAAC,OAAO,CACtB,CAAA;YACD,MAAM,GAAG,CAAC,SAAS,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,CAAC,CAAA;QACzD,CAAC;KACF,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import { Server } from '@atproto/xrpc-server'\nimport { AccountStatus } from '../../../../account-manager/account-manager'\nimport { AppContext } from '../../../../context'\nimport { com } from '../../../../lexicons/index.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  server.add(com.atproto.admin.deleteAccount, {\n    auth: ctx.authVerifier.adminToken,\n    handler: async ({ input }) => {\n      const { did } = input.body\n      await ctx.actorStore.destroy(did)\n      await ctx.accountManager.deleteAccount(did)\n      const accountSeq = await ctx.sequencer.sequenceAccountEvt(\n        did,\n        AccountStatus.Deleted,\n      )\n      await ctx.sequencer.deleteAllForUser(did, [accountSeq])\n    },\n  })\n}\n"]}

package/dist/api/com/atproto/admin/disableAccountInvites.d.ts

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

package/dist/api/com/atproto/admin/disableAccountInvites.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"disableAccountInvites.d.ts","sourceRoot":"","sources":["../../../../../src/api/com/atproto/admin/disableAccountInvites.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAE5C,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAavD"}
+{"version":3,"file":"disableAccountInvites.d.ts","sourceRoot":"","sources":["../../../../../src/api/com/atproto/admin/disableAccountInvites.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAGhD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAavD"}

package/dist/api/com/atproto/admin/disableAccountInvites.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const xrpc_server_1 = require("@atproto/xrpc-server");
+const index_js_1 = require("../../../../lexicons/index.js");
 function default_1(server, ctx) {
-    server.com.atproto.admin.disableAccountInvites({
+    server.add(index_js_1.com.atproto.admin.disableAccountInvites, {
         auth: ctx.authVerifier.moderator,
         handler: async ({ input }) => {
             if (ctx.cfg.entryway) {

package/dist/api/com/atproto/admin/disableAccountInvites.js.map

@@ -1 +1 @@
-{"version":3,"file":"disableAccountInvites.js","sourceRoot":"","sources":["../../../../../src/api/com/atproto/admin/disableAccountInvites.ts"],"names":[],"mappings":";;AAIA,4BAaC;AAjBD,sDAA0D;AAI1D,mBAAyB,MAAc,EAAE,GAAe;IACtD,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,qBAAqB,CAAC;QAC7C,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,SAAS;QAChC,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;YAC3B,IAAI,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;gBACrB,MAAM,IAAI,iCAAmB,CAC3B,qDAAqD,CACtD,CAAA;YACH,CAAC;YACD,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC,IAAI,CAAA;YAC9B,MAAM,GAAG,CAAC,cAAc,CAAC,yBAAyB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;QACnE,CAAC;KACF,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import { InvalidRequestError } from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context'\nimport { Server } from '../../../../lexicon'\n\nexport default function (server: Server, ctx: AppContext) {\n  server.com.atproto.admin.disableAccountInvites({\n    auth: ctx.authVerifier.moderator,\n    handler: async ({ input }) => {\n      if (ctx.cfg.entryway) {\n        throw new InvalidRequestError(\n          'Account invites are managed by the entryway service',\n        )\n      }\n      const { account } = input.body\n      await ctx.accountManager.setAccountInvitesDisabled(account, true)\n    },\n  })\n}\n"]}
+{"version":3,"file":"disableAccountInvites.js","sourceRoot":"","sources":["../../../../../src/api/com/atproto/admin/disableAccountInvites.ts"],"names":[],"mappings":";;AAIA,4BAaC;AAjBD,sDAAkE;AAElE,4DAAmD;AAEnD,mBAAyB,MAAc,EAAE,GAAe;IACtD,MAAM,CAAC,GAAG,CAAC,cAAG,CAAC,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE;QAClD,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,SAAS;QAChC,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;YAC3B,IAAI,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;gBACrB,MAAM,IAAI,iCAAmB,CAC3B,qDAAqD,CACtD,CAAA;YACH,CAAC;YACD,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC,IAAI,CAAA;YAC9B,MAAM,GAAG,CAAC,cAAc,CAAC,yBAAyB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;QACnE,CAAC;KACF,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import { InvalidRequestError, Server } from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context'\nimport { com } from '../../../../lexicons/index.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  server.add(com.atproto.admin.disableAccountInvites, {\n    auth: ctx.authVerifier.moderator,\n    handler: async ({ input }) => {\n      if (ctx.cfg.entryway) {\n        throw new InvalidRequestError(\n          'Account invites are managed by the entryway service',\n        )\n      }\n      const { account } = input.body\n      await ctx.accountManager.setAccountInvitesDisabled(account, true)\n    },\n  })\n}\n"]}

package/dist/api/com/atproto/admin/disableInviteCodes.d.ts

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

package/dist/api/com/atproto/admin/disableInviteCodes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"disableInviteCodes.d.ts","sourceRoot":"","sources":["../../../../../src/api/com/atproto/admin/disableInviteCodes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAE5C,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAgBvD"}
+{"version":3,"file":"disableInviteCodes.d.ts","sourceRoot":"","sources":["../../../../../src/api/com/atproto/admin/disableInviteCodes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAGhD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAgBvD"}

package/dist/api/com/atproto/admin/disableInviteCodes.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const xrpc_server_1 = require("@atproto/xrpc-server");
+const index_js_1 = require("../../../../lexicons/index.js");
 function default_1(server, ctx) {
-    server.com.atproto.admin.disableInviteCodes({
+    server.add(index_js_1.com.atproto.admin.disableInviteCodes, {
         auth: ctx.authVerifier.moderator,
         handler: async ({ input }) => {
             if (ctx.cfg.entryway) {