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

inbox: fix avatar display and order

Browse Source
This commit is contained in:
Matteo Pagliazzi
2018-10-02 22:30:07 +02:00
parent 362ca73c94
commit 5a8366468b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -287,7 +287,7 @@ export default {
const convos = []; const convos = [];
for (let key in inboxGroup) { for (let key in inboxGroup) {
const convoSorted = sortBy(inboxGroup[key], [(o) => { const convoSorted = sortBy(inboxGroup[key], [(o) => {
return o.timestamp; return (new Date(o.timestamp)).getTime();
}]); }]);
// Fix poor inbox chat models // Fix poor inbox chat models

2
website/server/models/user/methods.js
View File

@@ -154,7 +154,7 @@ schema.methods.sendMessage = async function sendMessage (userToReceiveMessage, o
ownerId: sender._id, ownerId: sender._id,
}); });
Object.assign(newSenderMessage, messageDefaults(senderMsg, userToReceiveMessage)); Object.assign(newSenderMessage, messageDefaults(senderMsg, userToReceiveMessage));
setUserStyles(newSenderMessage, userToReceiveMessage); setUserStyles(newSenderMessage, sender);
} }
const promises = [newReceiverMessage.save()]; const promises = [newReceiverMessage.save()];