Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add aiBotUserId to matrix service #2169

Merged
merged 2 commits into from
Feb 19, 2025
Merged

Add aiBotUserId to matrix service #2169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f70476
Add aiBotUserId to matrix service
lukemelia Feb 19, 2025
ebda5c7
Merge branch 'main' into matrix-service-adjustment
lukemelia Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions packages/host/app/commands/create-ai-assistant-room.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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],
Expand Down
7 changes: 7 additions & 0 deletions packages/host/app/services/matrix-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ import {
baseRealm,
LooseCardResource,
ResolvedCodeRef,
aiBotUsername,
} from '@cardstack/runtime-common';

import {
basicMappings,
generateJsonSchemaForCardType,
Expand Down Expand Up @@ -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;
}
Expand Down