From aa8d34ff4667be7f50f3ba844ccc3d622b3fb178 Mon Sep 17 00:00:00 2001 From: Stanley Dimant Date: Sun, 26 Jan 2025 02:45:57 +0100 Subject: [PATCH] rename main server name --- .../ConfigurationMigrator.cs | 22 +++++++++++++++---- .../Configurations/ServerConfig.cs | 2 +- .../WebAPI/SignalR/ApiController.cs | 2 +- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/MareSynchronos/MareConfiguration/ConfigurationMigrator.cs b/MareSynchronos/MareConfiguration/ConfigurationMigrator.cs index 239d180..ccc503e 100644 --- a/MareSynchronos/MareConfiguration/ConfigurationMigrator.cs +++ b/MareSynchronos/MareConfiguration/ConfigurationMigrator.cs @@ -1,21 +1,35 @@ -using Dalamud.Plugin; -using MareSynchronos.MareConfiguration.Configurations; +using MareSynchronos.WebAPI; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -using Newtonsoft.Json; namespace MareSynchronos.MareConfiguration; -public class ConfigurationMigrator(ILogger logger, TransientConfigService transientConfigService) : IHostedService +public class ConfigurationMigrator(ILogger logger, TransientConfigService transientConfigService, + ServerConfigService serverConfigService) : IHostedService { + private readonly ILogger _logger = logger; + public void Migrate() { if (transientConfigService.Current.Version == 0) { + _logger.LogInformation("Migrating Transient Config V0 => V1"); transientConfigService.Current.TransientConfigs.Clear(); transientConfigService.Current.Version = 1; transientConfigService.Save(); } + + if (serverConfigService.Current.Version == 1) + { + _logger.LogInformation("Migrating Server Config V1 => V2"); + var centralServer = serverConfigService.Current.ServerStorage.Find(f => f.ServerName.Equals("Lunae Crescere Incipientis (Central Server EU)", StringComparison.Ordinal)); + if (centralServer != null) + { + centralServer.ServerName = ApiController.MainServer; + } + serverConfigService.Current.Version = 2; + serverConfigService.Save(); + } } public Task StartAsync(CancellationToken cancellationToken) diff --git a/MareSynchronos/MareConfiguration/Configurations/ServerConfig.cs b/MareSynchronos/MareConfiguration/Configurations/ServerConfig.cs index b81e26a..406b660 100644 --- a/MareSynchronos/MareConfiguration/Configurations/ServerConfig.cs +++ b/MareSynchronos/MareConfiguration/Configurations/ServerConfig.cs @@ -16,5 +16,5 @@ public class ServerConfig : IMareConfiguration public bool SendCensusData { get; set; } = false; public bool ShownCensusPopup { get; set; } = false; - public int Version { get; set; } = 1; + public int Version { get; set; } = 2; } \ No newline at end of file diff --git a/MareSynchronos/WebAPI/SignalR/ApiController.cs b/MareSynchronos/WebAPI/SignalR/ApiController.cs index 90d2705..467c2e4 100644 --- a/MareSynchronos/WebAPI/SignalR/ApiController.cs +++ b/MareSynchronos/WebAPI/SignalR/ApiController.cs @@ -21,7 +21,7 @@ namespace MareSynchronos.WebAPI; #pragma warning disable MA0040 public sealed partial class ApiController : DisposableMediatorSubscriberBase, IMareHubClient { - public const string MainServer = "Lunae Crescere Incipientis (Central Server EU)"; + public const string MainServer = "Lunae Crescere Incipientis (Official Central Server)"; public const string MainServiceUri = "wss://maresynchronos.com"; private readonly DalamudUtilService _dalamudUtil;