From 6e4a7f0ac9534050071264edf2a5ae6619f41aaf Mon Sep 17 00:00:00 2001
From: bytedream <me@bytedream.dev>
Date: Mon, 23 Jun 2025 21:12:00 +0200
Subject: [PATCH] update team sorting

---
 src/app/website/index/Teams.svelte | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/app/website/index/Teams.svelte b/src/app/website/index/Teams.svelte
index b9c8c24..3b71631 100644
--- a/src/app/website/index/Teams.svelte
+++ b/src/app/website/index/Teams.svelte
@@ -20,14 +20,16 @@
     kills: deaths.filter((d) => d.killerUserId === team.memberOne.id || d.killerUserId === team.memberTwo.id).length
   }));
   entries.sort((a, b) => {
-    const aAllowed =
-      !!a.memberOne.id && !!a.memberTwo.id && !(a.memberOne.deathMessage !== null && a.memberTwo.deathMessage !== null);
-    const bAllowed =
-      !!b.memberOne.id && !!b.memberTwo.id && !(b.memberOne.deathMessage !== null && b.memberTwo.deathMessage !== null);
-    if (!aAllowed && !bAllowed) {
-      return 0;
-    } else if (!aAllowed || !bAllowed) {
-      return (bAllowed as unknown as number) - (aAllowed as unknown as number);
+    const aBothSignedUp = a.memberOne.id != null && a.memberTwo.id != null;
+    const aBothDeathMessage = a.memberOne.deathMessage != null && a.memberTwo.deathMessage != null;
+
+    const bBothSignedUp = b.memberOne.id != null && b.memberTwo.id != null;
+    const bBothDeathMessage = b.memberOne.deathMessage != null && b.memberTwo.deathMessage != null;
+
+    if (!aBothSignedUp || !bBothSignedUp) {
+      return Number(bBothSignedUp) - Number(aBothSignedUp);
+    } else if (aBothDeathMessage && !bBothDeathMessage || !aBothDeathMessage  && bBothDeathMessage) {
+      return Number(aBothDeathMessage) - Number(bBothDeathMessage);
     }
 
     return b.kills - a.kills;