Merge pull request #2991 from ZeroK-RTS/master

update live

Author: Licho1

.idea/.idea.Zero-K/.idea/projectSettingsUpdater.xml

@@ -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>";

Shared/PlasmaShared/GlobalConst.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}";

Zero-K.info/Controllers/GithubController.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;
                 }