INSANEMODE/IW4M-Admin
1
0
Fork 0
mirror of https://github.com/RaidMax/IW4M-Admin.git synced 2025-06-25 06:30:21 -05:00
Code Issues Releases Wiki Activity

deleted localization files as they're now generated during release

Browse Source 
reintroduce throttling for servers that are unreachable (defaults to 60 seconds between polls)
small revert to the RektT5M parser contell -> tell
add migration to introduce gamename to server
impllement quickmessage mapping
This commit is contained in:
RaidMax
2019-04-23 17:27:20 -05:00
parent 5a0b2ff169
commit 3488bc5d15
22 changed files with 833 additions and 1118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/ScriptPlugins/ParserRektT5M.js
View File

@ -17,7 +17,7 @@ var plugin = {
eventParser.Configuration.GameDirectory = 'data';
rconParser.Configuration.CommandPrefixes.RConResponse = '\xff\xff\xff\xff\1print';
rconParser.Configuration.CommandPrefixes.Tell = 'contell {0} {1}';
rconParser.Configuration.CommandPrefixes.Tell = 'tell {0} {1}';
rconParser.Configuration.CommandPrefixes.RConGetInfo = undefined;
rconParser.Version = 'Call of Duty Multiplayer - Ship COD_T5_S MP build 7.0.189 CL(1022875) CODPCAB-V64 CEG Wed Nov 02 18:02:23 2011 win-x86';

21
Plugins/Stats/Controllers/StatsController.cs
View File

@ -71,15 +71,32 @@ namespace IW4MAdmin.Plugins.Stats.Web.Controllers
ClientId = message.ClientId,
Message = message.Message,
Name = message.Client.CurrentAlias.Name,
Time = message.TimeSent
Time = message.TimeSent,
ServerGame = message.Server.GameName ?? Server.Game.IW4
};
#if DEBUG == true
var messagesSql = iqMessages.ToSql();
#endif
var messages = await iqMessages.ToListAsync();
foreach (var message in messages)
{
if (message.Message.IsQuickMessage())
{
try
{
var quickMessages = Manager.GetApplicationSettings().Configuration()
.QuickMessages
.First(_qm => _qm.Game == message.ServerGame);
message.Message = quickMessages.Messages[message.Message.Substring(1)];
message.IsQuickMessage = true;
}
catch { }
}
}
return View("_MessageContext", messages);
}
}

11
Plugins/Stats/Helpers/StatManager.cs
View File

@ -222,13 +222,22 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
{
Port = sv.GetPort(),
EndPoint = sv.ToString(),
ServerId = serverId
ServerId = serverId,
GameName = sv.GameName
};
server = serverSet.Add(server).Entity;
// this doesn't need to be async as it's during initialization
ctx.SaveChanges();
}
// we want to set the gamename up if it's never been set, or it changed
else if (!server.GameName.HasValue || server.GameName.HasValue && server.GameName.Value != sv.GameName)
{
server.GameName = sv.GameName;
ctx.Entry(server).Property(_prop => _prop.GameName).IsModified = true;
ctx.SaveChanges();
}
}
// check to see if the stats have ever been initialized

2
Plugins/Stats/Models/EFServer.cs
View File

@ -2,6 +2,7 @@
using SharedLibraryCore.Database.Models;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using static SharedLibraryCore.Server;
namespace IW4MAdmin.Plugins.Stats.Models
{
@ -13,5 +14,6 @@ namespace IW4MAdmin.Plugins.Stats.Models
[Required]
public int Port { get; set; }
public string EndPoint { get; set; }
public Game? GameName { get; set; }
}
}

27
Plugins/Stats/Plugin.cs
View File

@ -408,11 +408,36 @@ namespace IW4MAdmin.Plugins.Stats
messageMeta = await messages.Select(m => new ProfileMeta()
{
Key = null,
Value = m.Message,
Value = new { m.Message, m.Server.GameName },
When = m.TimeSent,
Extra = m.ServerId.ToString(),
Type = ProfileMeta.MetaType.ChatMessage
}).ToListAsync();
foreach (var message in messageMeta)
{
if ((message.Value.Message as string).IsQuickMessage())
{
try
{
var quickMessages = ServerManager.GetApplicationSettings().Configuration()
.QuickMessages
.First(_qm => _qm.Game == message.Value.GameName);
message.Value = quickMessages.Messages[(message.Value.Message as string).Substring(1)];
message.Type = ProfileMeta.MetaType.QuickMessage;
}
catch
{
message.Value = message.Value.Message;
}
}
else
{
message.Value = message.Value.Message;
}
}
}
return messageMeta;

2
Plugins/Web/StatsWeb/Views/Stats/_MessageContext.cshtml
View File

@ -8,7 +8,7 @@
<div class="bg-dark p-3 mb-2 border-bottom">
@foreach (var message in Model)
{
<span class="text-white">@message.Name</span><span> &mdash; @message.Message</span><br />
<span class="text-white">@message.Name</span><span> &mdash; <span class="@(message.IsQuickMessage ? "font-italic" : "")">@message.Message</span></span><br />
}
</div>
</div>