Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update live #2991

Merged
merged 2 commits into from
Aug 21, 2024
Merged

update live #2991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32d7248
enable VPN check for non-steam users
Licho1 Aug 21, 2024
96309a1
commit discord message: add horizontal lines (#2989)
sprunk Aug 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .idea/.idea.Zero-K/.idea/projectSettingsUpdater.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Shared/PlasmaShared/GlobalConst.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>";
Expand Down
2 changes: 1 addition & 1 deletion Zero-K.info/Controllers/GithubController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}";
Expand Down
2 changes: 1 addition & 1 deletion ZkLobbyServer/LoginChecker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Loading