Time in configs now in minutes

Iksix · Jan 23, 2025 · c0a83ea · c0a83ea
1 parent aa2056e
commit c0a83ea
Show file tree

Hide file tree

Showing 32 changed files with 35 additions and 35 deletions.
diff --git a/IksAdmin/Menus/MenuBansManage.cs b/IksAdmin/Menus/MenuBansManage.cs
@@ -188,7 +188,7 @@ private static void OpenTimeSelectMenu(CCSPlayerController caller, PlayerInfo ta
             }
 
             menu.AddMenuOption("ban_time_" + time.Key, time.Value, (_, _) => {
-                ban.Duration = time.Key;
+                ban.Duration = time.Key*60;
                 OpenBanTypeSelectMenu(caller, ban);
             });
         }

diff --git a/IksAdmin/Menus/MenuCommsManage.cs b/IksAdmin/Menus/MenuCommsManage.cs
@@ -366,7 +366,7 @@ private static void OpenMuteTimeSelectMenu(CCSPlayerController caller, PlayerInf
             }
             menu.AddMenuOption("mute_time_" + time.Key, time.Value, (_, _) => {
                 _api.CloseMenu(caller);
-                comm.Duration = time.Key;
+                comm.Duration = time.Key*60;
                 Task.Run(async () =>
                 {
                     await MutesFunctions.Mute(comm);
@@ -413,7 +413,7 @@ private static void OpenGagTimeSelectMenu(CCSPlayerController caller, PlayerInfo
             }
             menu.AddMenuOption("gag_time_" + time.Key, time.Value, (_, _) => {
                 _api.CloseMenu(caller);
-                comm.Duration = time.Key;
+                comm.Duration = time.Key*60;
                 Task.Run(async () =>
                 {
                     await GagsFunctions.Gag(comm);
@@ -460,7 +460,7 @@ private static void OpenSilenceTimeSelectMenu(CCSPlayerController caller, Player
             }
             menu.AddMenuOption("silence_time_" + time.Key, time.Value, (_, _) => {
                 _api.CloseMenu(caller);
-                comm.Duration = time.Key;
+                comm.Duration = time.Key*60;
                 Task.Run(async () =>
                 {
                     await SilenceFunctions.Silence(comm);

diff --git a/IksAdmin/bin/Debug/net8.0/IksAdmin.dll b/IksAdmin/bin/Debug/net8.0/IksAdmin.dll
diff --git a/IksAdmin/bin/Debug/net8.0/IksAdmin.pdb b/IksAdmin/bin/Debug/net8.0/IksAdmin.pdb
diff --git a/IksAdmin/bin/Debug/net8.0/IksAdminApi.dll b/IksAdmin/bin/Debug/net8.0/IksAdminApi.dll
diff --git a/IksAdmin/bin/Debug/net8.0/IksAdminApi.pdb b/IksAdmin/bin/Debug/net8.0/IksAdminApi.pdb
diff --git a/IksAdmin/build/IksAdmin/plugins/IksAdmin/IksAdmin.dll b/IksAdmin/build/IksAdmin/plugins/IksAdmin/IksAdmin.dll
diff --git a/IksAdmin/build/IksAdmin/plugins/IksAdmin/IksAdmin.pdb b/IksAdmin/build/IksAdmin/plugins/IksAdmin/IksAdmin.pdb
diff --git a/IksAdmin/build/IksAdmin/shared/IksAdminApi/IksAdminApi.dll b/IksAdmin/build/IksAdmin/shared/IksAdminApi/IksAdminApi.dll
diff --git a/IksAdmin/build/IksAdmin/shared/IksAdminApi/IksAdminApi.pdb b/IksAdmin/build/IksAdmin/shared/IksAdminApi/IksAdminApi.pdb
diff --git a/IksAdmin/obj/Debug/net8.0/IksAdmin.AssemblyInfo.cs b/IksAdmin/obj/Debug/net8.0/IksAdmin.AssemblyInfo.cs
@@ -13,10 +13,10 @@
 [assembly: System.Reflection.AssemblyCompanyAttribute("IksAdmin")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+498e5f9f5b3c1484aa9f2ba26c76065f79f158fb")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+aa2056e82644d27c187908a870f5c9569b62d52a")]
 [assembly: System.Reflection.AssemblyProductAttribute("IksAdmin")]
 [assembly: System.Reflection.AssemblyTitleAttribute("IksAdmin")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
 
-// Generated by the MSBuild WriteCodeFragment class.
+// Создано классом WriteCodeFragment MSBuild.
 
diff --git a/IksAdmin/obj/Debug/net8.0/IksAdmin.AssemblyInfoInputs.cache b/IksAdmin/obj/Debug/net8.0/IksAdmin.AssemblyInfoInputs.cache
@@ -1 +1 @@
-9a0c1709040f7583216e34a91ab8a2f4a2de34edb465286be550529cca7c68ec
+d2ccd3d41dd7b977387c3c1fea9d17fe99a46feca2e1c132f06679b1f7578860
diff --git a/IksAdmin/obj/Debug/net8.0/IksAdmin.csproj.AssemblyReference.cache b/IksAdmin/obj/Debug/net8.0/IksAdmin.csproj.AssemblyReference.cache
diff --git a/IksAdmin/obj/Debug/net8.0/IksAdmin.dll b/IksAdmin/obj/Debug/net8.0/IksAdmin.dll
diff --git a/IksAdmin/obj/Debug/net8.0/IksAdmin.pdb b/IksAdmin/obj/Debug/net8.0/IksAdmin.pdb
diff --git a/IksAdmin/obj/Debug/net8.0/IksAdmin.sourcelink.json b/IksAdmin/obj/Debug/net8.0/IksAdmin.sourcelink.json
@@ -1 +1 @@
-{"documents":{"E:\\__iksAdmin\\Iks_Admin\\*":"https://raw.githubusercontent.com/Iksix/Iks_Admin/6a78b6a94391d94e258845e2673ae912a8619df8/*"}}
+{"documents":{"E:\\__iksAdmin\\Iks_Admin\\*":"https://raw.githubusercontent.com/Iksix/Iks_Admin/aa2056e82644d27c187908a870f5c9569b62d52a/*"}}
diff --git a/IksAdmin/obj/Debug/net8.0/ref/IksAdmin.dll b/IksAdmin/obj/Debug/net8.0/ref/IksAdmin.dll
diff --git a/IksAdmin/obj/Debug/net8.0/refint/IksAdmin.dll b/IksAdmin/obj/Debug/net8.0/refint/IksAdmin.dll
diff --git a/IksAdminApi/AdminUtils.cs b/IksAdminApi/AdminUtils.cs
@@ -62,10 +62,10 @@ public static string GetDurationString(int seconds)
             return CoreApi.Localizer["Other.Never"];
         }
         // ищем seconds во всех конфигах с Times =)
-        if (BansConfig.Config.Times.TryGetValue(seconds, out var time)) return time;
-        if (MutesConfig.Config.Times.TryGetValue(seconds, out time)) return time;
-        if (GagsConfig.Config.Times.TryGetValue(seconds, out time)) return time;
-        if (SilenceConfig.Config.Times.TryGetValue(seconds, out time)) return time;
+        if (BansConfig.Config.Times.TryGetValue(seconds/60, out var time)) return time;
+        if (MutesConfig.Config.Times.TryGetValue(seconds/60, out time)) return time;
+        if (GagsConfig.Config.Times.TryGetValue(seconds/60, out time)) return time;
+        if (SilenceConfig.Config.Times.TryGetValue(seconds/60, out time)) return time;
         if (seconds % 86400 == 0)
         {
             return $"{seconds / 86400}{CoreApi.Localizer["Other.Days"]}";

diff --git a/IksAdminApi/Configs/BansConfig.cs b/IksAdminApi/Configs/BansConfig.cs
@@ -20,11 +20,11 @@ public class BansConfig : PluginCFG<BansConfig>, IPluginCFG
 
     public Dictionary<int, string> Times {get; set;} = new()
     {
-        {60, "1 мин"},
-        {3600, "1 час"},
-        {3600 * 24, "1 день"},
-        {3600 * 24 * 7, "1 неделя"},
-        {3600 * 24 * 30, "1 месяц"},        
+        {1, "1 мин"},
+        {60, "1 час"},
+        {60 * 24, "1 день"},
+        {60 * 24 * 7, "1 неделя"},
+        {60 * 24 * 30, "1 месяц"},        
         {0, "Навсегда"}        
     };
 

diff --git a/IksAdminApi/Configs/GagsConfig.cs b/IksAdminApi/Configs/GagsConfig.cs
@@ -21,11 +21,11 @@ public class GagsConfig : PluginCFG<GagsConfig>, IPluginCFG
 
     public Dictionary<int, string> Times {get; set;} = new()
     {
-        {60, "1 мин"},
-        {3600, "1 час"},
-        {3600 * 24, "1 день"},
-        {3600 * 24 * 7, "1 неделя"},
-        {3600 * 24 * 30, "1 месяц"},        
+        {1, "1 мин"},
+        {60, "1 час"},
+        {60 * 24, "1 день"},
+        {60 * 24 * 7, "1 неделя"},
+        {60 * 24 * 30, "1 месяц"},        
         {0, "Навсегда"}        
     };
 

diff --git a/IksAdminApi/Configs/MutesConfig.cs b/IksAdminApi/Configs/MutesConfig.cs
@@ -21,11 +21,11 @@ public class MutesConfig : PluginCFG<MutesConfig>, IPluginCFG
 
     public Dictionary<int, string> Times {get; set;} = new()
     {
-        {60, "1 мин"},
-        {3600, "1 час"},
-        {3600 * 24, "1 день"},
-        {3600 * 24 * 7, "1 неделя"},
-        {3600 * 24 * 30, "1 месяц"},        
+        {1, "1 мин"},
+        {60, "1 час"},
+        {60 * 24, "1 день"},
+        {60 * 24 * 7, "1 неделя"},
+        {60 * 24 * 30, "1 месяц"},        
         {0, "Навсегда"}        
     };
 

diff --git a/IksAdminApi/Configs/SilenceConfig.cs b/IksAdminApi/Configs/SilenceConfig.cs
@@ -21,11 +21,11 @@ public class SilenceConfig : PluginCFG<SilenceConfig>, IPluginCFG
 
     public Dictionary<int, string> Times {get; set;} = new()
     {
-        {60, "1 мин"},
-        {3600, "1 час"},
-        {3600 * 24, "1 день"},
-        {3600 * 24 * 7, "1 неделя"},
-        {3600 * 24 * 30, "1 месяц"},        
+        {1, "1 мин"},
+        {60, "1 час"},
+        {60 * 24, "1 день"},
+        {60 * 24 * 7, "1 неделя"},
+        {60 * 24 * 30, "1 месяц"},        
         {0, "Навсегда"}        
     };
 

diff --git a/IksAdminApi/bin/Debug/net8.0/IksAdminApi.dll b/IksAdminApi/bin/Debug/net8.0/IksAdminApi.dll
diff --git a/IksAdminApi/bin/Debug/net8.0/IksAdminApi.pdb b/IksAdminApi/bin/Debug/net8.0/IksAdminApi.pdb
diff --git a/IksAdminApi/obj/Debug/net8.0/IksAdminApi.AssemblyInfo.cs b/IksAdminApi/obj/Debug/net8.0/IksAdminApi.AssemblyInfo.cs
@@ -13,7 +13,7 @@
 [assembly: System.Reflection.AssemblyCompanyAttribute("IksAdminApi")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6a78b6a94391d94e258845e2673ae912a8619df8")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+aa2056e82644d27c187908a870f5c9569b62d52a")]
 [assembly: System.Reflection.AssemblyProductAttribute("IksAdminApi")]
 [assembly: System.Reflection.AssemblyTitleAttribute("IksAdminApi")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

diff --git a/IksAdminApi/obj/Debug/net8.0/IksAdminApi.AssemblyInfoInputs.cache b/IksAdminApi/obj/Debug/net8.0/IksAdminApi.AssemblyInfoInputs.cache
@@ -1 +1 @@
-b20b2d31090cdcc4255a517076f6814df7937b5ec2256c8fa939fe3879504672
+818615fb43c1cb66079067d93e9aa583f2e5df3ca004a79d97a035c8ad93f406
diff --git a/IksAdminApi/obj/Debug/net8.0/IksAdminApi.dll b/IksAdminApi/obj/Debug/net8.0/IksAdminApi.dll
diff --git a/IksAdminApi/obj/Debug/net8.0/IksAdminApi.pdb b/IksAdminApi/obj/Debug/net8.0/IksAdminApi.pdb
diff --git a/IksAdminApi/obj/Debug/net8.0/IksAdminApi.sourcelink.json b/IksAdminApi/obj/Debug/net8.0/IksAdminApi.sourcelink.json
@@ -1 +1 @@
-{"documents":{"E:\\__iksAdmin\\Iks_Admin\\*":"https://raw.githubusercontent.com/Iksix/Iks_Admin/6a78b6a94391d94e258845e2673ae912a8619df8/*"}}
+{"documents":{"E:\\__iksAdmin\\Iks_Admin\\*":"https://raw.githubusercontent.com/Iksix/Iks_Admin/aa2056e82644d27c187908a870f5c9569b62d52a/*"}}
diff --git a/IksAdminApi/obj/Debug/net8.0/ref/IksAdminApi.dll b/IksAdminApi/obj/Debug/net8.0/ref/IksAdminApi.dll
diff --git a/IksAdminApi/obj/Debug/net8.0/refint/IksAdminApi.dll b/IksAdminApi/obj/Debug/net8.0/refint/IksAdminApi.dll
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		9a0c1709040f7583216e34a91ab8a2f4a2de34edb465286be550529cca7c68ec
		d2ccd3d41dd7b977387c3c1fea9d17fe99a46feca2e1c132f06679b1f7578860
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"documents":{"E:\\__iksAdmin\\Iks_Admin\\":"https://raw.githubusercontent.com/Iksix/Iks_Admin/6a78b6a94391d94e258845e2673ae912a8619df8/"}}
		{"documents":{"E:\\__iksAdmin\\Iks_Admin\\":"https://raw.githubusercontent.com/Iksix/Iks_Admin/aa2056e82644d27c187908a870f5c9569b62d52a/"}}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		b20b2d31090cdcc4255a517076f6814df7937b5ec2256c8fa939fe3879504672
		818615fb43c1cb66079067d93e9aa583f2e5df3ca004a79d97a035c8ad93f406