Fix bug introduced with auto messages

modified automessages to use async mesthods instead of synchronous

Application/Application.csproj

@@ -6,7 +6,7 @@
     <RuntimeFrameworkVersion>2.2.2</RuntimeFrameworkVersion>
     <MvcRazorExcludeRefAssembliesFromPublish>false</MvcRazorExcludeRefAssembliesFromPublish>
     <PackageId>RaidMax.IW4MAdmin.Application</PackageId>
-    <Version>2.2.5.2</Version>
+    <Version>2.2.5.4</Version>
     <Authors>RaidMax</Authors>
     <Company>Forever None</Company>
     <Product>IW4MAdmin</Product>
@@ -31,8 +31,8 @@
   <PropertyGroup>
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <TieredCompilation>true</TieredCompilation>
-    <AssemblyVersion>2.2.5.2</AssemblyVersion>
+    <AssemblyVersion>2.2.5.4</AssemblyVersion>
-    <FileVersion>2.2.5.2</FileVersion>
+    <FileVersion>2.2.5.4</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

Application/IW4MServer.cs

@@ -97,20 +97,27 @@ namespace IW4MAdmin
 
         override public async Task OnClientDisconnected(EFClient client)
         {
-            Logger.WriteInfo($"Client {client} [{client.State.ToString().ToLower()}] disconnecting...");
-            await client.OnDisconnect();
-            Clients[client.ClientNumber] = null;
 #if DEBUG == true
-            Logger.WriteDebug($"End PreDisconnect for {client}");
+            if (client.ClientNumber >= 0)
-#endif
-            var e = new GameEvent()
             {
-                Origin = client,
+#endif
-                Owner = this,
+                Logger.WriteInfo($"Client {client} [{client.State.ToString().ToLower()}] disconnecting...");
-                Type = GameEvent.EventType.Disconnect
+                await client.OnDisconnect();
-            };
+                Clients[client.ClientNumber] = null;
+#if DEBUG == true
+                Logger.WriteDebug($"End PreDisconnect for {client}");
+#endif
+                var e = new GameEvent()
+                {
+                    Origin = client,
+                    Owner = this,
+                    Type = GameEvent.EventType.Disconnect
+                };
 
-            Manager.GetEventHandler().AddEvent(e);
+                Manager.GetEventHandler().AddEvent(e);
+#if DEBUG == true
+            }
+#endif
         }
 
         public override async Task ExecuteEvent(GameEvent E)
@@ -630,7 +637,7 @@ namespace IW4MAdmin
                     && BroadcastMessages.Count > 0
                     && ClientNum > 0)
                 {
-                    string[] messages = this.ProcessMessageToken(Manager.GetMessageTokens(), BroadcastMessages[NextMessage]).Split(Environment.NewLine);
+                    string[] messages = (await this.ProcessMessageToken(Manager.GetMessageTokens(), BroadcastMessages[NextMessage])).Split(Environment.NewLine);
 
                     foreach (string message in messages)
                     {
@@ -971,10 +978,10 @@ namespace IW4MAdmin
 
         override public void InitializeTokens()
         {
-            Manager.GetMessageTokens().Add(new SharedLibraryCore.Helpers.MessageToken("TOTALPLAYERS", (Server s) => Manager.GetClientService().GetTotalClientsAsync().Result.ToString()));
+            Manager.GetMessageTokens().Add(new SharedLibraryCore.Helpers.MessageToken("TOTALPLAYERS", (Server s) => Task.Run(async () => (await Manager.GetClientService().GetTotalClientsAsync()).ToString())));
-            Manager.GetMessageTokens().Add(new SharedLibraryCore.Helpers.MessageToken("VERSION", (Server s) => Application.Program.Version.ToString()));
+            Manager.GetMessageTokens().Add(new SharedLibraryCore.Helpers.MessageToken("VERSION", (Server s) => Task.FromResult(Application.Program.Version.ToString())));
-            Manager.GetMessageTokens().Add(new SharedLibraryCore.Helpers.MessageToken("NEXTMAP", (Server s) => SharedLibraryCore.Commands.CNextMap.GetNextMap(s).Result));
+            Manager.GetMessageTokens().Add(new SharedLibraryCore.Helpers.MessageToken("NEXTMAP", (Server s) => SharedLibraryCore.Commands.CNextMap.GetNextMap(s)));
-            Manager.GetMessageTokens().Add(new SharedLibraryCore.Helpers.MessageToken("ADMINS", (Server s) => SharedLibraryCore.Commands.CListAdmins.OnlineAdmins(s)));
+            Manager.GetMessageTokens().Add(new SharedLibraryCore.Helpers.MessageToken("ADMINS", (Server s) => Task.FromResult(SharedLibraryCore.Commands.CListAdmins.OnlineAdmins(s))));
         }
     }
 }

IW4MAdmin.sln

@@ -52,6 +52,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web", "Web", "{A848FCF1-852
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StatsWeb", "Plugins\Web\StatsWeb\StatsWeb.csproj", "{776B348B-F818-4A0F-A625-D0AF8BAD3E9B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutomessageFeed", "Plugins\AutomessageFeed\AutomessageFeed.csproj", "{F5815359-CFC7-44B4-9A3B-C04BACAD5836}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -290,8 +292,8 @@ Global
 		{6C706CE5-A206-4E46-8712-F8C48D526091}.Debug|x64.Build.0 = Debug|Any CPU
 		{6C706CE5-A206-4E46-8712-F8C48D526091}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{6C706CE5-A206-4E46-8712-F8C48D526091}.Debug|x86.Build.0 = Debug|Any CPU
-		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|Any CPU.ActiveCfg = Debug|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|Any CPU.ActiveCfg = Prerelease|Any CPU
-		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|Any CPU.Build.0 = Debug|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|Any CPU.Build.0 = Prerelease|Any CPU
 		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|Mixed Platforms.Build.0 = Debug|Any CPU
 		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|x64.ActiveCfg = Debug|Any CPU
@@ -310,7 +312,7 @@ Global
 		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Prerelease|Any CPU.ActiveCfg = Release|Any CPU
+		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Prerelease|Any CPU.ActiveCfg = Prerelease|Any CPU
 		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Prerelease|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Prerelease|x64.ActiveCfg = Release|Any CPU
 		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Prerelease|x86.ActiveCfg = Release|Any CPU
@@ -319,15 +321,13 @@ Global
 		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Release|x64.ActiveCfg = Release|Any CPU
 		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Release|x86.ActiveCfg = Release|Any CPU
 		{42EFDA12-10D3-4C40-A210-9483520116BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{42EFDA12-10D3-4C40-A210-9483520116BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{42EFDA12-10D3-4C40-A210-9483520116BC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{42EFDA12-10D3-4C40-A210-9483520116BC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{42EFDA12-10D3-4C40-A210-9483520116BC}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{42EFDA12-10D3-4C40-A210-9483520116BC}.Debug|x64.Build.0 = Debug|Any CPU
 		{42EFDA12-10D3-4C40-A210-9483520116BC}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{42EFDA12-10D3-4C40-A210-9483520116BC}.Debug|x86.Build.0 = Debug|Any CPU
-		{42EFDA12-10D3-4C40-A210-9483520116BC}.Prerelease|Any CPU.ActiveCfg = Release|Any CPU
+		{42EFDA12-10D3-4C40-A210-9483520116BC}.Prerelease|Any CPU.ActiveCfg = Prerelease|Any CPU
-		{42EFDA12-10D3-4C40-A210-9483520116BC}.Prerelease|Any CPU.Build.0 = Release|Any CPU
 		{42EFDA12-10D3-4C40-A210-9483520116BC}.Prerelease|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{42EFDA12-10D3-4C40-A210-9483520116BC}.Prerelease|Mixed Platforms.Build.0 = Release|Any CPU
 		{42EFDA12-10D3-4C40-A210-9483520116BC}.Prerelease|x64.ActiveCfg = Release|Any CPU
@@ -350,8 +350,8 @@ Global
 		{776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Debug|x64.Build.0 = Debug|Any CPU
 		{776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Debug|x86.Build.0 = Debug|Any CPU
-		{776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Prerelease|Any CPU.ActiveCfg = Debug|Any CPU
+		{776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Prerelease|Any CPU.ActiveCfg = Prerelease|Any CPU
-		{776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Prerelease|Any CPU.Build.0 = Debug|Any CPU
+		{776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Prerelease|Any CPU.Build.0 = Prerelease|Any CPU
 		{776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Prerelease|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Prerelease|Mixed Platforms.Build.0 = Debug|Any CPU
 		{776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Prerelease|x64.ActiveCfg = Debug|Any CPU
@@ -366,6 +366,30 @@ Global
 		{776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Release|x64.Build.0 = Release|Any CPU
 		{776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Release|x86.ActiveCfg = Release|Any CPU
 		{776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Release|x86.Build.0 = Release|Any CPU
+		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Debug|x64.Build.0 = Debug|Any CPU
+		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Debug|x86.Build.0 = Debug|Any CPU
+		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Prerelease|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Prerelease|Any CPU.Build.0 = Debug|Any CPU
+		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Prerelease|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Prerelease|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Prerelease|x64.ActiveCfg = Debug|Any CPU
+		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Prerelease|x64.Build.0 = Debug|Any CPU
+		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Prerelease|x86.ActiveCfg = Debug|Any CPU
+		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Prerelease|x86.Build.0 = Debug|Any CPU
+		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Release|x64.ActiveCfg = Release|Any CPU
+		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Release|x64.Build.0 = Release|Any CPU
+		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Release|x86.ActiveCfg = Release|Any CPU
+		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -380,6 +404,7 @@ Global
 		{3F9ACC27-26DB-49FA-BCD2-50C54A49C9FA} = {26E8B310-269E-46D4-A612-24601F16065F}
 		{A848FCF1-8527-4AA8-A1AA-50D29695C678} = {26E8B310-269E-46D4-A612-24601F16065F}
 		{776B348B-F818-4A0F-A625-D0AF8BAD3E9B} = {A848FCF1-8527-4AA8-A1AA-50D29695C678}
+		{F5815359-CFC7-44B4-9A3B-C04BACAD5836} = {26E8B310-269E-46D4-A612-24601F16065F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {84F8F8E0-1F73-41E0-BD8D-BB6676E2EE87}

Plugins/AutomessageFeed/AutomessageFeed.csproj

@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SyndicationFeed.ReaderWriter" Version="1.0.2"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\SharedLibraryCore\SharedLibraryCore.csproj" />
+  </ItemGroup>
+
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)BUILD\Plugins&quot;"/>
+    <Exec Command="copy &quot;$(TargetDir)Microsoft.SyndicationFeed.ReaderWriter.dll&quot; &quot;$(SolutionDir)BUILD\Plugins&quot;"/>
+  </Target>
+
+</Project>

Plugins/AutomessageFeed/Configuration.cs

@@ -0,0 +1,28 @@
+using SharedLibraryCore;
+using SharedLibraryCore.Interfaces;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace AutomessageFeed
+{
+    class Configuration : IBaseConfiguration
+    {
+        public bool EnableFeed { get; set; }
+        public string FeedUrl { get; set; }
+
+        public IBaseConfiguration Generate()
+        {
+            EnableFeed = Utilities.PromptBool(Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_AUTOMESSAGEFEED_PROMPT_ENABLE"]);
+
+            if (EnableFeed)
+            {
+                FeedUrl = Utilities.PromptString(Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_AUTOMESSAGEFEED_URL"]);
+            }
+
+            return this;
+        }
+
+        public string Name() => "AutomessageFeedConfiguration";
+    }
+}

Plugins/AutomessageFeed/Plugin.cs

@@ -0,0 +1,85 @@
+using SharedLibraryCore;
+using SharedLibraryCore.Interfaces;
+using System;
+using System.Threading.Tasks;
+using Microsoft.SyndicationFeed.Rss;
+using SharedLibraryCore.Configuration;
+using System.Xml;
+using Microsoft.SyndicationFeed;
+using System.Collections.Generic;
+using SharedLibraryCore.Helpers;
+using System.Text.RegularExpressions;
+
+namespace AutomessageFeed
+{
+    public class Plugin : IPlugin
+    {
+        public string Name => "Automessage Feed";
+
+        public float Version => (float)Utilities.GetVersionAsDouble();
+
+        public string Author => "RaidMax";
+
+        private Configuration _configuration;
+        private int _currentFeedItem;
+
+        private async Task<string> GetNextFeedItem(Server server)
+        {
+            var items = new List<string>();
+
+            using (var reader = XmlReader.Create(_configuration.FeedUrl, new XmlReaderSettings() { Async = true }))
+            {
+                var feedReader = new RssFeedReader(reader);
+
+                while (await feedReader.Read())
+                {
+                    switch (feedReader.ElementType)
+                    {
+                        case SyndicationElementType.Item:
+                            var item = await feedReader.ReadItem();
+                            items.Add(Regex.Replace(item.Title, @"\<.+\>.*\</.+\>", ""));
+                            break;
+                    }
+                }
+            }
+
+            if (_currentFeedItem < items.Count)
+            {
+                _currentFeedItem++;
+                return items[_currentFeedItem - 1];
+            }
+
+            _currentFeedItem = 0;
+            return Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_AUTOMESSAGEFEED_NO_ITEMS"];
+        }
+
+        public Task OnEventAsync(GameEvent E, Server S)
+        {
+            return Task.CompletedTask;
+        }
+
+        public async Task OnLoadAsync(IManager manager)
+        {
+            var cfg = new BaseConfigurationHandler<Configuration>("AutomessageFeedPluginSettings");
+            if (cfg.Configuration() == null)
+            {
+                cfg.Set((Configuration)new Configuration().Generate());
+                await cfg.Save();
+            }
+
+            _configuration = cfg.Configuration();
+
+            manager.GetMessageTokens().Add(new MessageToken("FEED", GetNextFeedItem));
+        }
+
+        public Task OnTickAsync(Server S)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task OnUnloadAsync()
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

Plugins/Stats/Plugin.cs

@@ -291,32 +291,32 @@ namespace IW4MAdmin.Plugins.Stats
 
             MetaService.AddMeta(getMessages);
 
-            string totalKills(Server server)
+            async Task<string> totalKills(Server server)
             {
                 using (var ctx = new DatabaseContext(disableTracking: true))
                 {
-                    long kills = ctx.Set<EFServerStatistics>().Where(s => s.Active).Sum(s => s.TotalKills);
+                    long kills = await ctx.Set<EFServerStatistics>().Where(s => s.Active).SumAsync(s => s.TotalKills);
                     return kills.ToString("#,##0");
                 }
             }
 
-            string totalPlayTime(Server server)
+            async Task<string> totalPlayTime(Server server)
             {
                 using (var ctx = new DatabaseContext(disableTracking: true))
                 {
-                    long playTime = ctx.Set<EFServerStatistics>().Where(s => s.Active).Sum(s => s.TotalPlayTime);
+                    long playTime = await ctx.Set<EFServerStatistics>().Where(s => s.Active).SumAsync(s => s.TotalPlayTime);
                     return (playTime / 3600.0).ToString("#,##0");
                 }
             }
 
-            string topStats(Server s)
+            async Task<string> topStats(Server s)
             {
-                return String.Join(Environment.NewLine, Commands.TopStats.GetTopStats(s).Result);
+                return string.Join(Environment.NewLine, await Commands.TopStats.GetTopStats(s));
             }
 
-            string mostPlayed(Server s)
+            async Task<string> mostPlayed(Server s)
             {
-                return String.Join(Environment.NewLine, Commands.MostPlayed.GetMostPlayed(s).Result);
+                return string.Join(Environment.NewLine, await Commands.MostPlayed.GetMostPlayed(s));
             }
 
             manager.GetMessageTokens().Add(new MessageToken("TOTALKILLS", totalKills));

Plugins/Web/StatsWeb/StatsWeb.csproj

@@ -3,6 +3,7 @@
     <TargetFramework>netcoreapp2.2</TargetFramework>
     <RazorCompileOnBuild>true</RazorCompileOnBuild>
     <ResolvedRazorCompileToolset>RazorSdk</ResolvedRazorCompileToolset>
+    <Configurations>Debug;Release;Prerelease</Configurations>
   </PropertyGroup>
 
   <ItemGroup>

SharedLibraryCore/Dtos/PenaltyInfo.cs

@@ -19,5 +19,6 @@ namespace SharedLibraryCore.Dtos
         public string Type { get; set; }
         public string TimePunished { get; set; }
         public string TimeRemaining { get; set; }
+        public bool Expired { get; set; }
     }
 }

SharedLibraryCore/Dtos/PlayerInfo.cs

@@ -17,6 +17,7 @@ namespace SharedLibraryCore.Dtos
         public List<string> Aliases { get; set; }
         public List<string> IPs { get; set; }
         public bool HasActivePenalty { get; set; }
+        public string ActivePenaltyType { get; set; }
         public int ConnectionCount { get; set; }
         public string LastSeen { get; set; }
         public string FirstSeen { get; set; }

SharedLibraryCore/Helpers/MessageToken.cs

@@ -1,20 +1,25 @@
 using System;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace SharedLibraryCore.Helpers
 {
     public class MessageToken
     {
         public string Name { get; private set; }
-        Func<Server, string> Value;
+        private readonly Func<Server, Task<string>> _asyncValue;
-        public MessageToken(string Name, Func<Server, string> Value)
+
+
+        public MessageToken(string Name, Func<Server, Task<string>> Value)
         {
             this.Name = Name;
-            this.Value = Value;
+            _asyncValue = Value;
         }
 
-        public string Process(Server server)
+        public async Task<string> ProcessAsync(Server server)
         {
-            return this.Value(server);
+            string result = await _asyncValue(server);
+            return result;
         }
     }
 }

SharedLibraryCore/Services/ChangeHistoryService.cs

@@ -4,7 +4,7 @@ using SharedLibraryCore.Events;
 using SharedLibraryCore.Interfaces;
 using System;
 using System.Collections.Generic;
-using System.Text;
+using System.Linq;
 using System.Threading.Tasks;
 
 namespace SharedLibraryCore.Services
@@ -32,6 +32,14 @@ namespace SharedLibraryCore.Services
                     };
                     break;
                 case GameEvent.EventType.Command:
+                    // this prevents passwords/tokens being logged into the database in plain text
+                    if (e.Extra is Command cmd)
+                    {
+                        if (cmd.Name == "login" || cmd.Name == "setpassword")
+                        {
+                            e.Message = string.Join(' ', e.Message.Split(" ").Select((arg, index) => index > 0 ? "*****" : arg));
+                        }
+                    }
                     change = new EFChangeHistory()
                     {
                         OriginEntityId = e.Origin.ClientId,

SharedLibraryCore/Services/PenaltyService.cs

@@ -197,7 +197,8 @@ namespace SharedLibraryCore.Services
                                               Offense = penalty.Offense,
                                               Type = penalty.Type.ToString(),
                                               TimeRemaining = penalty.Expires.HasValue ? (now > penalty.Expires ? "" : penalty.Expires.ToString()) : DateTime.MaxValue.ToString(),
-                                              AutomatedOffense = penalty.AutomatedOffense
+                                              AutomatedOffense = penalty.AutomatedOffense,
+                                              Expired = penalty.Expires.HasValue && penalty.Expires <= DateTime.UtcNow
                                           },
                                           When = penalty.When,
                                           Sensitive = penalty.Type == Penalty.PenaltyType.Flag
@@ -216,6 +217,11 @@ namespace SharedLibraryCore.Services
                         if (pi.TimeRemaining?.Length > 0)
                         {
                             pi.TimeRemaining = (DateTime.Parse(((PenaltyInfo)p.Value).TimeRemaining) - now).TimeSpanText();
+
+                            if (!pi.Expired)
+                            {
+                                pi.TimeRemaining = $"{pi.TimeRemaining} {Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_PENALTY_TEMPLATE_REMAINING"]}";
+                            }
                         }
                     });
                     return list;

SharedLibraryCore/Utilities.cs

@@ -183,7 +183,7 @@ namespace SharedLibraryCore
             return CurrentLocalization.LocalizationIndex[$"GLOBAL_PERMISSION_{perm.ToString().ToUpper()}"];
         }
 
-        public static String ProcessMessageToken(this Server server, IList<Helpers.MessageToken> tokens, String str)
+        public async static Task<string> ProcessMessageToken(this Server server, IList<Helpers.MessageToken> tokens, String str)
         {
             MatchCollection RegexMatches = Regex.Matches(str, @"\{\{[A-Z]+\}\}", RegexOptions.IgnoreCase);
             foreach (Match M in RegexMatches)
@@ -195,7 +195,7 @@ namespace SharedLibraryCore
 
                 if (found != null)
                 {
-                    str = str.Replace(Match, found.Process(server));
+                    str = str.Replace(Match, await found.ProcessAsync(server));
                 }
             }
 

WebfrontCore/Controllers/ClientController.cs

@@ -53,6 +53,7 @@ namespace WebfrontCore.Controllers
                     .OrderBy(i => i)
                     .ToList(),
                 HasActivePenalty = activePenalties.Count > 0,
+                ActivePenaltyType = activePenalties.Count > 0 ? activePenalties.First().Type.ToString() : null,
                 Online = Manager.GetActiveClients().FirstOrDefault(c => c.ClientId == client.ClientId) != null,
                 TimeOnline = (DateTime.UtcNow - client.LastConnection).TimeSpanText(),
                 LinkedAccounts = client.LinkedAccounts
@@ -95,6 +96,18 @@ namespace WebfrontCore.Controllers
                 administeredPenaltiesMeta.ForEach(p => p.Value.Offense = p.Value.AutomatedOffense ?? p.Value.Offense);
             }
 
+            var currentPenalty = activePenalties.FirstOrDefault();
+
+            if (currentPenalty != null && currentPenalty.Type == SharedLibraryCore.Objects.Penalty.PenaltyType.TempBan)
+            {
+                clientDto.Meta.Add(new ProfileMeta()
+                {
+                    Key = Localization["WEBFRONT_CLIENT_META_REMAINING_BAN"],
+                    Value = ((currentPenalty.Expires - DateTime.UtcNow) ?? new TimeSpan()).TimeSpanText(),
+                    When = currentPenalty.When
+                });
+            }
+
             clientDto.Meta.AddRange(Authorized ? meta : meta.Where(m => !m.Sensitive));
             clientDto.Meta.AddRange(Authorized ? penaltyMeta : penaltyMeta.Where(m => !m.Sensitive));
             clientDto.Meta.AddRange(Authorized ? administeredPenaltiesMeta : administeredPenaltiesMeta.Where(m => !m.Sensitive));

WebfrontCore/wwwroot/js/profile.js

@@ -209,7 +209,7 @@ function loadMeta(meta) {
     if (meta.class.includes("Penalty")) {
         if (meta.value.punisherId !== clientInfo.clientId) {
             const timeRemaining = meta.value.type === 'TempBan' && meta.value.timeRemaining.length > 0 ?
-                `(${meta.value.timeRemaining} remaining)` :
+                `(${meta.value.timeRemaining})` :
                 '';
             eventString = `<div><span class="penalties-color-${meta.value.type.toLowerCase()}">${penaltyToName(meta.value.type)}</span> by <span class="text-highlight"> <a class="link-inverse"  href="${meta.value.punisherId}">${meta.value.punisherName}</a></span > for <span style="color: white; " class="automated-penalty-info-detailed" data-clientid="${meta.value.offenderId}">${meta.value.offense}</span><span class="text-muted"> ${timeRemaining}</span></div>`;
         }