From 64162fa13674cdf23a241f362527ea7ec38d5e89 Mon Sep 17 00:00:00 2001 From: bryan newbold Date: Thu, 28 Sep 2023 17:09:15 -0700 Subject: [PATCH] fix basic build errors from deps bump --- src/auth.ts | 2 +- src/config.ts | 2 +- src/methods/describe-generator.ts | 2 +- src/methods/feed-generation.ts | 2 +- src/server.ts | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/auth.ts b/src/auth.ts index 9ccaa99..eef583e 100644 --- a/src/auth.ts +++ b/src/auth.ts @@ -1,6 +1,6 @@ import express from 'express' import { verifyJwt, AuthRequiredError } from '@atproto/xrpc-server' -import { DidResolver } from '@atproto/did-resolver' +import { DidResolver } from '@atproto/identity' export const validateAuth = async ( req: express.Request, diff --git a/src/config.ts b/src/config.ts index c394fc9..3a2844b 100644 --- a/src/config.ts +++ b/src/config.ts @@ -1,5 +1,5 @@ import { Database } from './db' -import { DidResolver } from '@atproto/did-resolver' +import { DidResolver } from '@atproto/identity' export type AppContext = { db: Database diff --git a/src/methods/describe-generator.ts b/src/methods/describe-generator.ts index cbd87a8..70d7e82 100644 --- a/src/methods/describe-generator.ts +++ b/src/methods/describe-generator.ts @@ -1,7 +1,7 @@ import { Server } from '../lexicon' import { AppContext } from '../config' import algos from '../algos' -import { AtUri } from '@atproto/uri' +import { AtUri } from '@atproto/syntax' export default function (server: Server, ctx: AppContext) { server.app.bsky.feed.describeFeedGenerator(async () => { diff --git a/src/methods/feed-generation.ts b/src/methods/feed-generation.ts index 0e114ec..0f4989e 100644 --- a/src/methods/feed-generation.ts +++ b/src/methods/feed-generation.ts @@ -3,7 +3,7 @@ import { Server } from '../lexicon' import { AppContext } from '../config' import algos from '../algos' import { validateAuth } from '../auth' -import { AtUri } from '@atproto/uri' +import { AtUri } from '@atproto/syntax' export default function (server: Server, ctx: AppContext) { server.app.bsky.feed.getFeedSkeleton(async ({ params, req }) => { diff --git a/src/server.ts b/src/server.ts index ddbd2d2..c696749 100644 --- a/src/server.ts +++ b/src/server.ts @@ -1,7 +1,7 @@ import http from 'http' import events from 'events' import express from 'express' -import { DidResolver, MemoryCache } from '@atproto/did-resolver' +import { DidResolver, MemoryCache } from '@atproto/identity' import { createServer } from './lexicon' import feedGeneration from './methods/feed-generation' import describeGenerator from './methods/describe-generator' @@ -35,10 +35,10 @@ export class FeedGenerator { const firehose = new FirehoseSubscription(db, cfg.subscriptionEndpoint) const didCache = new MemoryCache() - const didResolver = new DidResolver( - { plcUrl: 'https://plc.directory' }, + const didResolver = new DidResolver({ + plcUrl: 'https://plc.directory', didCache, - ) + }) const server = createServer({ validateResponse: true,