From 32d7248d47ccefb1925470416687cbf52e6b4cc2 Mon Sep 17 00:00:00 2001
From: Licho <licho@licho.eu>
Date: Wed, 21 Aug 2024 18:34:07 +0200
Subject: [PATCH 1/2] enable VPN check for non-steam users

---
 .idea/.idea.Zero-K/.idea/projectSettingsUpdater.xml | 2 +-
 Shared/PlasmaShared/GlobalConst.cs                  | 2 +-
 ZkLobbyServer/LoginChecker.cs                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.idea/.idea.Zero-K/.idea/projectSettingsUpdater.xml b/.idea/.idea.Zero-K/.idea/projectSettingsUpdater.xml
index 4bb9f4d2a0..86cc6c63e5 100644
--- a/.idea/.idea.Zero-K/.idea/projectSettingsUpdater.xml
+++ b/.idea/.idea.Zero-K/.idea/projectSettingsUpdater.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="RiderProjectSettingsUpdater">
-    <option name="vcsConfiguration" value="2" />
+    <option name="vcsConfiguration" value="3" />
   </component>
 </project>
\ No newline at end of file
diff --git a/Shared/PlasmaShared/GlobalConst.cs b/Shared/PlasmaShared/GlobalConst.cs
index 03e53af9df..ec54298590 100644
--- a/Shared/PlasmaShared/GlobalConst.cs
+++ b/Shared/PlasmaShared/GlobalConst.cs
@@ -195,7 +195,7 @@ static void SetMode(ModeType newMode)
         public const string BomberIcon = "/img/fleets/neutral.png";
         public const string WarpIcon = "/img/warpcore.png";
 
-        public const bool VpnCheckEnabled = false; 
+        public const bool VpnCheckEnabled = true; 
 
         public const double EurosToKudos = 10.0;
         public const string TeamEmail = "Zero-K team <team@zero-k.info>";
diff --git a/ZkLobbyServer/LoginChecker.cs b/ZkLobbyServer/LoginChecker.cs
index f0eb31c3d6..dd5972cd8e 100644
--- a/ZkLobbyServer/LoginChecker.cs
+++ b/ZkLobbyServer/LoginChecker.cs
@@ -173,7 +173,7 @@ public async Task<LoginCheckerResponse> DoLogin(Login login, string ip, List<ulo
                                 userID,
                                 installID);
 
-                    if (!acc.HasVpnException && GlobalConst.VpnCheckEnabled) if (HasVpn(ip, acc, db)) return BlockLogin("Connection using proxy or VPN is not allowed! (You can ask for exception)", acc, ip, userID, installID);
+                    if (!acc.HasVpnException && GlobalConst.VpnCheckEnabled && !acc.SteamID.HasValue) if (HasVpn(ip, acc, db)) return BlockLogin("Connection using proxy or VPN is not allowed! (You can ask for exception)", acc, ip, userID, installID);
 
                     return ret;
                 }

From 96309a1f1f6ecc2445b2cc92d1e8b086167ed926 Mon Sep 17 00:00:00 2001
From: sprunk <gnurps@o2.pl>
Date: Wed, 21 Aug 2024 18:37:02 +0200
Subject: [PATCH 2/2] commit discord message: add horizontal lines (#2989)

To better delimit adjacent commits
---
 Zero-K.info/Controllers/GithubController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Zero-K.info/Controllers/GithubController.cs b/Zero-K.info/Controllers/GithubController.cs
index fe3014f63e..2597bf7a7e 100644
--- a/Zero-K.info/Controllers/GithubController.cs
+++ b/Zero-K.info/Controllers/GithubController.cs
@@ -64,7 +64,7 @@ public async Task<ActionResult> Hook()
                     dynamic commits = payload.commits;
                     foreach (dynamic commit in commits)
                     {
-                        sb.AppendFormat("\n {0} <{1}>", commit.message, commit.url);
+                        sb.AppendFormat("\n~~                    ~~\n{0} <{1}>", commit.message, commit.url);
                         count++;
                     }
                     if (count > 0) text = $"[{payload.repository.name}] {payload.sender.login} has pushed {count} commits: {sb}";