From a76ac1344e2d5631114588c9049b7eade671c234 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Fri, 13 Feb 2026 09:04:16 -0600
Subject: [PATCH] fix: resolveAllowFrom uses cfg+accountId params, not account

---
 extensions/matrix/src/channel.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/extensions/matrix/src/channel.ts b/extensions/matrix/src/channel.ts
index 9dc020064..0924a2415 100644
--- a/extensions/matrix/src/channel.ts
+++ b/extensions/matrix/src/channel.ts
@@ -145,8 +145,10 @@ export const matrixPlugin: ChannelPlugin<ResolvedMatrixAccount> = {
       configured: account.configured,
       baseUrl: account.homeserver,
     }),
-    resolveAllowFrom: ({ account }) =>
-      (account.config.dm?.allowFrom ?? []).map((entry) => String(entry)),
+    resolveAllowFrom: ({ cfg, accountId }) => {
+      const account = resolveMatrixAccount({ cfg: cfg as CoreConfig, accountId });
+      return (account.config.dm?.allowFrom ?? []).map((entry: string | number) => String(entry));
+    },
     formatAllowFrom: ({ allowFrom }) => normalizeMatrixAllowList(allowFrom),
   },
   security: {