diff --git a/packages/ditto/app.ts b/packages/ditto/app.ts index 5a84a80d..f89448c4 100644 --- a/packages/ditto/app.ts +++ b/packages/ditto/app.ts @@ -214,7 +214,7 @@ if (conf.cronEnabled) { cron({ conf, db, relay }); } -const app = new DittoApp({ conf, db, relay }, { strict: false }); +const app = new DittoApp({ conf, db, relay, strict: false }); /** User-provided files in the gitignored `public/` directory. */ const publicFiles = serveStatic({ root: './public/' }); diff --git a/packages/mastoapi/router/DittoApp.ts b/packages/mastoapi/router/DittoApp.ts index 3309f65d..2d3c0107 100644 --- a/packages/mastoapi/router/DittoApp.ts +++ b/packages/mastoapi/router/DittoApp.ts @@ -7,13 +7,13 @@ export class DittoApp extends Hono { // @ts-ignore Require a DittoRoute for type safety. declare route: (path: string, app: Hono) => Hono; - constructor(vars: Omit, opts: HonoOptions = {}) { + constructor(opts: Omit & HonoOptions) { super(opts); this.use((c, next) => { - c.set('db', vars.db); - c.set('conf', vars.conf); - c.set('relay', vars.relay); + c.set('db', opts.db); + c.set('conf', opts.conf); + c.set('relay', opts.relay); c.set('signal', c.req.raw.signal); return next(); });