diff --git a/src/frontend/components/messages/ConversationViewer.vue b/src/frontend/components/messages/ConversationViewer.vue index dbb193a..b434735 100644 --- a/src/frontend/components/messages/ConversationViewer.vue +++ b/src/frontend/components/messages/ConversationViewer.vue @@ -343,6 +343,7 @@ import Utils from "../../js/Utils"; import DialogUtils from "../../js/DialogUtils"; import NotificationUtils from "../../js/NotificationUtils"; +import WebSocketConnection from "../../js/WebSocketConnection"; export default { name: 'ConversationViewer', @@ -388,8 +389,17 @@ export default { }; }, + beforeUnmount() { + // stop listening for websocket messages + WebSocketConnection.off("message", this.onWebsocketMessage); + }, mounted() { + + // listen for websocket messages + WebSocketConnection.on("message", this.onWebsocketMessage); + this.reload(); + }, methods: { close() { @@ -402,6 +412,27 @@ export default { this.loadLxmfMessages(this.selectedPeer.destination_hash); } }, + async onWebsocketMessage(message) { + const json = JSON.parse(message.data); + switch(json.type){ + case 'lxmf.delivery': { + this.onLxmfMessageReceived(json.lxmf_message); + break; + } + case 'lxmf_message_created': { + this.onLxmfMessageCreated(json.lxmf_message); + break; + } + case 'lxmf_message_state_updated': { + this.onLxmfMessageUpdated(json.lxmf_message); + break; + } + case 'lxmf_message_deleted': { + this.onLxmfMessageDeleted(json.hash); + break; + } + } + }, onLxmfMessageReceived(lxmfMessage) { // add inbound message to ui diff --git a/src/frontend/components/messages/MessagesPage.vue b/src/frontend/components/messages/MessagesPage.vue index 64bb64e..1a5db57 100644 --- a/src/frontend/components/messages/MessagesPage.vue +++ b/src/frontend/components/messages/MessagesPage.vue @@ -124,50 +124,6 @@ export default { } break; } - case 'lxmf.delivery': { - - // pass lxmf message to conversation viewer - const conversationViewer = this.$refs["conversation-viewer"]; - if(conversationViewer){ - conversationViewer.onLxmfMessageReceived(json.lxmf_message); - } - - break; - - } - case 'lxmf_message_created': { - - // pass lxmf message to conversation viewer - const conversationViewer = this.$refs["conversation-viewer"]; - if(conversationViewer){ - conversationViewer.onLxmfMessageCreated(json.lxmf_message); - } - - break; - - } - case 'lxmf_message_state_updated': { - - // pass lxmf message to conversation viewer - const conversationViewer = this.$refs["conversation-viewer"]; - if(conversationViewer){ - conversationViewer.onLxmfMessageUpdated(json.lxmf_message); - } - - break; - - } - case 'lxmf_message_deleted': { - - // pass lxmf message hash to conversation viewer - const conversationViewer = this.$refs["conversation-viewer"]; - if(conversationViewer){ - conversationViewer.onLxmfMessageDeleted(json.hash); - } - - break; - - } } }, async getLxmfDeliveryAnnounces() {