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

Jump to bottom

Fix restoring welcome message avatar icon. #188722

Merged
merged 1 commit into from
Jul 24, 2023
Merged

Fix restoring welcome message avatar icon. #188722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/vs/workbench/contrib/chat/common/chatModel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ export class ChatModel extends Disposable implements IChatModel {

if (obj.welcomeMessage) {
const content = obj.welcomeMessage.map(item => typeof item === 'string' ? new MarkdownString(item) : item);
this._welcomeMessage = new ChatWelcomeMessageModel(content, obj.responderUsername, obj.responderAvatarIconUri && URI.revive(obj.responderAvatarIconUri));
this._welcomeMessage = new ChatWelcomeMessageModel(this, content);
}

return requests.map((raw: ISerializableChatRequestData) => {
Expand Down Expand Up @@ -638,7 +638,18 @@ export class ChatWelcomeMessageModel implements IChatWelcomeMessageModel {
return this._id;
}

constructor(public readonly content: IChatWelcomeMessageContent[], public readonly username: string, public readonly avatarIconUri?: URI) {
constructor(
private readonly session: ChatModel,
public readonly content: IChatWelcomeMessageContent[],
) {
this._id = 'welcome_' + ChatWelcomeMessageModel.nextId++;
}

public get username(): string {
return this.session.responderUsername;
}

public get avatarIconUri(): URI | undefined {
return this.session.responderAvatarIconUri;
}
}
2 changes: 1 addition & 1 deletion src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ export class ChatService extends Disposable implements IChatService {

const welcomeMessage = model.welcomeMessage ? undefined : withNullAsUndefined(await provider.provideWelcomeMessage?.(token));
const welcomeModel = welcomeMessage && new ChatWelcomeMessageModel(
welcomeMessage.map(item => typeof item === 'string' ? new MarkdownString(item) : item as IChatReplyFollowup[]), session.responderUsername, session.responderAvatarIconUri);
model, welcomeMessage.map(item => typeof item === 'string' ? new MarkdownString(item) : item as IChatReplyFollowup[]));

model.initialize(session, welcomeModel);
}
Expand Down