From 8a978b088bdc0e516d23f5427bd80b355f43d551 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 20 Feb 2025 18:57:55 -0600
Subject: [PATCH] Use the user's store in a few places where it matters

---
 packages/ditto/controllers/api/notifications.ts | 3 ++-
 packages/ditto/controllers/api/timelines.ts     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

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