From 6edb55b235e7f8c20cf923e43a0ca2444d1213bd Mon Sep 17 00:00:00 2001
From: Loporrit <141286461+loporrit@users.noreply.github.com>
Date: Sat, 2 Aug 2025 09:48:59 +0000
Subject: [PATCH] Remove old server migration

---
 .../MareConfiguration/ConfigurationMigrator.cs | 18 +-----------------
 MareSynchronos/MarePlugin.cs                   |  4 ++--
 .../ServerConfigurationManager.cs              |  5 -----
 MareSynchronos/WebAPI/SignalR/ApiController.cs |  1 -
 4 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/MareSynchronos/MareConfiguration/ConfigurationMigrator.cs b/MareSynchronos/MareConfiguration/ConfigurationMigrator.cs
index 80c5993..5cd9112 100644
--- a/MareSynchronos/MareConfiguration/ConfigurationMigrator.cs
+++ b/MareSynchronos/MareConfiguration/ConfigurationMigrator.cs
@@ -4,28 +4,12 @@ using Microsoft.Extensions.Logging;
 
 namespace MareSynchronos.MareConfiguration;
 
-public class ConfigurationMigrator(ILogger<ConfigurationMigrator> logger,
-    NotesConfigService notesConfig) : IHostedService
+public class ConfigurationMigrator(ILogger<ConfigurationMigrator> logger) : IHostedService
 {
     private readonly ILogger<ConfigurationMigrator> _logger = logger;
 
     public void Migrate()
     {
-        var oldUri = ApiController.LoporritServiceUriOld;
-        var newUri = ApiController.LoporritServiceUri;
-
-        if (notesConfig.Current.ServerNotes.TryGetValue(oldUri, out var old))
-        {
-            _logger.LogDebug("Migrating server notes {old} => {new}", oldUri, newUri);
-            notesConfig.Current.ServerNotes.TryAdd(newUri, new());
-            var merged = notesConfig.Current.ServerNotes.GetValueOrDefault(newUri, new());
-            foreach (var (k, v) in old.GidServerComments)
-                merged.GidServerComments.TryAdd(k, v);
-            foreach (var (k, v) in old.UidServerComments)
-                merged.UidServerComments.TryAdd(k, v);
-            notesConfig.Current.ServerNotes.Remove(oldUri);
-            notesConfig.Save();
-        }
     }
 
     public Task StartAsync(CancellationToken cancellationToken)
diff --git a/MareSynchronos/MarePlugin.cs b/MareSynchronos/MarePlugin.cs
index a0b5781..243da73 100644
--- a/MareSynchronos/MarePlugin.cs
+++ b/MareSynchronos/MarePlugin.cs
@@ -90,9 +90,9 @@ public class MarePlugin : MediatorSubscriberBase, IHostedService
     public Task StartAsync(CancellationToken cancellationToken)
     {
         var version = Assembly.GetExecutingAssembly().GetName().Version!;
-        Logger.LogInformation("Launching {name} {major}.{minor}.{build}-lop{rev}", "Loporrit Sync", version.Major, version.Minor, version.Build, version.Revision);
+        Logger.LogInformation("Launching {name} {major}.{minor}.{build}.{rev}", "Loporrit Sync", version.Major, version.Minor, version.Build, version.Revision);
         Mediator.Publish(new EventMessage(new Services.Events.Event(nameof(MarePlugin), Services.Events.EventSeverity.Informational,
-            $"Starting Loporrit Sync {version.Major}.{version.Minor}.{version.Build}-lop{version.Revision}")));
+            $"Starting Loporrit Sync {version.Major}.{version.Minor}.{version.Build}.{version.Revision}")));
 
         Mediator.Subscribe<SwitchToMainUiMessage>(this, (msg) => { if (_launchTask == null || _launchTask.IsCompleted) _launchTask = Task.Run(WaitForPlayerAndLaunchCharacterManager); });
         Mediator.Subscribe<DalamudLoginMessage>(this, (_) => DalamudUtilOnLogIn());
diff --git a/MareSynchronos/Services/ServerConfiguration/ServerConfigurationManager.cs b/MareSynchronos/Services/ServerConfiguration/ServerConfigurationManager.cs
index e63f3c3..924a4e8 100644
--- a/MareSynchronos/Services/ServerConfiguration/ServerConfigurationManager.cs
+++ b/MareSynchronos/Services/ServerConfiguration/ServerConfigurationManager.cs
@@ -500,11 +500,6 @@ public class ServerConfigurationManager
         for (int i = 0; i < _configService.Current.ServerStorage.Count; ++i)
         {
             var x = _configService.Current.ServerStorage[i];
-            if (x.ServerUri.Equals(ApiController.LoporritServiceUriOld, StringComparison.OrdinalIgnoreCase))
-            {
-                _logger.LogDebug("Updating server URI {old} => {new}", x.ServerUri, ApiController.LoporritServiceUri);
-                x.ServerUri = _configService.Current.ServerStorage[i].ServerUri = ApiController.LoporritServiceUri;
-            }
             if (x.ServerUri.Equals(ApiController.LoporritServiceUri, StringComparison.OrdinalIgnoreCase))
                 lopExists = true;
         }
diff --git a/MareSynchronos/WebAPI/SignalR/ApiController.cs b/MareSynchronos/WebAPI/SignalR/ApiController.cs
index 19ae2df..be0eb2e 100644
--- a/MareSynchronos/WebAPI/SignalR/ApiController.cs
+++ b/MareSynchronos/WebAPI/SignalR/ApiController.cs
@@ -25,7 +25,6 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IM
     public const string LoporritServer = "Loporrit Main Server";
     public const string LoporritServiceUri = "wss://lop-sync.com";
     public const string LoporritServiceHubUri = "wss://hub.lop-sync.com/mare";
-    public const string LoporritServiceUriOld = "wss://loporrit.us.to";
 
     private readonly DalamudUtilService _dalamudUtil;
     private readonly HubFactory _hubFactory;