fix aggregate issue with KDR on global top stats

refactor some of the main application code to have a cleaner code flow
add enviroment flag to opt out of .net core telemetry in start script
fixed "a moment" missing the "ago"
fixed case sensitive client searches on postgresql
clean up command code flow
Add missing map "mp_cairo" to default settings

SharedLibraryCore/Commands/NativeCommands.cs

@@ -23,7 +23,22 @@ namespace SharedLibraryCore.Commands
 
         public override Task ExecuteAsync(GameEvent E)
         {
-            return Task.Run(() => { E.Owner.Manager.Stop(); });
+            E.Owner.Manager.Stop();
+            return Task.CompletedTask;
+        }
+    }
+
+    public class CRestart : Command
+    {
+        public CRestart() :
+            base("restart", Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_RESTART_DESC"], "rs", EFClient.Permission.Owner, false)
+        { }
+
+        public override Task ExecuteAsync(GameEvent E)
+        {
+            E.Owner.Manager.Restart();
+            E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_RESTART_SUCCESS"]);
+            return Task.CompletedTask;
         }
     }
 
@@ -120,9 +135,18 @@ namespace SharedLibraryCore.Commands
 
         public override async Task ExecuteAsync(GameEvent E)
         {
-            var _ = !(await E.Target.Kick(E.Data, E.Origin).WaitAsync()).Failed ?
-                  E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_KICK_SUCCESS"].FormatExt(E.Target.Name)) :
-                  E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_KICK_FAIL"].FormatExt(E.Target.Name));
+            switch ((await E.Target.Kick(E.Data, E.Origin).WaitAsync(Utilities.DefaultCommandTimeout, E.Owner.Manager.CancellationToken)).FailReason)
+            {
+                case GameEvent.EventFailReason.None:
+                    E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_KICK_SUCCESS"].FormatExt(E.Target.Name));
+                    break;
+                case GameEvent.EventFailReason.Exception:
+                    E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_COMMAND_INGAME"]);
+                    break;
+                default:
+                    E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_KICK_FAIL"].FormatExt(E.Target.Name));
+                    break;
+            }
         }
     }
 
@@ -186,9 +210,18 @@ namespace SharedLibraryCore.Commands
 
                 else
                 {
-                    var _ = !(await E.Target.TempBan(tempbanReason, length, E.Origin).WaitAsync()).Failed ?
-                        E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_TEMPBAN_SUCCESS"].FormatExt(E.Target, length.TimeSpanText())) :
-                        E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_TEMPBAN_FAIL"].FormatExt(E.Target.Name));
+                    switch ((await E.Target.TempBan(tempbanReason, length, E.Origin).WaitAsync(Utilities.DefaultCommandTimeout, E.Owner.Manager.CancellationToken)).FailReason)
+                    {
+                        case GameEvent.EventFailReason.None:
+                            E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_TEMPBAN_SUCCESS"].FormatExt(E.Target, length.TimeSpanText()));
+                            break;
+                        case GameEvent.EventFailReason.Exception:
+                            E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_COMMAND_INGAME"]);
+                            break;
+                        default:
+                            E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_TEMPBAN_FAIL"].FormatExt(E.Target.Name));
+                            break;
+                    }
                 }
             }
         }
@@ -214,9 +247,18 @@ namespace SharedLibraryCore.Commands
 
         public override async Task ExecuteAsync(GameEvent E)
         {
-            var _ = !(await E.Target.Ban(E.Data, E.Origin, false).WaitAsync()).Failed ?
-                    E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_BAN_SUCCESS"].FormatExt(E.Target.Name)) :
+            switch ((await E.Target.Ban(E.Data, E.Origin, false).WaitAsync(Utilities.DefaultCommandTimeout, E.Owner.Manager.CancellationToken)).FailReason)
+            {
+                case GameEvent.EventFailReason.None:
+                    E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_BAN_SUCCESS"].FormatExt(E.Target.Name));
+                    break;
+                case GameEvent.EventFailReason.Exception:
+                    E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_COMMAND_INGAME"]);
+                    break;
+                default:
                     E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_BAN_FAIL"].FormatExt(E.Target.Name));
+                    break;
+            }
         }
     }
 
@@ -240,12 +282,21 @@ namespace SharedLibraryCore.Commands
 
         public override async Task ExecuteAsync(GameEvent E)
         {
+            // todo: don't do the lookup here
             var penalties = await E.Owner.Manager.GetPenaltyService().GetActivePenaltiesAsync(E.Target.AliasLinkId);
             if (penalties.Where(p => p.Type == Penalty.PenaltyType.Ban || p.Type == Penalty.PenaltyType.TempBan).FirstOrDefault() != null)
             {
-                await E.Target.Unban(E.Data, E.Origin).WaitAsync();
-                E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_UNBAN_SUCCESS"].FormatExt(E.Target));
+                switch ((await E.Target.Unban(E.Data, E.Origin).WaitAsync(Utilities.DefaultCommandTimeout, E.Owner.Manager.CancellationToken)).FailReason)
+                {
+                    case GameEvent.EventFailReason.None:
+                        E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_UNBAN_SUCCESS"].FormatExt(E.Target));
+                        break;
+                    default:
+                        E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_COMMAND_INGAME"]);
+                        break;
+                }
             }
+
             else
             {
                 E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_UNBAN_FAIL"].FormatExt(E.Target));
@@ -587,12 +638,13 @@ namespace SharedLibraryCore.Commands
                 if (m.Name.ToLower() == newMap || m.Alias.ToLower() == newMap)
                 {
                     E.Owner.Broadcast(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_MAP_SUCCESS"].FormatExt(m.Alias));
-                    await Task.Delay(5000);
+                    await Task.Delay((int)(Utilities.DefaultCommandTimeout.TotalMilliseconds / 2.0));
                     await E.Owner.LoadMap(m.Name);
                     return;
                 }
             }
 
+            // todo: this can be moved into a single statement
             E.Owner.Broadcast(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_MAP_UKN"].FormatExt(newMap));
             await Task.Delay(5000);
             await E.Owner.LoadMap(newMap);
@@ -720,27 +772,23 @@ namespace SharedLibraryCore.Commands
                 })
         { }
 
-        public override Task ExecuteAsync(GameEvent E)
+        public override async Task ExecuteAsync(GameEvent E)
         {
-            var flagEvent = E.Target.Flag(E.Data, E.Origin);
-
-            if (E.FailReason == GameEvent.EventFailReason.Permission)
+            switch ((await E.Target.Flag(E.Data, E.Origin).WaitAsync(Utilities.DefaultCommandTimeout, E.Owner.Manager.CancellationToken)).FailReason)
             {
-                E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_FLAG_FAIL"].FormatExt(E.Target.Name));
+                case GameEvent.EventFailReason.Permission:
+                    E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_FLAG_FAIL"].FormatExt(E.Target.Name));
+                    break;
+                case GameEvent.EventFailReason.Invalid:
+                    E.Origin.Tell($"{Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_FLAG_ALREADYFLAGGED"]}");
+                    break;
+                case GameEvent.EventFailReason.None:
+                    E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_FLAG_SUCCESS"].FormatExt(E.Target.Name));
+                    break;
+                default:
+                    E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_COMMAND_INGAME"]);
+                    break;
             }
-
-            else if (E.FailReason == GameEvent.EventFailReason.Invalid)
-            {
-                E.Origin.Tell($"{Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_FLAG_ALREADYFLAGGED"]}");
-            }
-
-            else
-            {
-                E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_FLAG_SUCCESS"].FormatExt(E.Target.Name));
-            }
-
-            return Task.CompletedTask;
-
         }
     }
 
@@ -757,27 +805,23 @@ namespace SharedLibraryCore.Commands
                 })
         { }
 
-        public override Task ExecuteAsync(GameEvent E)
+        public override async Task ExecuteAsync(GameEvent E)
         {
-            var unflagEvent = E.Target.Unflag(E.Data, E.Origin);
-
-            if (unflagEvent.FailReason == GameEvent.EventFailReason.Permission)
+            switch ((await E.Target.Unflag(E.Data, E.Origin).WaitAsync(Utilities.DefaultCommandTimeout, E.Owner.Manager.CancellationToken)).FailReason)
             {
-                E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_UNFLAG_FAIL"].FormatExt(E.Target.Name));
+                case GameEvent.EventFailReason.None:
+                    E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_FLAG_UNFLAG"].FormatExt(E.Target.Name));
+                    break;
+                case GameEvent.EventFailReason.Permission:
+                    E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_UNFLAG_FAIL"].FormatExt(E.Target.Name));
+                    break;
+                case GameEvent.EventFailReason.Invalid:
+                    E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_UNFLAG_NOTFLAGGED"]);
+                    break;
+                default:
+                    E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_COMMAND_INGAME"]);
+                    break;
             }
-
-            else if (unflagEvent.FailReason == GameEvent.EventFailReason.Invalid)
-            {
-                E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_UNFLAG_NOTFLAGGED"]);
-            }
-
-            else
-            {
-                E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_FLAG_UNFLAG"].FormatExt(E.Target.Name));
-            }
-
-            return Task.CompletedTask;
-            // todo: update immediately?
         }
     }
 
@@ -808,46 +852,30 @@ namespace SharedLibraryCore.Commands
                 return;
             }
 
-            var reportEvent = commandEvent.Target.Report(commandEvent.Data, commandEvent.Origin);
+            bool success = false;
 
-            if (reportEvent.FailReason == GameEvent.EventFailReason.Permission)
+            switch ((await commandEvent.Target.Report(commandEvent.Data, commandEvent.Origin).WaitAsync(Utilities.DefaultCommandTimeout, commandEvent.Owner.Manager.CancellationToken)).FailReason)
             {
-                commandEvent.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_REPORT_FAIL"].FormatExt(commandEvent.Target.Name));
+                case GameEvent.EventFailReason.None:
+                    commandEvent.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_REPORT_SUCCESS"]);
+                    success = true;
+                    break;
+                case GameEvent.EventFailReason.Exception:
+                    commandEvent.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_REPORT_FAIL_DUPLICATE"]);
+                    break;
+                case GameEvent.EventFailReason.Permission:
+                    commandEvent.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_REPORT_FAIL"].FormatExt(commandEvent.Target.Name));
+                    break;
+                case GameEvent.EventFailReason.Invalid:
+                    commandEvent.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_REPORT_FAIL_SELF"]);
+                    break;
+                case GameEvent.EventFailReason.Throttle:
+                    commandEvent.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_REPORT_FAIL_TOOMANY"]);
+                    break;
             }
 
-            else if (reportEvent.FailReason == GameEvent.EventFailReason.Invalid)
+            if (success)
             {
-                commandEvent.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_REPORT_FAIL_SELF"]);
-            }
-
-            else if (reportEvent.FailReason == GameEvent.EventFailReason.Throttle)
-            {
-                commandEvent.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_REPORT_FAIL_TOOMANY"]);
-            }
-
-            else if (reportEvent.Failed)
-            {
-                commandEvent.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_REPORT_FAIL_DUPLICATE"]);
-            }
-
-            else
-            {
-                // todo: move into server
-                Penalty newReport = new Penalty()
-                {
-                    Type = Penalty.PenaltyType.Report,
-                    Expires = DateTime.UtcNow,
-                    Offender = commandEvent.Target,
-                    Offense = commandEvent.Data,
-                    Punisher = commandEvent.Origin,
-                    Active = true,
-                    When = DateTime.UtcNow,
-                    Link = commandEvent.Target.AliasLink
-                };
-
-                await commandEvent.Owner.Manager.GetPenaltyService().Create(newReport);
-
-                commandEvent.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_REPORT_SUCCESS"]);
                 commandEvent.Owner.ToAdmins(String.Format("^5{0}^7->^1{1}^7: {2}", commandEvent.Origin.Name, commandEvent.Target.Name, commandEvent.Data));
             }
         }
@@ -1118,10 +1146,6 @@ namespace SharedLibraryCore.Commands
             E.Origin.Password = hashedPassword[0];
             E.Origin.PasswordSalt = hashedPassword[1];
 
-            // update the password for the client in privileged
-            //E.Owner.Manager.PrivilegedClients[E.Origin.ClientId].Password = hashedPassword[0];
-            //E.Owner.Manager.PrivilegedClients[E.Origin.ClientId].PasswordSalt = hashedPassword[1];
-
             await E.Owner.Manager.GetClientService().Update(E.Origin);
             E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_PASSWORD_SUCCESS"]);
         }

SharedLibraryCore/Database/DatabaseContext.cs

@@ -29,7 +29,7 @@ namespace SharedLibraryCore.Database
         {
 #if DEBUG == true
             activeContextCount++;
-            Console.WriteLine($"Initialized DB Context #{activeContextCount}");
+            //Console.WriteLine($"Initialized DB Context #{activeContextCount}");
 #endif
         }
 
@@ -37,7 +37,7 @@ namespace SharedLibraryCore.Database
         {
 #if DEBUG == true
             activeContextCount++;
-            Console.WriteLine($"Initialized DB Context #{activeContextCount}");
+            //Console.WriteLine($"Initialized DB Context #{activeContextCount}");
 #endif
         }
 
@@ -45,7 +45,7 @@ namespace SharedLibraryCore.Database
         {
 #if DEBUG == true
 
-            Console.WriteLine($"Disposed DB Context #{activeContextCount}");
+            //Console.WriteLine($"Disposed DB Context #{activeContextCount}");
             activeContextCount--;
 #endif
         }

SharedLibraryCore/Events/GameEvent.cs

@@ -212,11 +212,11 @@ namespace SharedLibraryCore
         /// asynchronously wait for GameEvent to be processed
         /// </summary>
         /// <returns>waitable task </returns>
-        public Task<GameEvent> WaitAsync(int timeOut = int.MaxValue)
+        public Task<GameEvent> WaitAsync(TimeSpan timeSpan, CancellationToken token)
         {
             return Task.Run(() =>
             {
-                OnProcessed.Wait(timeOut);
+                OnProcessed.Wait(timeSpan, token);
                 return this;
             });
         }

SharedLibraryCore/Interfaces/IManager.cs

@@ -7,14 +7,16 @@ using SharedLibraryCore.Configuration;
 using System.Reflection;
 using SharedLibraryCore.Database.Models;
 using System.Collections.Concurrent;
+using System.Threading;
 
 namespace SharedLibraryCore.Interfaces
 {
     public interface IManager
     {
         Task Init();
-        void Start();
+        Task Start();
         void Stop();
+        void Restart();
         ILogger GetLogger(long serverId);
         IList<Server> GetServers();
         IList<Command> GetCommands();
@@ -29,11 +31,6 @@ namespace SharedLibraryCore.Interfaces
         /// </summary>
         /// <returns>EventHandler for the manager</returns>
         IEventHandler GetEventHandler();
-        /// <summary>
-        /// Signal to the manager that event(s) needs to be processed
-        /// </summary>
-        void SetHasEvent();
-        bool ShutdownRequested();
         IList<Assembly> GetPluginAssemblies();
         /// <summary>
         /// provides a page list to add and remove from
@@ -47,5 +44,7 @@ namespace SharedLibraryCore.Interfaces
         string Version { get;}
         ITokenAuthentication TokenAuthenticator { get; }
         string ExternalIPAddress { get; }
+        CancellationToken CancellationToken { get; }
+        bool IsRestartRequested { get; }
     }
 }

SharedLibraryCore/Objects/EFClient.cs

@@ -546,6 +546,7 @@ namespace SharedLibraryCore.Database.Models
                     profileBan = (await CurrentServer.Manager
                         .GetPenaltyService()
                         .GetActivePenaltiesAsync(AliasLinkId))
+                        .OrderByDescending(_penalty => _penalty.When)
                         .FirstOrDefault(_penalty => _penalty.Type == Penalty.PenaltyType.Ban);
 
                     CurrentServer.Logger.WriteWarning($"Client {this} is GUID banned, but no previous penalty exists for their ban");
@@ -596,18 +597,6 @@ namespace SharedLibraryCore.Database.Models
             // we want to get any penalties that are tied to their IP or AliasLink (but not necessarily their GUID)
             var activePenalties = await CurrentServer.Manager.GetPenaltyService().GetActivePenaltiesAsync(AliasLinkId, ipAddress);
 
-            #region CLIENT_LINKED_TEMPBAN
-            var tempBan = activePenalties.FirstOrDefault(_penalty => _penalty.Type == Penalty.PenaltyType.TempBan);
-
-            // they have an active tempban tied to their AliasLink
-            if (tempBan != null)
-            {
-                CurrentServer.Logger.WriteDebug($"Tempbanning {this} because their AliasLink is temporarily banned, but they are not");
-                TempBan(tempBan.Offense, DateTime.UtcNow - (tempBan.Expires ?? DateTime.UtcNow), autoKickClient);
-                return false;
-            }
-            #endregion
-
             #region CLIENT_LINKED_BAN
             var currentBan = activePenalties.FirstOrDefault(p => p.Type == Penalty.PenaltyType.Ban);
 
@@ -642,6 +631,20 @@ namespace SharedLibraryCore.Database.Models
             }
             #endregion
 
+            #region CLIENT_LINKED_TEMPBAN
+            var tempBan = activePenalties
+                .OrderByDescending(_penalty => _penalty.When)
+                .FirstOrDefault(_penalty => _penalty.Type == Penalty.PenaltyType.TempBan);
+
+            // they have an active tempban tied to their AliasLink
+            if (tempBan != null)
+            {
+                CurrentServer.Logger.WriteDebug($"Tempbanning {this} because their AliasLink is temporarily banned, but they are not");
+                TempBan(tempBan.Offense, DateTime.UtcNow - (tempBan.Expires ?? DateTime.UtcNow), autoKickClient);
+                return false;
+            }
+            #endregion
+
             #region CLIENT_LINKED_FLAG
             if (Level != Permission.Flagged)
             {

SharedLibraryCore/ScriptPlugin.cs

@@ -42,7 +42,7 @@ namespace SharedLibraryCore
             }
             catch (Exception ex)
             {
-                Manager.GetLogger(0).WriteError($"{Utilities.CurrentLocalization.LocalizationIndex["PLUGIN_IMPORTER_ERROR"]} {Name}");
+                Manager.GetLogger(0).WriteError(Utilities.CurrentLocalization.LocalizationIndex["PLUGIN_IMPORTER_ERROR"].FormatExt(Name));
                 Manager.GetLogger(0).WriteDebug(ex.Message);
             }
         }

SharedLibraryCore/Server.cs

@@ -23,10 +23,10 @@ namespace SharedLibraryCore
             IW4 = 2,
             IW5 = 3,
             IW6 = 4,
-            T4  = 5,
-            T5  = 6,
-            T6  = 7,
-            T7  = 8
+            T4 = 5,
+            T5 = 6,
+            T6 = 7,
+            T7 = 8
         }
 
         public Server(IManager mgr, ServerConfiguration config)
@@ -159,14 +159,16 @@ namespace SharedLibraryCore
 
             if (Target.Level == EFClient.Permission.Console)
             {
-                Console.ForegroundColor = ConsoleColor.Cyan;
+                Console.ForegroundColor = ConsoleColor.Green;
                 Console.WriteLine(Message.StripColors());
                 Console.ForegroundColor = ConsoleColor.Gray;
             }
 
             // prevent this from queueing up too many command responses
             if (CommandResult.Count > 15)
+            {
                 CommandResult.RemoveAt(0);
+            }
 
             // it was a remote command so we need to add it to the command result queue
             if (Target.ClientNumber < 0)

SharedLibraryCore/Services/ClientService.cs

@@ -447,8 +447,6 @@ namespace SharedLibraryCore.Services
                 return new List<PlayerInfo>();
             }
 
-            identifier = identifier.ToLower();
-
             using (var context = new DatabaseContext(disableTracking: true))
             {
                 long? networkId = null;
@@ -472,7 +470,7 @@ namespace SharedLibraryCore.Services
                 // todo maybe not make it start with wildcard?
                 else
                 {
-                    iqLinkIds = iqLinkIds.Where(_alias => EF.Functions.Like(_alias.Name, $"%{identifier}%"));
+                    iqLinkIds = iqLinkIds.Where(_alias => EF.Functions.Like(_alias.Name.ToLower(), $"%{identifier.ToLower()}%"));
                 }
 
                 var linkIds = await iqLinkIds

SharedLibraryCore/Utilities.cs

@@ -30,6 +30,8 @@ namespace SharedLibraryCore
 #endif
         public static Encoding EncodingType;
         public static Localization.Layout CurrentLocalization = new Localization.Layout(new Dictionary<string, string>());
+        public static TimeSpan DefaultCommandTimeout = new TimeSpan(0, 0, 10);
+
         public static EFClient IW4MAdminClient(Server server = null)
         {
             return new EFClient()
@@ -320,7 +322,7 @@ namespace SharedLibraryCore
 
             if (Elapsed.TotalSeconds < 30)
             {
-                return CurrentLocalization.LocalizationIndex["GLOBAL_TIME_JUSTNOW"];
+                return CurrentLocalization.LocalizationIndex["GLOBAL_TIME_JUSTNOW"] + ago;
             }
             if (Elapsed.TotalMinutes < 120)
             {
@@ -783,6 +785,11 @@ namespace SharedLibraryCore
             }
         }
 
+        /// <summary>
+        /// Determines if the given message is a quick message
+        /// </summary>
+        /// <param name="message"></param>
+        /// <returns>true if the </returns>
         public static bool IsQuickMessage(this string message)
         {
             return Regex.IsMatch(message, @"^\u0014(?:[A-Z]|_)+$");