ClaytonWWilson/CS307-Team24
1
0
Fork 0
mirror of https://github.com/ClaytonWWilson/CS307-Team24.git synced 2025-12-16 10:18:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed the sorting of messages

Browse Source
This commit is contained in:
Clayton Wilson 2019-11-15 15:20:39 -05:00
parent 2f5ec1c5ac
commit 63e917f54c
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
functions/handlers/users.js
View File

@ -433,7 +433,7 @@ exports.getDirectMessages = (req, res) => {
let msgs = []; let msgs = [];
let promises = []; let promises = [];
// Get all of the messages in the DM sorted by when they were created // Get all of the messages in the DM
messagesCollection.get() messagesCollection.get()
.then((dmQuerySnap) => { .then((dmQuerySnap) => {
dmQuerySnap.forEach((dmQueryDocSnap) => { dmQuerySnap.forEach((dmQueryDocSnap) => {
@ -448,8 +448,10 @@ exports.getDirectMessages = (req, res) => {
let waitPromise = Promise.all(promises); let waitPromise = Promise.all(promises);
waitPromise.then(() => { waitPromise.then(() => {
// Sort the messages in reverse order by date
// Newest should be at the bottom, because that's how they will be displayed on the front-end
msgs.sort((a, b) => { msgs.sort((a, b) => {
return (b.createdAt < a.createdAt) ? -1 : ((b.createdAt > a.createdAt) ? 1 : 0); return (b.createdAt > a.createdAt) ? -1 : ((b.createdAt < a.createdAt) ? 1 : 0);
}) })
resolve(msgs); resolve(msgs);
}); });
@ -485,8 +487,8 @@ exports.getDirectMessages = (req, res) => {
getMessages(dm) getMessages(dm)
.then((msgs) => { .then((msgs) => {
dmData.messages = msgs; dmData.messages = msgs;
dmData.recentMessage = msgs[0] ? msgs[0].message : null; dmData.recentMessage = msgs.length !== 0 ? msgs[msgs.length - 1].message : null;
dmData.recentMessageTimestamp = msgs[0] ? msgs[0].createdAt : null; dmData.recentMessageTimestamp = msgs.length !== 0 ? msgs[msgs.length - 1].createdAt : null;
dmData.dmId = doc.id; dmData.dmId = doc.id;
resolve(dmData); resolve(dmData);
}) })