update team sorting
This commit is contained in:
@ -20,14 +20,16 @@
|
|||||||
kills: deaths.filter((d) => d.killerUserId === team.memberOne.id || d.killerUserId === team.memberTwo.id).length
|
kills: deaths.filter((d) => d.killerUserId === team.memberOne.id || d.killerUserId === team.memberTwo.id).length
|
||||||
}));
|
}));
|
||||||
entries.sort((a, b) => {
|
entries.sort((a, b) => {
|
||||||
const aAllowed =
|
const aBothSignedUp = a.memberOne.id != null && a.memberTwo.id != null;
|
||||||
!!a.memberOne.id && !!a.memberTwo.id && !(a.memberOne.deathMessage !== null && a.memberTwo.deathMessage !== null);
|
const aBothDeathMessage = a.memberOne.deathMessage != null && a.memberTwo.deathMessage != null;
|
||||||
const bAllowed =
|
|
||||||
!!b.memberOne.id && !!b.memberTwo.id && !(b.memberOne.deathMessage !== null && b.memberTwo.deathMessage !== null);
|
const bBothSignedUp = b.memberOne.id != null && b.memberTwo.id != null;
|
||||||
if (!aAllowed && !bAllowed) {
|
const bBothDeathMessage = b.memberOne.deathMessage != null && b.memberTwo.deathMessage != null;
|
||||||
return 0;
|
|
||||||
} else if (!aAllowed || !bAllowed) {
|
if (!aBothSignedUp || !bBothSignedUp) {
|
||||||
return (bAllowed as unknown as number) - (aAllowed as unknown as number);
|
return Number(bBothSignedUp) - Number(aBothSignedUp);
|
||||||
|
} else if (aBothDeathMessage && !bBothDeathMessage || !aBothDeathMessage && bBothDeathMessage) {
|
||||||
|
return Number(aBothDeathMessage) - Number(bBothDeathMessage);
|
||||||
}
|
}
|
||||||
|
|
||||||
return b.kills - a.kills;
|
return b.kills - a.kills;
|
||||||
|
Reference in New Issue
Block a user