Merge pull request #2169 from cardstack/matrix-service-adjustment

cardstack · Feb 19, 2025 · 3b2b6f8 · 3b2b6f8
2 parents 2774829 + ebda5c7
commit 3b2b6f8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/packages/host/app/commands/create-ai-assistant-room.ts b/packages/host/app/commands/create-ai-assistant-room.ts
@@ -2,8 +2,6 @@ import { service } from '@ember/service';
 
 import format from 'date-fns/format';
 
-import { aiBotUsername } from '@cardstack/runtime-common';
-
 import {
   APP_BOXEL_ACTIVE_LLM,
   DEFAULT_LLM,
@@ -31,14 +29,8 @@ export default class CreateAiAssistantRoomCommand extends HostBaseCommand<
     input: BaseCommandModule.CreateAIAssistantRoomInput,
   ): Promise<BaseCommandModule.CreateAIAssistantRoomResult> {
     let { matrixService } = this;
-    let { userId } = matrixService;
-    if (!userId) {
-      throw new Error(
-        `bug: there is no userId associated with the matrix client`,
-      );
-    }
-    let server = userId!.split(':')[1];
-    let aiBotFullId = `@${aiBotUsername}:${server}`;
+    let userId = matrixService.userId;
+    let aiBotFullId = matrixService.aiBotUserId;
     let { room_id: roomId } = await matrixService.createRoom({
       preset: matrixService.privateChatPreset,
       invite: [aiBotFullId],

diff --git a/packages/host/app/services/matrix-service.ts b/packages/host/app/services/matrix-service.ts
@@ -26,7 +26,9 @@ import {
   baseRealm,
   LooseCardResource,
   ResolvedCodeRef,
+  aiBotUsername,
 } from '@cardstack/runtime-common';
+
 import {
   basicMappings,
   generateJsonSchemaForCardType,
@@ -233,6 +235,11 @@ export default class MatrixService extends Service {
     return this.client.getUserId();
   }
 
+  get aiBotUserId() {
+    let server = this.userId!.split(':')[1];
+    return `@${aiBotUsername}:${server}`;
+  }
+
   get userName() {
     return this.userId ? getMatrixUsername(this.userId) : null;
   }