mirror of
https://github.com/fromchat-messenger/web.git
synced 2026-09-22 19:15:08 +03:00
Fix messages appearing in the wrong chat
This commit is contained in:
+20
-18
@@ -13,7 +13,7 @@ import { show as showContextMenu } from "./contextMenu";
|
|||||||
import { show as showUserProfileDialog } from "./profileDialog";
|
import { show as showUserProfileDialog } from "./profileDialog";
|
||||||
import defaultAvatar from "../resources/images/default-avatar.png";
|
import defaultAvatar from "../resources/images/default-avatar.png";
|
||||||
import { authToken, currentUser, getAuthHeaders } from "../auth/api";
|
import { authToken, currentUser, getAuthHeaders } from "../auth/api";
|
||||||
import { PublicChatPanel } from "./panel";
|
import { ChatPanelController, PublicChatPanel } from "./panel";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Adds a new message to the chat interface
|
* Adds a new message to the chat interface
|
||||||
@@ -189,23 +189,25 @@ export function removeMessage(messageId: number): void {
|
|||||||
* @param {WebSocketMessage} response - WebSocket response
|
* @param {WebSocketMessage} response - WebSocket response
|
||||||
*/
|
*/
|
||||||
export function handleWebSocketMessage(response: WebSocketMessage): void {
|
export function handleWebSocketMessage(response: WebSocketMessage): void {
|
||||||
switch (response.type) {
|
if (ChatPanelController.active == publicChatPanel) {
|
||||||
case 'messageEdited':
|
switch (response.type) {
|
||||||
if (response.data) {
|
case 'messageEdited':
|
||||||
updateMessage(response.data);
|
if (response.data) {
|
||||||
}
|
updateMessage(response.data);
|
||||||
break;
|
}
|
||||||
case 'messageDeleted':
|
break;
|
||||||
if (response.data && response.data.message_id) {
|
case 'messageDeleted':
|
||||||
removeMessage(response.data.message_id);
|
if (response.data && response.data.message_id) {
|
||||||
}
|
removeMessage(response.data.message_id);
|
||||||
break;
|
}
|
||||||
case 'newMessage':
|
break;
|
||||||
if (response.data) {
|
case 'newMessage':
|
||||||
const isAuthor = response.data.username === currentUser?.username;
|
if (response.data) {
|
||||||
addMessage(response.data, isAuthor);
|
const isAuthor = response.data.username === currentUser?.username;
|
||||||
}
|
addMessage(response.data, isAuthor);
|
||||||
break;
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user