mirror of
https://github.com/ClaytonWWilson/CS307-Team24.git
synced 2025-12-16 10:18:48 +00:00
Fix sorting so empty DM channels go to the bottom of the list
This commit is contained in:
parent
0f1cfe0393
commit
a59c2feb4a
@ -514,7 +514,19 @@ exports.getDirectMessages = (req, res) => {
|
|||||||
.then(() => {
|
.then(() => {
|
||||||
// Sort the DMs so that the ones with the newest messages are at the top
|
// Sort the DMs so that the ones with the newest messages are at the top
|
||||||
dmsData.sort((a, b) => {
|
dmsData.sort((a, b) => {
|
||||||
return (b.recentMessageTimestamp < a.recentMessageTimestamp) ? -1 : ((b.recentMessageTimestamp > a.recentMessageTimestamp) ? 1 : 0);
|
if (a.recentMessageTimestamp === null && b.recentMessageTimestamp === null) {
|
||||||
|
return 0;
|
||||||
|
} else if (a.recentMessageTimestamp === null) {
|
||||||
|
return 1;
|
||||||
|
} else if (b.recentMessageTimestamp === null) {
|
||||||
|
return -1;
|
||||||
|
} else if (b.recentMessageTimestamp < a.recentMessageTimestamp) {
|
||||||
|
return -1;
|
||||||
|
} else if (b.recentMessageTimestamp > a.recentMessageTimestamp) {
|
||||||
|
return 1;
|
||||||
|
} else {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
return res.status(200).json({data: dmsData})
|
return res.status(200).json({data: dmsData})
|
||||||
})
|
})
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user