From 868244d49fac35e558e1511a0c53bf8f841fb687 Mon Sep 17 00:00:00 2001
From: Mia <49593536+mia-pi-git@users.noreply.github.com>
Date: Mon, 1 Feb 2021 15:18:38 -0600
Subject: [PATCH] Improve banning servers (#1719)

---
 js/client.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/js/client.js b/js/client.js
index 24f1e35b3..713b30f39 100644
--- a/js/client.js
+++ b/js/client.js
@@ -709,7 +709,17 @@ function toId() {
 		connect: function () {
 			if (this.down) return;
 
-			if (Config.server.banned || (Config.bannedHosts && Config.bannedHosts.indexOf(Config.server.host) >= 0)) {
+			if (Config.bannedHosts) {
+				for (var i = 0; i < Config.bannedHosts.length; i++) {
+					var host = Config.bannedHosts[i];
+					if (typeof host === 'string' ? Config.server.host === host : host.test(Config.server.host)) {
+						Config.server.banned = true;
+						break;
+					}
+				}
+			}
+
+			if (Config.server.banned) {
 				this.addPopupMessage("This server has been deleted for breaking US laws, impersonating PS global staff, or other major rulebreaking.");
 				return;
 			}