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

small issue fix with api and more checks for welcome tags

Browse Source
This commit is contained in:
RaidMax 2021-05-04 19:01:09 -05:00
parent 127af98b00
commit 4d21680d59
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Plugins/Welcome/Plugin.cs
View File

@ -1,6 +1,5 @@
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using SharedLibraryCore; using SharedLibraryCore;
using SharedLibraryCore.Interfaces; using SharedLibraryCore.Interfaces;
using SharedLibraryCore.Database.Models; using SharedLibraryCore.Database.Models;
@ -28,7 +27,8 @@ namespace IW4MAdmin.Plugins.Welcome
public Plugin(IConfigurationHandlerFactory configurationHandlerFactory, IDatabaseContextFactory contextFactory) public Plugin(IConfigurationHandlerFactory configurationHandlerFactory, IDatabaseContextFactory contextFactory)
{ {
_configHandler = configurationHandlerFactory.GetConfigurationHandler<WelcomeConfiguration>("WelcomePluginSettings"); _configHandler =
configurationHandlerFactory.GetConfigurationHandler<WelcomeConfiguration>("WelcomePluginSettings");
_contextFactory = contextFactory; _contextFactory = contextFactory;
} }
@ -36,7 +36,7 @@ namespace IW4MAdmin.Plugins.Welcome
{ {
if (_configHandler.Configuration() == null) if (_configHandler.Configuration() == null)
{ {
_configHandler.Set((WelcomeConfiguration)new WelcomeConfiguration().Generate()); _configHandler.Set((WelcomeConfiguration) new WelcomeConfiguration().Generate());
await _configHandler.Save(); await _configHandler.Save();
} }
} }
@ -49,9 +49,14 @@ namespace IW4MAdmin.Plugins.Welcome
{ {
if (E.Type == GameEvent.EventType.Join) if (E.Type == GameEvent.EventType.Join)
{ {
EFClient newPlayer = E.Origin; var newPlayer = E.Origin;
if (newPlayer.Level >= Permission.Trusted && !E.Origin.Masked || !string.IsNullOrEmpty(newPlayer.GetAdditionalProperty<string>("ClientTag"))) if ((newPlayer.Level >= Permission.Trusted && !E.Origin.Masked) ||
E.Owner.Broadcast(await ProcessAnnouncement(_configHandler.Configuration().PrivilegedAnnouncementMessage, newPlayer)); (!string.IsNullOrEmpty(newPlayer.GetAdditionalProperty<string>("ClientTag")) &&
newPlayer.Level != Permission.Flagged && newPlayer.Level != Permission.Banned &&
!newPlayer.Masked))
E.Owner.Broadcast(
await ProcessAnnouncement(_configHandler.Configuration().PrivilegedAnnouncementMessage,
newPlayer));
newPlayer.Tell(await ProcessAnnouncement(_configHandler.Configuration().UserWelcomeMessage, newPlayer)); newPlayer.Tell(await ProcessAnnouncement(_configHandler.Configuration().UserWelcomeMessage, newPlayer));
@ -71,19 +76,22 @@ namespace IW4MAdmin.Plugins.Welcome
E.Owner.ToAdmins($"^1NOTICE: ^7Flagged player ^5{newPlayer.Name} ^7({penaltyReason}) has joined!"); E.Owner.ToAdmins($"^1NOTICE: ^7Flagged player ^5{newPlayer.Name} ^7({penaltyReason}) has joined!");
} }
else else
E.Owner.Broadcast(await ProcessAnnouncement(_configHandler.Configuration().UserAnnouncementMessage, newPlayer)); E.Owner.Broadcast(await ProcessAnnouncement(_configHandler.Configuration().UserAnnouncementMessage,
newPlayer));
} }
} }
private async Task<string> ProcessAnnouncement(string msg, EFClient joining) private async Task<string> ProcessAnnouncement(string msg, EFClient joining)
{ {
msg = msg.Replace("{{ClientName}}", joining.Name); msg = msg.Replace("{{ClientName}}", joining.Name);
msg = msg.Replace("{{ClientLevel}}", $"{Utilities.ConvertLevelToColor(joining.Level, joining.ClientPermission.Name)}{(string.IsNullOrEmpty(joining.GetAdditionalProperty<string>("ClientTag")) ? "" : $" ^7({joining.GetAdditionalProperty<string>("ClientTag")}^7)")}"); msg = msg.Replace("{{ClientLevel}}",
$"{Utilities.ConvertLevelToColor(joining.Level, joining.ClientPermission.Name)}{(string.IsNullOrEmpty(joining.GetAdditionalProperty<string>("ClientTag")) ? "" : $" ^7({joining.GetAdditionalProperty<string>("ClientTag")}^7)")}");
// this prevents it from trying to evaluate it every message // this prevents it from trying to evaluate it every message
if (msg.Contains("{{ClientLocation}}")) if (msg.Contains("{{ClientLocation}}"))
{ {
msg = msg.Replace("{{ClientLocation}}", await GetCountryName(joining.IPAddressString)); msg = msg.Replace("{{ClientLocation}}", await GetCountryName(joining.IPAddressString));
} }
msg = msg.Replace("{{TimesConnected}}", joining.Connections.Ordinalize()); msg = msg.Replace("{{TimesConnected}}", joining.Connections.Ordinalize());
return msg; return msg;
@ -100,11 +108,14 @@ namespace IW4MAdmin.Plugins.Welcome
{ {
try try
{ {
string response = await wc.DownloadStringTaskAsync(new Uri($"http://extreme-ip-lookup.com/json/{ip}")); string response =
var responseObj = JObject.Parse(response); await wc.DownloadStringTaskAsync(new Uri($"http://extreme-ip-lookup.com/json/{ip}"));
var responseObj = JObject.Parse(response);
response = responseObj["country"].ToString(); response = responseObj["country"].ToString();
return string.IsNullOrEmpty(response) ? Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_WELCOME_UNKNOWN_COUNTRY"] : response; return string.IsNullOrEmpty(response)
? Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_WELCOME_UNKNOWN_COUNTRY"]
: response;
} }
catch catch

3
WebfrontCore/Controllers/API/Server.cs
View File

@ -77,7 +77,8 @@ namespace WebfrontCore.Controllers.API
Owner = foundServer, Owner = foundServer,
Origin = Client, Origin = Client,
Data = commandRequest.Command, Data = commandRequest.Command,
Extra = commandRequest.Command Extra = commandRequest.Command,
IsRemote = true
}; };
Manager.AddEvent(commandEvent); Manager.AddEvent(commandEvent);