From e69b61fb4c02e6cd9c79d398dad103e48b751c1f Mon Sep 17 00:00:00 2001
From: Ajay <dev@ajay.app>
Date: Sat, 28 Jan 2023 14:42:16 -0500
Subject: [PATCH] Fix shadow ban exiting early

---
 docker/docker-compose-ci.yml |  1 +
 src/routes/shadowBanUser.ts  | 13 ++++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/docker/docker-compose-ci.yml b/docker/docker-compose-ci.yml
index 7e64c76..47c9d73 100644
--- a/docker/docker-compose-ci.yml
+++ b/docker/docker-compose-ci.yml
@@ -1,6 +1,7 @@
 version: '3'
 services:
   postgres:
+    container_name: somethingelse
     image: postgres:alpine
     environment:
       - POSTGRES_USER=${PG_USER}
diff --git a/src/routes/shadowBanUser.ts b/src/routes/shadowBanUser.ts
index 80950d4..1f83805 100644
--- a/src/routes/shadowBanUser.ts
+++ b/src/routes/shadowBanUser.ts
@@ -43,9 +43,6 @@ export async function shadowBanUser(req: Request, res: Response): Promise<Respon
 
     if (userID) {
         const result = await banUser(userID, enabled, unHideOldSubmissions, type, categories);
-        if (result) {
-            res.sendStatus(result);
-        }
 
         if (enabled && lookForIPs) {
             const ipLoggingFixedTime = 1674590916069;
@@ -54,14 +51,20 @@ export async function shadowBanUser(req: Request, res: Response): Promise<Respon
                 return privateDB.prepare("all", `SELECT "hashedIP" FROM "sponsorTimes" WHERE "timeSubmitted" = ?`, [s.timeSubmitted]) as Promise<{ hashedIP: HashedIP }[]>;
             }))).flat();
 
-            await Promise.all(ips.map((ip) => {
-                return banIP(ip.hashedIP, enabled, unHideOldSubmissions, type, categories, true);
+            await Promise.all([...new Set(ips.map((ip) => ip.hashedIP))].map((ip) => {
+                return banIP(ip, enabled, unHideOldSubmissions, type, categories, true);
             }));
         }
+
+        if (result) {
+            res.sendStatus(result);
+            return;
+        }
     } else if (hashedIP) {
         const result = await banIP(hashedIP, enabled, unHideOldSubmissions, type, categories, banUsers);
         if (result) {
             res.sendStatus(result);
+            return;
         }
     }
     return res.sendStatus(200);