INSANEMODE/IW4M-Admin
1
0
Fork 0
mirror of https://github.com/RaidMax/IW4M-Admin.git synced 2025-06-10 15:20:48 -05:00
Code Issues Releases Wiki Activity

fix refactor issue

Browse Source
This commit is contained in:
RaidMax
2022-01-28 17:28:49 -06:00
parent 75d6417d64
commit bac343cdba
10 changed files with 44 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
WebfrontCore/Controllers/Client/ClientController.cs
View File

@ -19,13 +19,12 @@ namespace WebfrontCore.Controllers
public class ClientController : BaseController
{
private readonly IMetaService _metaService;
private readonly IConfigurationHandler<StatsConfiguration> _configurationHandler;
private readonly StatsConfiguration _config;
public ClientController(IManager manager, IMetaService metaService,
IConfigurationHandler<StatsConfiguration> configurationHandler) : base(manager)
public ClientController(IManager manager, IMetaService metaService, StatsConfiguration config) : base(manager)
{
_metaService = metaService;
_configurationHandler = configurationHandler;
_config = config;
}
public async Task<IActionResult> ProfileAsync(int id, MetaType? metaFilterType)
@ -114,7 +113,7 @@ namespace WebfrontCore.Controllers
ViewBag.Title += " " + Localization["WEBFRONT_CLIENT_PROFILE_TITLE"];
ViewBag.Description = $"Client information for {strippedName}";
ViewBag.Keywords = $"IW4MAdmin, client, profile, {strippedName}";
ViewBag.UseNewStats = _configurationHandler.Configuration()?.EnableAdvancedMetrics ?? true;
ViewBag.UseNewStats = _config?.EnableAdvancedMetrics ?? true;
return View("Profile/Index", clientDto);
}

6
WebfrontCore/Controllers/Client/ClientStatisticsController.cs
View File

@ -16,10 +16,10 @@ namespace WebfrontCore.Controllers
public ClientStatisticsController(IManager manager,
IResourceQueryHelper<StatsInfoRequest, AdvancedStatsInfo> queryHelper,
IConfigurationHandler<DefaultSettings> configurationHandler) : base(manager)
DefaultSettings defaultConfig) : base(manager)
{
_queryHelper = queryHelper;
_defaultConfig = configurationHandler.Configuration();
_defaultConfig = defaultConfig;
}
[HttpGet("{id:int}/advanced")]
@ -35,4 +35,4 @@ namespace WebfrontCore.Controllers
return View("~/Views/Client/Statistics/Advanced.cshtml", hitInfo.Results.First());
}
}
}
}

11
WebfrontCore/Controllers/Client/Legacy/StatsController.cs
View File

@ -27,19 +27,18 @@ namespace IW4MAdmin.Plugins.Web.StatsWeb.Controllers
private readonly IResourceQueryHelper<ChatSearchQuery, MessageResponse> _chatResourceQueryHelper;
private readonly ITranslationLookup _translationLookup;
private readonly IDatabaseContextFactory _contextFactory;
private readonly IConfigurationHandler<StatsConfiguration> _configurationHandler;
private readonly StatsConfiguration _config;
public StatsController(ILogger<StatsController> logger, IManager manager, IResourceQueryHelper<ChatSearchQuery,
MessageResponse> resourceQueryHelper, ITranslationLookup translationLookup,
IDatabaseContextFactory contextFactory,
IConfigurationHandler<StatsConfiguration> configurationHandler) : base(manager)
IDatabaseContextFactory contextFactory, StatsConfiguration config) : base(manager)
{
_logger = logger;
_manager = manager;
_chatResourceQueryHelper = resourceQueryHelper;
_translationLookup = translationLookup;
_contextFactory = contextFactory;
_configurationHandler = configurationHandler;
_config = config;
}
[HttpGet]
@ -70,7 +69,7 @@ namespace IW4MAdmin.Plugins.Web.StatsWeb.Controllers
serverId = StatManager.GetIdForServer(server);
}
var results = _configurationHandler.Configuration().EnableAdvancedMetrics
var results = _config?.EnableAdvancedMetrics ?? true
? await Plugin.Manager.GetNewTopStats(offset, count, serverId)
: await Plugin.Manager.GetTopStats(offset, count, serverId);
@ -80,7 +79,7 @@ namespace IW4MAdmin.Plugins.Web.StatsWeb.Controllers
return Ok();
}
ViewBag.UseNewStats = _configurationHandler.Configuration().EnableAdvancedMetrics;
ViewBag.UseNewStats = _config?.EnableAdvancedMetrics;
return View("~/Views/Client/Statistics/Components/TopPlayers/_List.cshtml", results);
}

2
WebfrontCore/Startup.cs
View File

@ -129,7 +129,7 @@ namespace WebfrontCore
services.AddSingleton(Program.ApplicationServiceProvider
.GetRequiredService<IConfigurationHandler<DefaultSettings>>());
services.AddSingleton(Program.ApplicationServiceProvider
.GetRequiredService<IConfigurationHandler<StatsConfiguration>>());
.GetRequiredService<StatsConfiguration>());
services.AddSingleton(Program.ApplicationServiceProvider.GetRequiredService<IServerDataViewer>());
}

9
WebfrontCore/ViewComponents/TopPlayersViewComponent.cs
View File

@ -3,18 +3,17 @@ using System.Threading.Tasks;
using IW4MAdmin.Plugins.Stats;
using IW4MAdmin.Plugins.Stats.Helpers;
using Microsoft.AspNetCore.Mvc;
using SharedLibraryCore.Interfaces;
using Stats.Config;
namespace WebfrontCore.ViewComponents
{
public class TopPlayersViewComponent : ViewComponent
{
private readonly IConfigurationHandler<StatsConfiguration> _configurationHandler;
private readonly StatsConfiguration _config;
public TopPlayersViewComponent(IConfigurationHandler<StatsConfiguration> configurationHandler)
public TopPlayersViewComponent(StatsConfiguration config)
{
_configurationHandler = configurationHandler;
_config = config;
}
public async Task<IViewComponentResult> InvokeAsync(int count, int offset, long? serverId = null)
@ -32,7 +31,7 @@ namespace WebfrontCore.ViewComponents
}
ViewBag.UseNewStats = _configurationHandler.Configuration()?.EnableAdvancedMetrics ?? true;
ViewBag.UseNewStats = _config?.EnableAdvancedMetrics ?? true;
return View("~/Views/Client/Statistics/Components/TopPlayers/_List.cshtml",
ViewBag.UseNewStats
? await Plugin.Manager.GetNewTopStats(offset, count, serverId)