t0w0bi/ClubPenguinClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Change Loporrit Branding to CLUBPENGUIN

Browse Source 
- Update submodules
- Update to latest Penumbra API
This commit is contained in:
t0w0bi
2025-08-26 21:42:00 +01:00
committed by Rawrington
parent bef5b1be34
commit b41532d5af
38 changed files with 176 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MareSynchronos/WebAPI/AccountRegistrationService.cs
View File

@@ -50,13 +50,13 @@ public sealed class AccountRegistrationService : IDisposable
var authApiUrl = _serverManager.CurrentApiUrl;
// Override the API URL used for auth from remote config, if one is available
if (authApiUrl.Equals(ApiController.LoporritServiceUri, StringComparison.Ordinal))
if (authApiUrl.Equals(ApiController.ClubPenguinServiceUri, StringComparison.Ordinal))
{
var config = await _remoteConfig.GetConfigAsync<HubConnectionConfig>("mainServer").ConfigureAwait(false) ?? new();
if (!string.IsNullOrEmpty(config.ApiUrl))
authApiUrl = config.ApiUrl;
else
authApiUrl = ApiController.LoporritServiceApiUri;
authApiUrl = ApiController.ClubPenguinServiceApiUri;
}
var secretKey = GenerateSecretKey();

12
MareSynchronos/WebAPI/SignalR/ApiController.cs
View File

@@ -21,10 +21,10 @@ namespace MareSynchronos.WebAPI;
#pragma warning disable MA0040
public sealed partial class ApiController : DisposableMediatorSubscriberBase, IMareHubClient
{
public const string LoporritServer = "Loporrit Main Server";
public const string LoporritServiceUri = "wss://lop-sync.com";
public const string LoporritServiceApiUri = "wss://hub.lop-sync.com/";
public const string LoporritServiceHubUri = "wss://hub.lop-sync.com/mare";
public const string ClubPenguinServer = "Club Penguin Sync Main Server";
public const string ClubPenguinServiceUri = "wss://clubpenguin.drgn.rocks";
public const string ClubPenguinServiceApiUri = "wss://clubpenguin.drgn.rocks/";
public const string ClubPenguinServiceHubUri = "wss://clubpenguin.drgn.rocks/mare";
private readonly DalamudUtilService _dalamudUtil;
private readonly HubFactory _hubFactory;
@@ -194,7 +194,7 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IM
Mediator.Publish(new NotificationMessage("Client incompatible",
$"Your client is outdated ({currentClientVer.Major}.{currentClientVer.Minor}.{currentClientVer.Build}.{currentClientVer.Revision}), current is: " +
$"{_connectionDto.CurrentClientVersion.Major}.{_connectionDto.CurrentClientVersion.Minor}.{_connectionDto.CurrentClientVersion.Build}.{_connectionDto.CurrentClientVersion.Revision} " +
$"This client version is incompatible and will not be able to connect. Please update your Loporrit client.",
$"This client version is incompatible and will not be able to connect. Please update your Club Penguin Sync client.",
NotificationType.Error));
}
await StopConnection(ServerState.VersionMisMatch).ConfigureAwait(false);
@@ -206,7 +206,7 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IM
Mediator.Publish(new NotificationMessage("Client outdated",
$"Your client is outdated ({currentClientVer.Major}.{currentClientVer.Minor}.{currentClientVer.Build}.{currentClientVer.Revision}), current is: " +
$"{_connectionDto.CurrentClientVersion.Major}.{_connectionDto.CurrentClientVersion.Minor}.{_connectionDto.CurrentClientVersion.Build}.{_connectionDto.CurrentClientVersion.Revision} " +
$"Please keep your Loporrit client up-to-date.",
$"Please keep your Club Penguin Sync client up-to-date.",
NotificationType.Warning, TimeSpan.FromSeconds(15)));
}

6
MareSynchronos/WebAPI/SignalR/HubFactory.cs
View File

@@ -87,14 +87,14 @@ public class HubFactory : MediatorSubscriberBase
};
}
if (_serverConfigurationManager.CurrentApiUrl.Equals(ApiController.LoporritServiceUri, StringComparison.Ordinal))
if (_serverConfigurationManager.CurrentApiUrl.Equals(ApiController.ClubPenguinServiceUri, StringComparison.Ordinal))
{
var mainServerConfig = await _remoteConfig.GetConfigAsync<HubConnectionConfig>("mainServer").ConfigureAwait(false) ?? new();
defaultConfig = mainServerConfig;
if (string.IsNullOrEmpty(mainServerConfig.ApiUrl))
defaultConfig.ApiUrl = ApiController.LoporritServiceApiUri;
defaultConfig.ApiUrl = ApiController.ClubPenguinServiceApiUri;
if (string.IsNullOrEmpty(mainServerConfig.HubUrl))
defaultConfig.HubUrl = ApiController.LoporritServiceHubUri;
defaultConfig.HubUrl = ApiController.ClubPenguinServiceHubUri;
}
string jsonResponse;

4
MareSynchronos/WebAPI/SignalR/TokenProvider.cs
View File

@@ -73,13 +73,13 @@ public sealed class TokenProvider : IDisposable, IMediatorSubscriber
var authApiUrl = _serverManager.CurrentApiUrl;
// Override the API URL used for auth from remote config, if one is available
if (authApiUrl.Equals(ApiController.LoporritServiceUri, StringComparison.Ordinal))
if (authApiUrl.Equals(ApiController.ClubPenguinServiceUri, StringComparison.Ordinal))
{
var config = await _remoteConfig.GetConfigAsync<HubConnectionConfig>("mainServer").ConfigureAwait(false) ?? new();
if (!string.IsNullOrEmpty(config.ApiUrl))
authApiUrl = config.ApiUrl;
else
authApiUrl = ApiController.LoporritServiceApiUri;
authApiUrl = ApiController.ClubPenguinServiceApiUri;
}
try