From 1588a29e0828b24c68f9b8aeef016adda20f07f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D9=83=D8=A7=D8=B1=D9=84=20=D9=85=D8=A8=D8=A7=D8=B1=D9=83?= Date: Fri, 23 Jul 2021 21:40:30 +0200 Subject: [PATCH] real-time style edits are exclusive --- front/src/App.vue | 20 +++++++++++--------- front/src/store/index.js | 34 ++++++++++++++++------------------ 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/front/src/App.vue b/front/src/App.vue index 61fe9a5..7cc8958 100644 --- a/front/src/App.vue +++ b/front/src/App.vue @@ -121,15 +121,17 @@ export default { console.log('event:', event); switch (event.type) { case "message": - switch (event.message.subject) { - case "rules": - this.$store.commit("addRule", event.message); - break; - default: - this.$store.commit("addMessage", event.message); - break; - } - break; + if (event.message.display_recipient == this.currentStream.name) { + switch (event.message.subject) { + case "rules": + this.$store.commit("addRule", event.message); + break; + default: + this.$store.commit("addMessage", event.message); + break; + } + break; + } case "delete_message": this.$store.commit("deleteMessage", event.message_id); diff --git a/front/src/store/index.js b/front/src/store/index.js index 1c1d685..c143dbd 100644 --- a/front/src/store/index.js +++ b/front/src/store/index.js @@ -144,24 +144,22 @@ export default createStore({ setCurStream: (state, stream) => state.currentStream = stream, setTopics: (state, topics) => state.topics = topics, addMessage: (state, message) => { - if (message.display_recipient == state.currentStream.name) { - if (message.content.startsWith('@_**')) { - handleMDReply(message) - } else if ( - message.content.includes('user-mention') && - message.content.includes('blockquote') - ) { - handleHTMLReply(message) - } - const topic = state.topics.find(topic => topic.title == message.subject) - if (topic) { - topic.messages.push(message) - } else { - state.topics.push({ - title: message.subject, - messages: [message] - }) - } + if (message.content.startsWith('@_**')) { + handleMDReply(message) + } else if ( + message.content.includes('user-mention') && + message.content.includes('blockquote') + ) { + handleHTMLReply(message) + } + const topic = state.topics.find(topic => topic.title == message.subject) + if (topic) { + topic.messages.push(message) + } else { + state.topics.push({ + title: message.subject, + messages: [message] + }) } }, deleteMessage: (state, { mid, subject }) => {