[issue #129]

Add most kills command/macro
sneaky fix for tekno parser

Plugins/ScriptPlugins/ParserTeknoMW3.js

@@ -3,7 +3,7 @@ var eventParser;
 
 var plugin = {
     author: 'RaidMax',
-    version: 0.4,
+    version: 0.5,
     name: 'Tekno MW3 Parser',
     isParser: true,
 
@@ -15,6 +15,7 @@ var plugin = {
         eventParser = manager.GenerateDynamicEventParser(this.name);
 
         rconParser.Configuration.Status.Pattern = '^ *([0-9]+) +([0-9]+) +((?:[A-Z]+|[0-9]+)) +((?:[A-Z]|[0-9]){16,32}|0)\t +(.{0,16}) +([0-9]+) +(\\d+\\.\\d+\\.\\d+\\.\\d+\\:-?\\d{1,5}|0+\\.0+\\:-?\\d{1,5}|loopback) *$';
+        rconParser.Configuration.StatusHeader.Pattern = 'num +score +ping +guid +name +lastmsg +address';
         rconParser.Configuration.Status.AddMapping(104, 5); // RConName
         rconParser.Configuration.Status.AddMapping(103, 4); // RConNetworkId
         rconParser.Configuration.CommandPrefixes.RConGetInfo = undefined;

Plugins/Stats/Commands/MostKillsCommand.cs

@@ -0,0 +1,80 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+
+using SharedLibraryCore;
+using IW4MAdmin.Plugins.Stats.Models;
+using System.Collections.Generic;
+using SharedLibraryCore.Database.Models;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
+using IW4MAdmin.Plugins.Stats.Config;
+using IW4MAdmin.Plugins.Stats.Helpers;
+
+namespace IW4MAdmin.Plugins.Stats.Commands
+{
+    class MostKillsCommand : Command
+    {
+        private readonly IDatabaseContextFactory _contextFactory;
+
+        public MostKillsCommand(CommandConfiguration config, ITranslationLookup translationLookup, IDatabaseContextFactory contextFactory) : base(config, translationLookup)
+        {
+            Name = "mostkills";
+            Description = translationLookup["PLUGINS_STATS_COMMANDS_MOSTKILLS_DESC"];
+            Alias = "mk";
+            Permission = EFClient.Permission.User;
+
+            _contextFactory = contextFactory;
+        }
+
+        public override async Task ExecuteAsync(GameEvent E)
+        {
+            var mostKills = await GetMostKills(StatManager.GetIdForServer(E.Owner), Plugin.Config.Configuration(), _contextFactory, _translationLookup);
+            if (!E.Message.IsBroadcastCommand())
+            {
+                foreach (var stat in mostKills)
+                {
+                    E.Origin.Tell(stat);
+                }
+            }
+
+            else
+            {
+                foreach (var stat in mostKills)
+                {
+                    E.Owner.Broadcast(stat);
+                }
+            }
+        }
+
+        public static async Task<IEnumerable<string>> GetMostKills(long? serverId, StatsConfiguration config, IDatabaseContextFactory contextFactory, ITranslationLookup translationLookup)
+        {
+            using (var ctx = contextFactory.CreateContext(enableTracking: false))
+            {
+                var dayInPast = DateTime.UtcNow.AddMonths(-config.MostKillsMaxInactivityDays);
+
+                var iqStats = (from stats in ctx.Set<EFClientStatistics>()
+                               join client in ctx.Clients
+                               on stats.ClientId equals client.ClientId
+                               join alias in ctx.Aliases
+                               on client.CurrentAliasId equals alias.AliasId
+                               where stats.ServerId == serverId
+                               where client.Level != EFClient.Permission.Banned
+                               where client.LastConnection >= dayInPast
+                               orderby stats.Kills descending
+                               select new
+                               {
+                                   alias.Name,
+                                   stats.Kills
+                               })
+                               .Take(config.MostKillsClientLimit);
+
+                var iqList = await iqStats.ToListAsync();
+
+                return iqList.Select((stats, index) => translationLookup["PLUGINS_STATS_COMMANDS_MOSTKILLS_FORMAT"].FormatExt(index + 1, stats.Name, stats.Kills))
+                    .Prepend(Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_STATS_COMMANDS_MOSTKILLS_HEADER"]);
+            }
+        }
+    }
+}

Plugins/Stats/Config/StatsConfiguration.cs

@@ -14,6 +14,8 @@ namespace IW4MAdmin.Plugins.Stats.Config
         public List<string> RecoilessWeapons { get; set; }
         public int TopPlayersMinPlayTime { get; set; }
         public bool StoreClientKills { get; set; }
+        public int MostKillsMaxInactivityDays { get; set; } = 30;
+        public int MostKillsClientLimit { get; set; } = 5;
         public IDictionary<DetectionType, DistributionConfiguration> DetectionDistributions { get; set; }
         public IDictionary<long, DetectionType[]> ServerDetectionTypes { get; set; }
 

Plugins/Stats/Plugin.cs

@@ -32,11 +32,14 @@ namespace IW4MAdmin.Plugins.Stats
         int scriptKillCount;
 #endif
         private readonly IDatabaseContextFactory _databaseContextFactory;
+        private readonly ITranslationLookup _translationLookup;
 
-        public Plugin(IConfigurationHandlerFactory configurationHandlerFactory, IDatabaseContextFactory databaseContextFactory)
+        public Plugin(IConfigurationHandlerFactory configurationHandlerFactory, IDatabaseContextFactory databaseContextFactory,
+            ITranslationLookup translationLookup)
         {
             Config = configurationHandlerFactory.GetConfigurationHandler<StatsConfiguration>("StatsPluginSettings");
             _databaseContextFactory = databaseContextFactory;
+            _translationLookup = translationLookup;
         }
 
         public async Task OnEventAsync(GameEvent E, Server S)
@@ -491,10 +494,17 @@ namespace IW4MAdmin.Plugins.Stats
                 return string.Join(Environment.NewLine, await Commands.MostPlayedCommand.GetMostPlayed(s, Utilities.CurrentLocalization.LocalizationIndex));
             }
 
+            async Task<string> mostKills(Server gameServer)
+            {
+                return string.Join(Environment.NewLine,
+                    await Commands.MostKillsCommand.GetMostKills(StatManager.GetIdForServer(gameServer), Config.Configuration(), _databaseContextFactory, _translationLookup));
+            }
+
             manager.GetMessageTokens().Add(new MessageToken("TOTALKILLS", totalKills));
             manager.GetMessageTokens().Add(new MessageToken("TOTALPLAYTIME", totalPlayTime));
             manager.GetMessageTokens().Add(new MessageToken("TOPSTATS", topStats));
             manager.GetMessageTokens().Add(new MessageToken("MOSTPLAYED", mostPlayed));
+            manager.GetMessageTokens().Add(new MessageToken("MOSTKILLS", mostKills));
 
             ServerManager = manager;
             Manager = new StatManager(manager, _databaseContextFactory, Config);