diff options
| author | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2020-01-09 04:58:12 +0300 |
|---|---|---|
| committer | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2020-01-09 16:38:50 +0300 |
| commit | d7cc4f35105ed18dccd920496b04ce0c959273eb (patch) | |
| tree | 08434b146e0514dbe7c04107896b6cd48958d8d6 /src | |
| parent | b276e058a95cffff7be6d04f4c420a8e913a9f26 (diff) | |
Show mentions to all using a UserBubble
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/MessagesList/MessagesGroup/Message/Message.vue | 2 | ||||
| -rw-r--r-- | src/components/MessagesList/MessagesGroup/Message/MessagePart/Mention.vue | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/components/MessagesList/MessagesGroup/Message/Message.vue b/src/components/MessagesList/MessagesGroup/Message/Message.vue index b8c82476e..e98891e95 100644 --- a/src/components/MessagesList/MessagesGroup/Message/Message.vue +++ b/src/components/MessagesList/MessagesGroup/Message/Message.vue @@ -287,6 +287,8 @@ export default { return PlainText } else if (messagePartType === 'user') { return Mention + } else if (messagePartType === 'call') { + return Mention } else if (messagePartType === 'file') { return FilePreview } diff --git a/src/components/MessagesList/MessagesGroup/Message/MessagePart/Mention.vue b/src/components/MessagesList/MessagesGroup/Message/MessagePart/Mention.vue index 961701e9a..9827191eb 100644 --- a/src/components/MessagesList/MessagesGroup/Message/MessagePart/Mention.vue +++ b/src/components/MessagesList/MessagesGroup/Message/MessagePart/Mention.vue @@ -20,7 +20,11 @@ --> <template> - <UserBubble + <UserBubble v-if="isMentionToAll" + :display-name="data.name" + :avatar-image="'icon-group-forced-white'" + :primary="true" /> + <UserBubble v-else :display-name="data.name" :user="data.id" :primary="isCurrentUser" /> @@ -50,6 +54,9 @@ export default { }, computed: { + isMentionToAll() { + return this.data.type === 'call' + }, isCurrentUser() { return this.$store.getters.getActorType() === 'users' && this.data.id === this.$store.getters.getUserId() |