From 86ae5f3e4435c0019189fe1896ce63669f8de67f Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Thu, 1 Nov 2018 19:34:57 -0500 Subject: [PATCH] fix(inbox): don't show likes in inbox Also remove convo list contrib styling for now --- website/client/components/chat/chatCard.vue | 2 +- website/client/components/userMenu/inbox.vue | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/website/client/components/chat/chatCard.vue b/website/client/components/chat/chatCard.vue index 7e14eeba47..915cff69c4 100644 --- a/website/client/components/chat/chatCard.vue +++ b/website/client/components/chat/chatCard.vue @@ -29,7 +29,7 @@ div .action.d-flex.align-items-center(v-if='msg.uuid === user._id || inbox || user.contributor.admin', @click='remove()') .svg-icon(v-html="icons.delete") | {{$t('delete')}} - .ml-auto.d-flex + .ml-auto.d-flex(v-if='!inbox') .action.d-flex.align-items-center.mr-0(@click='like()', v-if='likeCount > 0', :class='{active: msg.likes[user._id]}') .svg-icon(v-html="icons.liked") | +{{ likeCount }} diff --git a/website/client/components/userMenu/inbox.vue b/website/client/components/userMenu/inbox.vue index 3117475697..ff36e3a325 100644 --- a/website/client/components/userMenu/inbox.vue +++ b/website/client/components/userMenu/inbox.vue @@ -316,9 +316,7 @@ export default { inboxGroup[this.initiatedConversation.uuid] = [{ uuid: this.initiatedConversation.uuid, user: this.initiatedConversation.user, - username: this.initiatedConversation.username, // ? - backer: this.initiatedConversation.backer, - contributor: this.initiatedConversation.contributor, + username: this.initiatedConversation.username, id: '', text: '', timestamp: new Date(), @@ -353,14 +351,10 @@ export default { const recentMessage = newChatModels[newChatModels.length - 1]; if (!recentMessage.text) newChatModels.splice(newChatModels.length - 1, 1); - if (recentMessage.username === this.user.auth.local.username) recentMessage.username = null; - const convoModel = { key: recentMessage.toUUID ? recentMessage.toUUID : recentMessage.uuid, name: recentMessage.toUser ? recentMessage.toUser : recentMessage.user, // Handles case where from user sent the only message or the to user sent the only message - username: recentMessage.toUserName ? recentMessage.toUserName : recentMessage.username, - backer: recentMessage.toUserBacker ? recentMessage.toUserBacker : recentMessage.backer, - contributor: recentMessage.toUserContributor ? recentMessage.toUserContributor : recentMessage.contributor, + username: !recentMessage.text ? recentMessage.username : recentMessage.toUserName, date: recentMessage.timestamp, lastMessageText: recentMessage.text, messages: newChatModels,