AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-22 12:05:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tempbans now use UTC timestamp, for consistency with other timestamps stored in files.

Browse Source
This commit is contained in:
UnknownShadow200 2017-08-11 16:29:06 +10:00
parent 1ab66ee98a
commit f452602912
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
MCGalaxy/Player/Ban.cs
View File

@ -35,17 +35,24 @@ namespace MCGalaxy {
public static string FormatBan(string banner, string reason) { public static string FormatBan(string banner, string reason) {
return "Banned by " + banner + ": " + reason; return "Banned by " + banner + ": " + reason;
} }
public static string PackTempBanData(string reason, string banner, DateTime expiry) { public static string PackTempBanData(string reason, string banner, DateTime expiry) {
if (reason == null) reason = "-"; if (reason == null) reason = "-";
return banner + " " + expiry.Ticks + " " + reason; return banner + " " + expiry.ToUnixTime() + " " + reason;
} }
public static void UnpackTempBanData(string line, out string reason, out string banner, out DateTime expiry) { public static void UnpackTempBanData(string line, out string reason, out string banner, out DateTime expiry) {
string[] parts = line.SplitSpaces(3); string[] parts = line.SplitSpaces(3);
banner = parts[0]; banner = parts[0];
expiry = new DateTime(long.Parse(parts[1]), DateTimeKind.Utc);
// Timestamp used to be raw DateTime ticks, is now UTC timestamp
long timestamp = long.Parse(parts[1]);
try {
expiry = timestamp.FromUnixTime();
} catch (ArgumentOutOfRangeException) {
expiry = new DateTime(long.Parse(parts[1]), DateTimeKind.Utc);
}
reason = parts.Length > 2 ? parts[2] : ""; reason = parts.Length > 2 ? parts[2] : "";
} }
@ -70,11 +77,11 @@ namespace MCGalaxy {
static string FormatDate() { static string FormatDate() {
DateTime now = DateTime.Now; DateTime now = DateTime.Now;
return now.DayOfWeek + "%20" + now.Day + "%20" + now.Month + return now.DayOfWeek + "%20" + now.Day + "%20" + now.Month +
"%20" + now.Year + ",%20at%20" + now.Hour + ":" + now.Minute; "%20" + now.Year + ",%20at%20" + now.Hour + ":" + now.Minute;
} }
static void AddBanEntry(string pl, string who, string reason, static void AddBanEntry(string pl, string who, string reason,
string stealth, string datetime, string oldrank) { string stealth, string datetime, string oldrank) {
string data = pl + " " + who + " " + reason + " " + stealth + " " + datetime + " " + oldrank; string data = pl + " " + who + " " + reason + " " + stealth + " " + datetime + " " + oldrank;
bans.Append(data); bans.Append(data);