Rim/IW4M-Admin
Rim/IW4M-Admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 30 Wiki Activity

update welcome plugin to IPluginV2

Browse Source
This commit is contained in:
RaidMax 2023-02-11 20:56:52 -06:00
parent 4ba56b53a4
commit 7b8f6421aa
3 changed files with 96 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
Plugins/Welcome/Plugin.cs
View File

@ -5,62 +5,54 @@ using SharedLibraryCore.Interfaces;
using SharedLibraryCore.Database.Models; using SharedLibraryCore.Database.Models;
using System.Linq; using System.Linq;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using System.Net;
using System.Net.Http; using System.Net.Http;
using System.Threading;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using Humanizer; using Humanizer;
using Data.Abstractions; using Data.Abstractions;
using Data.Models; using Data.Models;
using Microsoft.Extensions.DependencyInjection;
using SharedLibraryCore.Events.Management;
using SharedLibraryCore.Interfaces.Events;
using static Data.Models.Client.EFClient; using static Data.Models.Client.EFClient;
namespace IW4MAdmin.Plugins.Welcome namespace IW4MAdmin.Plugins.Welcome;
{
public class Plugin : IPlugin public class Plugin : IPluginV2
{ {
public string Author => "RaidMax"; public string Author => "RaidMax";
public string Version => "1.1";
public float Version => 1.0f;
public string Name => "Welcome Plugin"; public string Name => "Welcome Plugin";
private readonly IConfigurationHandler<WelcomeConfiguration> _configHandler; public static void RegisterDependencies(IServiceCollection serviceCollection)
{
serviceCollection.AddConfiguration<WelcomeConfiguration>("WelcomePluginSettings");
}
private readonly WelcomeConfiguration _configuration;
private readonly IDatabaseContextFactory _contextFactory; private readonly IDatabaseContextFactory _contextFactory;
public Plugin(IConfigurationHandlerFactory configurationHandlerFactory, IDatabaseContextFactory contextFactory) public Plugin(WelcomeConfiguration configuration, IDatabaseContextFactory contextFactory)
{ {
_configHandler = _configuration = configuration;
configurationHandlerFactory.GetConfigurationHandler<WelcomeConfiguration>("WelcomePluginSettings");
_contextFactory = contextFactory; _contextFactory = contextFactory;
IManagementEventSubscriptions.ClientStateAuthorized += OnClientStateAuthorized;
} }
public async Task OnLoadAsync(IManager manager) private async Task OnClientStateAuthorized(ClientStateEvent clientState, CancellationToken token)
{ {
await _configHandler.BuildAsync(); var newPlayer = clientState.Client;
if (_configHandler.Configuration() == null)
{
_configHandler.Set((WelcomeConfiguration) new WelcomeConfiguration().Generate());
await _configHandler.Save();
}
}
public Task OnUnloadAsync() => Task.CompletedTask; if (newPlayer.Level >= Permission.Trusted && !newPlayer.Masked ||
public Task OnTickAsync(Server S) => Task.CompletedTask;
public async Task OnEventAsync(GameEvent gameEvent, Server server)
{
if (gameEvent.Type == GameEvent.EventType.Join)
{
var newPlayer = gameEvent.Origin;
if (newPlayer.Level >= Permission.Trusted && !gameEvent.Origin.Masked||
!string.IsNullOrEmpty(newPlayer.Tag) && !string.IsNullOrEmpty(newPlayer.Tag) &&
newPlayer.Level != Permission.Flagged && newPlayer.Level != Permission.Banned && newPlayer.Level != Permission.Flagged && newPlayer.Level != Permission.Banned &&
!newPlayer.Masked) !newPlayer.Masked)
gameEvent.Owner.Broadcast( newPlayer.CurrentServer.Broadcast(
await ProcessAnnouncement(_configHandler.Configuration().PrivilegedAnnouncementMessage, await ProcessAnnouncement(_configuration.PrivilegedAnnouncementMessage,
newPlayer)); newPlayer));
newPlayer.Tell(await ProcessAnnouncement(_configHandler.Configuration().UserWelcomeMessage, newPlayer)); newPlayer.Tell(await ProcessAnnouncement(_configuration.UserWelcomeMessage, newPlayer));
if (newPlayer.Level == Permission.Flagged) if (newPlayer.Level == Permission.Flagged)
{ {
@ -72,14 +64,16 @@ namespace IW4MAdmin.Plugins.Welcome
.Where(p => p.OffenderId == newPlayer.ClientId && p.Type == EFPenalty.PenaltyType.Flag) .Where(p => p.OffenderId == newPlayer.ClientId && p.Type == EFPenalty.PenaltyType.Flag)
.OrderByDescending(p => p.When) .OrderByDescending(p => p.When)
.Select(p => p.AutomatedOffense ?? p.Offense) .Select(p => p.AutomatedOffense ?? p.Offense)
.FirstOrDefaultAsync(); .FirstOrDefaultAsync(cancellationToken: token);
} }
gameEvent.Owner.ToAdmins(Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_WELCOME_FLAG_MESSAGE"] newPlayer.CurrentServer.ToAdmins(Utilities.CurrentLocalization
.LocalizationIndex["PLUGINS_WELCOME_FLAG_MESSAGE"]
.FormatExt(newPlayer.Name, penaltyReason)); .FormatExt(newPlayer.Name, penaltyReason));
} }
else else
gameEvent.Owner.Broadcast(await ProcessAnnouncement(_configHandler.Configuration().UserAnnouncementMessage, {
newPlayer.CurrentServer.Broadcast(await ProcessAnnouncement(_configuration.UserAnnouncementMessage,
newPlayer)); newPlayer));
} }
} }
@ -95,7 +89,8 @@ namespace IW4MAdmin.Plugins.Welcome
msg = msg.Replace("{{ClientLocation}}", await GetCountryName(joining.IPAddressString)); msg = msg.Replace("{{ClientLocation}}", await GetCountryName(joining.IPAddressString));
} }
msg = msg.Replace("{{TimesConnected}}", joining.Connections.Ordinalize(Utilities.CurrentLocalization.Culture)); msg = msg.Replace("{{TimesConnected}}",
joining.Connections.Ordinalize(Utilities.CurrentLocalization.Culture));
return msg; return msg;
} }
@ -111,7 +106,8 @@ namespace IW4MAdmin.Plugins.Welcome
try try
{ {
var response = var response =
await wc.GetStringAsync(new Uri($"http://ip-api.com/json/{ip}?lang={Utilities.CurrentLocalization.LocalizationName.Split("-").First().ToLower()}")); await wc.GetStringAsync(new Uri(
$"http://ip-api.com/json/{ip}?lang={Utilities.CurrentLocalization.LocalizationName.Split("-").First().ToLower()}"));
var responseObj = JObject.Parse(response); var responseObj = JObject.Parse(response);
response = responseObj["country"]?.ToString(); response = responseObj["country"]?.ToString();
@ -126,4 +122,3 @@ namespace IW4MAdmin.Plugins.Welcome
} }
} }
} }
}

2
Plugins/Welcome/Welcome.csproj
View File

@ -20,7 +20,7 @@
</Target> </Target>
<ItemGroup> <ItemGroup>
<PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.10.13.1" PrivateAssets="All" /> <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2023.2.11.1" PrivateAssets="All" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
Plugins/Welcome/WelcomeConfiguration.cs
View File

@ -3,7 +3,7 @@ using SharedLibraryCore.Interfaces;
namespace IW4MAdmin.Plugins.Welcome namespace IW4MAdmin.Plugins.Welcome
{ {
class WelcomeConfiguration : IBaseConfiguration public class WelcomeConfiguration : IBaseConfiguration
{ {
public string UserAnnouncementMessage { get; set; } public string UserAnnouncementMessage { get; set; }
public string UserWelcomeMessage { get; set; } public string UserWelcomeMessage { get; set; }