diff options
-rw-r--r-- | css/icons.scss | 3 | ||||
-rw-r--r-- | src/components/MessagesList/MessagesGroup/Message/Message.vue | 2 | ||||
-rw-r--r-- | src/components/MessagesList/MessagesGroup/Message/MessagePart/Mention.vue | 11 |
3 files changed, 16 insertions, 0 deletions
diff --git a/css/icons.scss b/css/icons.scss index 10168c514..f3de8e515 100644 --- a/css/icons.scss +++ b/css/icons.scss @@ -34,6 +34,9 @@ .icon-group-forced-white { background-image: url(icon-color-path('group', 'actions', 'fff', 1, true)); } + .icon-user-forced-white { + background-image: url(icon-color-path('user', 'actions', 'fff', 1, true)); + } .forced-white { &.icon-menu-people { diff --git a/src/components/MessagesList/MessagesGroup/Message/Message.vue b/src/components/MessagesList/MessagesGroup/Message/Message.vue index e98891e95..c7567e7fa 100644 --- a/src/components/MessagesList/MessagesGroup/Message/Message.vue +++ b/src/components/MessagesList/MessagesGroup/Message/Message.vue @@ -289,6 +289,8 @@ export default { return Mention } else if (messagePartType === 'call') { return Mention + } else if (messagePartType === 'guest') { + 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 9827191eb..d31e18d89 100644 --- a/src/components/MessagesList/MessagesGroup/Message/MessagePart/Mention.vue +++ b/src/components/MessagesList/MessagesGroup/Message/MessagePart/Mention.vue @@ -24,6 +24,10 @@ :display-name="data.name" :avatar-image="'icon-group-forced-white'" :primary="true" /> + <UserBubble v-else-if="isMentionToGuest" + :display-name="data.name" + :avatar-image="'icon-user-forced-white'" + :primary="isCurrentGuest" /> <UserBubble v-else :display-name="data.name" :user="data.id" @@ -57,6 +61,13 @@ export default { isMentionToAll() { return this.data.type === 'call' }, + isMentionToGuest() { + return this.data.type === 'guest' + }, + isCurrentGuest() { + return this.$store.getters.getActorType() === 'guests' + && this.data.id === ('guest/' + this.$store.getters.getSessionHash()) + }, isCurrentUser() { return this.$store.getters.getActorType() === 'users' && this.data.id === this.$store.getters.getUserId() |