feat: release v1.2.3 with multi-lang system

AutomaticAds.cs

@@ -15,7 +15,7 @@ namespace AutomaticAds;
 public class AutomaticAdsBase : BasePlugin, IPluginConfig<BaseConfigs>
 {
     public override string ModuleName => "AutomaticAds";
-    public override string ModuleVersion => "1.2.2";
+    public override string ModuleVersion => "1.2.3";
     public override string ModuleAuthor => "luca.uy";
     public override string ModuleDescription => "Send automatic messages to the chat and play a sound alert for users to see the message.";
 
@@ -70,7 +70,7 @@ private void InitializeServices()
         _playerManager = new PlayerManager(this);
         _ipQueryService = new IPQueryService();
 
-        _adService = new AdService(Config, _messageFormatter, _timerManager, _playerManager);
+        _adService = new AdService(Config, _messageFormatter, _timerManager, _playerManager, _ipQueryService);
         _welcomeService = new WelcomeService(Config, _messageFormatter, _timerManager, _playerManager);
         _joinLeaveService = new JoinLeaveService(Config, _messageFormatter, _playerManager, _ipQueryService, _timerManager);
     }
@@ -120,7 +120,7 @@ private void RegisterReloadCommand()
 
             try
             {
-                Server.ExecuteCommand("css_plugins reload AutomaticAds");
+                Server.ExecuteCommand($"css_plugins reload {ModuleName}");
                 string formattedPrefix = _messageFormatter!.FormatMessage(Config.ChatPrefix);
                 commandInfo.ReplyToCommand($"{formattedPrefix} {Localizer["Reloaded"]}");
             }
@@ -149,16 +149,49 @@ private void HandleTriggerCommand(CCSPlayerController? player, AdConfig ad)
         if (!player.IsValidPlayer())
             return;
 
-        string formattedPrefix = _messageFormatter!.FormatMessage(Config.ChatPrefix);
-        string formattedMessage = _messageFormatter.FormatMessage(ad.Message, player!.PlayerName, formattedPrefix);
+        Server.NextFrame(async () =>
+        {
+            try
+            {
+                string formattedPrefix = _messageFormatter!.FormatMessage(Config.ChatPrefix);
+                string formattedMessage;
+
+                if (Config.UseMultiLang)
+                {
+                    Models.PlayerInfo playerInfo;
+
+                    if (_playerManager!.NeedsCountryUpdate(player!.SteamID))
+                    {
+                        playerInfo = await _playerManager.GetOrCreatePlayerInfoAsync(player!, _ipQueryService);
+                    }
+                    else
+                    {
+                        playerInfo = _playerManager.GetBasicPlayerInfo(player!);
+                    }
+
+                    formattedMessage = _messageFormatter.FormatAdMessage(ad, playerInfo, formattedPrefix);
+                }
+                else
+                {
+                    formattedMessage = _messageFormatter.FormatAdMessage(ad, player?.PlayerName ?? "Unknown", "", formattedPrefix);
+                }
 
-        _playerManager!.SendMessageToPlayer(player, formattedMessage, ad.DisplayType);
+                if (!string.IsNullOrWhiteSpace(formattedMessage))
+                {
+                    _playerManager!.SendMessageToPlayer(player!, formattedMessage, ad.DisplayType);
 
-        string soundToPlay = ad.PlaySoundName ?? Config.GlobalPlaySound ?? string.Empty;
-        if (!ad.DisableSound && !string.IsNullOrWhiteSpace(soundToPlay))
-        {
-            _playerManager.PlaySoundToPlayer(player, soundToPlay);
-        }
+                    string soundToPlay = ad.PlaySoundName ?? Config.GlobalPlaySound ?? string.Empty;
+                    if (!ad.DisableSound && !string.IsNullOrWhiteSpace(soundToPlay))
+                    {
+                        _playerManager.PlaySoundToPlayer(player!, soundToPlay);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"[AutomaticAds] Error in HandleTriggerCommand: {ex.Message}");
+            }
+        });
     }
 
     private bool HasReloadPermission(CCSPlayerController player)
@@ -254,12 +287,79 @@ public HookResult OnPlayerFullConnect(EventPlayerConnectFull @event, GameEventIn
         if (@event.Userid?.IsValidPlayer() != true)
             return HookResult.Continue;
 
-        _joinLeaveService?.HandlePlayerJoin(@event.Userid);
-        _welcomeService?.SendWelcomeMessage(@event.Userid);
+        var player = @event.Userid;
+
+        if (Config.EnableJoinLeaveMessages || Config.UseMultiLang)
+        {
+            HandlePlayerConnectWithCountryInfo(player);
+        }
+        else
+        {
+            HandlePlayerConnectBasic(player);
+        }
 
         return HookResult.Continue;
     }
 
+    private async void HandlePlayerConnectWithCountryInfo(CCSPlayerController player)
+    {
+        try
+        {
+            var playerInfo = await _playerManager!.GetOrCreatePlayerInfoAsync(player, _ipQueryService);
+            Server.NextFrame(() =>
+            {
+                try
+                {
+                    if (player.IsValidPlayer())
+                    {
+                        if (Config.EnableJoinLeaveMessages)
+                        {
+                            _joinLeaveService?.HandlePlayerJoin(player);
+                        }
+
+                        _welcomeService?.SendWelcomeMessage(player);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine($"[AutomaticAds] Error in HandlePlayerConnectWithCountryInfo NextFrame: {ex.Message}");
+                }
+            });
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine($"[AutomaticAds] Error in HandlePlayerConnectWithCountryInfo: {ex.Message}");
+            HandlePlayerConnectBasic(player);
+        }
+    }
+
+    private void HandlePlayerConnectBasic(CCSPlayerController player)
+    {
+        try
+        {
+            _playerManager!.GetBasicPlayerInfo(player);
+
+            Server.NextFrame(() =>
+            {
+                try
+                {
+                    if (player.IsValidPlayer())
+                    {
+                        _welcomeService?.SendWelcomeMessage(player);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine($"[AutomaticAds] Error in HandlePlayerConnectBasic NextFrame: {ex.Message}");
+                }
+            });
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine($"[AutomaticAds] Error in HandlePlayerConnectBasic: {ex.Message}");
+        }
+    }
+
     [GameEventHandler]
     private HookResult OnPlayerDisconnectPre(EventPlayerDisconnect @event, GameEventInfo info)
     {
@@ -279,6 +379,7 @@ private HookResult OnPlayerDisconnect(EventPlayerDisconnect @event, GameEventInf
 
         StopCenterHtmlMessage(player!);
 
+        _playerManager?.ClearPlayerCache(player!);
         _joinLeaveService?.HandlePlayerLeave(player!);
         _welcomeService?.OnPlayerDisconnect(player!);
         _joinLeaveService?.OnPlayerDisconnect(player!);

Config/BaseConfigs.cs

@@ -12,10 +12,13 @@ public class BaseConfigs : BasePluginConfig
     [JsonPropertyName("GlobalPlaySound")]
     public string? GlobalPlaySound { get; set; } = "ui/panorama/popup_reveal_01";
 
+    [JsonPropertyName("GlobalInterval")]
+    public float GlobalInterval { get; set; } = 30.0f;
+
     [JsonPropertyName("AdminFlag")]
     public string? AdminFlag { get; set; } = "@css/generic";
 
-    [JsonPropertyName("sendAdsInOrder")]
+    [JsonPropertyName("SendAdsInOrder")]
     public bool SendAdsInOrder { get; set; } = true;
 
     [JsonPropertyName("UseWelcomeMessage")]
@@ -27,9 +30,15 @@ public class BaseConfigs : BasePluginConfig
     [JsonPropertyName("WelcomeDelay")]
     public float WelcomeDelay { get; set; } = 3.0f;
 
-    [JsonPropertyName("centerHtmlDisplayTime")]
+    [JsonPropertyName("CenterHtmlDisplayTime")]
     public float centerHtmlDisplayTime { get; set; } = 5.0f;
 
+    [JsonPropertyName("UseMultiLang")]
+    public bool UseMultiLang { get; set; } = true;
+
+    [JsonPropertyName("DefaultLanguage")]
+    public string DefaultLanguage { get; set; } = "en";
+
     [JsonPropertyName("Welcome")]
     public List<WelcomeConfig> Welcome { get; set; } = new()
     {
@@ -47,7 +56,7 @@ public class BaseConfigs : BasePluginConfig
     {
         new JoinLeaveConfig
         {
-            JoinMessage = "{BLUE}{playername} ({id64}) joined the server from {country}! {RED}Online: {players}/{maxplayers}.",
+            JoinMessage = "{BLUE}{playername} ({id64}) joined the server from {country} ({country_code})! {RED}Online: {players}/{maxplayers}.",
             LeaveMessage = "{BLUE}{playername} ({id64}) left the server!",
         }
     };
@@ -77,6 +86,7 @@ public class BaseConfigs : BasePluginConfig
             Map = "all",
             Interval = 1000,
             DisableSound = true,
+            DisableOrder = true,
             ViewFlag = "@css/vip"
         },
         new AdConfig

Config/ConfigValidator.cs

@@ -7,32 +7,60 @@ public static class ConfigValidator
 {
     public static void ValidateConfig(BaseConfigs config)
     {
-        ValidateAds(config.Ads);
+        ValidateGlobalInterval(config);
+        ValidateAds(config.Ads, config.GlobalInterval);
         ValidateChatPrefix(config);
         ValidateGlobalPlaySound(config);
         ValidateCenterHtmlDisplayTime(config);
     }
 
-    private static void ValidateAds(List<AdConfig> ads)
+    private static void ValidateGlobalInterval(BaseConfigs config)
+    {
+        if (config.GlobalInterval > Constants.MaxInterval)
+        {
+            config.GlobalInterval = Constants.MaxInterval;
+        }
+
+        if (config.GlobalInterval < Constants.MinInterval)
+        {
+            config.GlobalInterval = Constants.MinInterval;
+        }
+    }
+
+    private static void ValidateAds(List<AdConfig> ads, float globalInterval)
     {
         foreach (var ad in ads)
         {
-            ValidateAdInterval(ad);
+            ValidateAdInterval(ad, globalInterval);
             ValidateTriggerAd(ad);
         }
     }
 
-    private static void ValidateAdInterval(AdConfig ad)
+    private static void ValidateAdInterval(AdConfig ad, float globalInterval)
     {
-        if (ad.Interval > Constants.MaxInterval)
+        float effectiveInterval = ad.GetEffectiveInterval(globalInterval);
+
+        if (effectiveInterval > Constants.MaxInterval)
         {
-            ad.Interval = Constants.MaxInterval;
+            if (ad.HasCustomInterval)
+            {
+                ad.IntervalRaw = Constants.MaxInterval;
+            }
+            else
+            {
+
+            }
         }
 
-        if (ad.Interval < Constants.MinInterval)
+        if (effectiveInterval < Constants.MinInterval)
         {
-            ad.Interval = Constants.MinInterval;
+            if (ad.HasCustomInterval)
+            {
+                ad.IntervalRaw = Constants.MinInterval;
+            }
         }
+
+        ad.Interval = ad.GetEffectiveInterval(globalInterval);
     }
 
     private static void ValidateTriggerAd(AdConfig ad)