diff options
| -rw-r--r-- | src/components/MessagesList/MessagesGroup/MessagesSystemGroup.vue | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/components/MessagesList/MessagesGroup/MessagesSystemGroup.vue b/src/components/MessagesList/MessagesGroup/MessagesSystemGroup.vue index ed7ffd743..3f06dd193 100644 --- a/src/components/MessagesList/MessagesGroup/MessagesSystemGroup.vue +++ b/src/components/MessagesList/MessagesGroup/MessagesSystemGroup.vue @@ -151,28 +151,27 @@ export default { return '' // No previous message } + if (message1.actorId !== message2.actorId + || message1.actorType !== message2.actorType) { + return '' // Different actors + } + // Group users added by one actor if (message1.systemMessage === 'user_added' - && message1.systemMessage === message2.systemMessage - && message1.actorId === message2.actorId - && message1.actorType === message2.actorType) { + && message1.systemMessage === message2.systemMessage) { return 'user_added' } // Group users removed by one actor if (message1.systemMessage === 'user_removed' - && message1.systemMessage === message2.systemMessage - && message1.actorId === message2.actorId - && message1.actorType === message2.actorType) { + && message1.systemMessage === message2.systemMessage) { return 'user_removed' } // Group users reconnected in a minute if (message1.systemMessage === 'call_joined' && message2.systemMessage === 'call_left' - && message1.timestamp - message2.timestamp < 60 * 1000 - && message1.actorId === message2.actorId - && message1.actorType === message2.actorType) { + && message1.timestamp - message2.timestamp < 60 * 1000) { return 'call_reconnected' } |