Skip to content

Commit

Permalink
Handle edition and deletion of message in collaborative chat extension
Browse files Browse the repository at this point in the history
  • Loading branch information
brichet committed Apr 25, 2024
1 parent 2a9c263 commit 794fb74
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 4 deletions.
12 changes: 8 additions & 4 deletions packages/jupyter-chat/src/components/chat.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,20 +55,24 @@ function ChatBody({
if (message.type === 'clear') {
setMessages([]);
return;
} else if (message.type === 'msg') {
} else {
setMessages((messageGroups: IChatMessage[]) => {
const existingMessages = [...messageGroups];

const messageIndex = existingMessages.findIndex(
msg => msg.id === message.id
);
if (messageIndex > -1) {
// The message is an update of an existing one.
// Let's remove it (to avoid position conflict if timestamp has changed)
// and add the new one.
// The message is an update of an existing one (or a removal).
// Let's remove it anyway (to avoid position conflict if timestamp has
// changed) and add the new one if it is an update.
existingMessages.splice(messageIndex, 1);
}

if (message.type === 'remove') {
return existingMessages;
}

// Find the first message that should be after this one.
let nextMsgIndex = existingMessages.findIndex(
msg => msg.time > message.time
Expand Down
24 changes: 24 additions & 0 deletions packages/jupyterlab-collaborative-chat/src/model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,30 @@ export class CollaborativeChatModel
this.sharedModel.transact(() => void this.sharedModel.setMessage(msg));
}

updateMessage(
id: string,
message: IChatMessage
): Promise<boolean | void> | boolean | void {
let sender: string;
if (typeof message.sender === 'string') {
sender = message.sender;
} else {
sender = message.sender.username;
}
const msg: IYmessage = {
type: 'msg',
id: id || UUID.uuid4(),
body: message.body,
time: message.time || Date.now() / 1000,
sender: sender
};
this.sharedModel.transact(() => void this.sharedModel.setMessage(msg));
}

deleteMessage(id: string): Promise<boolean | void> | boolean | void {
this.sharedModel.transact(() => void this.sharedModel.deleteMessage(id));
}

private _onchange = (_: YChat, change: ChatChange) => {
if (change.messageChanges) {
const msgChange = change.messageChanges;
Expand Down
4 changes: 4 additions & 0 deletions packages/jupyterlab-collaborative-chat/src/ychat.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,10 @@ export class YChat extends YDocument<ChatChange> {
this._messages.set(value.id, value);
}

deleteMessage(id: string): void {
this._messages.delete(id);
}

private _usersObserver = (event: Y.YMapEvent<IUser>): void => {
const userChange = new Array<UserChange>();
event.keysChanged.forEach(key => {
Expand Down

0 comments on commit 794fb74

Please sign in to comment.