diff --git a/packages/ditto/controllers/api/notifications.ts b/packages/ditto/controllers/api/notifications.ts index f180cf9e..f0435bc4 100644 --- a/packages/ditto/controllers/api/notifications.ts +++ b/packages/ditto/controllers/api/notifications.ts @@ -107,8 +107,9 @@ async function renderNotifications( params: DittoPagination, c: AppContext, ) { - const { conf, relay, user, signal } = c.var; + const { conf, user, signal } = c.var; + const relay = user!.relay; const pubkey = await user!.signer.getPublicKey(); const opts = { signal, limit: params.limit, timeout: conf.db.timeouts.timelines }; diff --git a/packages/ditto/controllers/api/timelines.ts b/packages/ditto/controllers/api/timelines.ts index b8c74f41..5ef83856 100644 --- a/packages/ditto/controllers/api/timelines.ts +++ b/packages/ditto/controllers/api/timelines.ts @@ -103,8 +103,9 @@ const suggestedTimelineController: AppController = async (c) => { /** Render statuses for timelines. */ async function renderStatuses(c: AppContext, filters: NostrFilter[]) { - const { conf, relay, user, signal } = c.var; + const { conf, user, signal } = c.var; + const relay = user?.relay ?? c.var.relay; const opts = { signal, timeout: conf.db.timeouts.timelines }; const events = await relay