Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/spreed.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormarco <marcoambrosini@pm.me>2021-09-28 11:40:42 +0300
committerJoas Schilling <coding@schilljs.com>2021-09-29 13:02:54 +0300
commit205a8818d19d3c90eba180a4e7395953938216f5 (patch)
treefe28a4d802c8ae3cfa44b1fab0e7f40130079db0 /src
parentf7e4997a999b37c96b44d2ec5fea8345b3bdbd5e (diff)
Differentiate between direct mentions and group nmentions
Signed-off-by: marco <marcoambrosini@pm.me>
Diffstat (limited to 'src')
-rw-r--r--src/components/LeftSidebar/ConversationsList/Conversation.vue12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/components/LeftSidebar/ConversationsList/Conversation.vue b/src/components/LeftSidebar/ConversationsList/Conversation.vue
index 039068831..d78621269 100644
--- a/src/components/LeftSidebar/ConversationsList/Conversation.vue
+++ b/src/components/LeftSidebar/ConversationsList/Conversation.vue
@@ -27,7 +27,7 @@
:to="to"
:bold="!!item.unreadMessages"
:counter-number="item.unreadMessages"
- :counter-highlighted="counterShouldBePrimary"
+ :counter-type="counterType"
@click="onClick">
<template #icon>
<ConversationIcon
@@ -157,8 +157,14 @@ export default {
computed: {
- counterShouldBePrimary() {
- return this.item.unreadMention || (this.item.unreadMessages !== 0 && this.item.type === CONVERSATION.TYPE.ONE_TO_ONE)
+ counterType() {
+ if (this.item.unreadMentionDirect || (this.item.unreadMessages !== 0 && this.item.type === CONVERSATION.TYPE.ONE_TO_ONE)) {
+ return 'highlighted'
+ } else if (this.item.unreadMention) {
+ return 'outlined'
+ } else {
+ return ''
+ }
},
linkToConversation() {