Fix issues with extremely long mute times on mono

ClassiCube · Apr 23, 2020 · 25bd175 · 25bd175
1 parent 416919d
commit 25bd175
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/MCGalaxy/CorePlugin/ModActionHandler.cs b/MCGalaxy/CorePlugin/ModActionHandler.cs
@@ -231,21 +231,18 @@ internal static class ModActionHandler {
         }
 
         static string FormatModTaskData(ModAction e) {
-            long assign = DateTime.UtcNow.ToUnixTime();
-            DateTime expiryTime;
+            long assign  = DateTime.UtcNow.ToUnixTime();
+            DateTime end = DateTime.MaxValue.AddYears(-1);
 
-            if (e.Duration == TimeSpan.Zero) {
-                expiryTime = DateTime.MaxValue;
-            } else {
+            if (e.Duration != TimeSpan.Zero) {
                 try {
-                    expiryTime = DateTime.UtcNow.Add(e.Duration);
+                    end = DateTime.UtcNow.Add(e.Duration);
                 } catch (ArgumentOutOfRangeException) {
-                    // user provided extreme expiry time
-                    expiryTime = DateTime.MaxValue;
+                    // user provided extreme expiry time, ignore it
                 }
             }
 
-            long expiry = expiryTime.ToUnixTime();
+            long expiry = end.ToUnixTime();
             string assigner = e.Actor.name;
             return assigner + " " + assign + " " + expiry;
         }