more fixes after rebase

repco-org · Nov 23, 2023 · b27fe5e · b27fe5e
1 parent f084312
commit b27fe5e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/packages/repco-activitypub/src/ap.ts b/packages/repco-activitypub/src/ap.ts
@@ -103,7 +103,7 @@ export class ActivityPub extends EventEmitter {
     }
     const keypair = generateRsaKeypairPem()
     const data = { name, keypair }
-    await this.db.apLocalActor.create({ data })
+    return await this.db.apLocalActor.create({ data })
   }
 
   async listActors() {

diff --git a/packages/repco-core/package.json b/packages/repco-core/package.json
@@ -28,6 +28,7 @@
     "level": "^8.0.0",
     "multiformats": "^11.0.2",
     "repco-common": "*",
+    "repco-activitypub": "*",
     "repco-prisma": "*",
     "rss-parser": "^3.12.0",
     "speedometer": "^1.1.0",

diff --git a/packages/repco-core/tsconfig.json b/packages/repco-core/tsconfig.json
@@ -13,6 +13,9 @@
     {
       "path": "../repco-prisma"
     },
+    {
+      "path": "../repco-activitypub"
+    },
     {
       "path": "../repco-common"
     }

diff --git a/packages/repco-server/src/lib.ts b/packages/repco-server/src/lib.ts
@@ -53,7 +53,7 @@ export function runServer(prisma: PrismaClient, port: number) {
   app.use(graphqlHandler)
   app.use((_req, res, next) => {
     res.locals.prisma = prisma
-    res.locals.log = logger.logger
+    res.locals.log = logger
     next()
   })
 

diff --git a/packages/repco-server/src/routes/api.ts b/packages/repco-server/src/routes/api.ts
@@ -13,7 +13,7 @@ import {
 } from 'repco-core'
 import { Readable } from 'stream'
 import { router as adminRouter } from './admin.js'
-import { ServerError } from '../error.js'
+import { ServerError, notFoundHandler } from '../error.js'
 import { getLocals } from '../lib.js'
 import {
   acceptNdJson,
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,9 @@ @@
         {
           "path": "../repco-prisma"
         },
+        {
+          "path": "../repco-activitypub"
+        },
         {
           "path": "../repco-common"
         }
@@ Expand Down @@