diff options
| author | DorraJaouad <dorra.jaoued7@gmail.com> | 2024-07-04 13:53:15 +0200 |
|---|---|---|
| committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | 2024-07-04 12:23:43 +0000 |
| commit | 73a0c0538b0eca5cea3e500fc2f29982e74df302 (patch) | |
| tree | e78848f421122632b0e35478bd5f59731a4ccc71 | |
| parent | 4572406487db88580f8816c718f4550e01a76139 (diff) | |
fix(MessagesSystemGroup): separate messages with different actorsbackport/12640/stable29
Signed-off-by: DorraJaouad <dorra.jaoued7@gmail.com>
| -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' } |