krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(inbox): don't show likes in inbox

Browse Source 
Also remove convo list contrib styling for now
This commit is contained in:
Sabe Jones
2018-11-01 19:34:57 -05:00
parent 3922415314
commit 86ae5f3e44
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/client/components/chat/chatCard.vue
View File

@@ -29,7 +29,7 @@ div
.action.d-flex.align-items-center(v-if='msg.uuid === user._id || inbox || user.contributor.admin', @click='remove()') .action.d-flex.align-items-center(v-if='msg.uuid === user._id || inbox || user.contributor.admin', @click='remove()')
.svg-icon(v-html="icons.delete") .svg-icon(v-html="icons.delete")
| {{$t('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]}') .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") .svg-icon(v-html="icons.liked")
| +{{ likeCount }} | +{{ likeCount }}

10
website/client/components/userMenu/inbox.vue
View File

@@ -316,9 +316,7 @@ export default {
inboxGroup[this.initiatedConversation.uuid] = [{ inboxGroup[this.initiatedConversation.uuid] = [{
uuid: this.initiatedConversation.uuid, uuid: this.initiatedConversation.uuid,
user: this.initiatedConversation.user, user: this.initiatedConversation.user,
username: this.initiatedConversation.username, // ? username: this.initiatedConversation.username,
backer: this.initiatedConversation.backer,
contributor: this.initiatedConversation.contributor,
id: '', id: '',
text: '', text: '',
timestamp: new Date(), timestamp: new Date(),
@@ -353,14 +351,10 @@ export default {
const recentMessage = newChatModels[newChatModels.length - 1]; const recentMessage = newChatModels[newChatModels.length - 1];
if (!recentMessage.text) newChatModels.splice(newChatModels.length - 1, 1); if (!recentMessage.text) newChatModels.splice(newChatModels.length - 1, 1);
if (recentMessage.username === this.user.auth.local.username) recentMessage.username = null;
const convoModel = { const convoModel = {
key: recentMessage.toUUID ? recentMessage.toUUID : recentMessage.uuid, 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 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, username: !recentMessage.text ? recentMessage.username : recentMessage.toUserName,
backer: recentMessage.toUserBacker ? recentMessage.toUserBacker : recentMessage.backer,
contributor: recentMessage.toUserContributor ? recentMessage.toUserContributor : recentMessage.contributor,
date: recentMessage.timestamp, date: recentMessage.timestamp,
lastMessageText: recentMessage.text, lastMessageText: recentMessage.text,
messages: newChatModels, messages: newChatModels,