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

Merge branch 'main' of https://github.com/Penumbra-Sync/server

Browse Source
This commit is contained in:
rootdarkarchon
2022-11-14 01:56:52 +01:00
parent 0f697bc5f3 80de0923fe
commit 6049dcf6c2
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.User.cs
View File

@@ -129,6 +129,7 @@ public partial class MareHub
{ {
_logger.LogCallInfo(MareHubLogger.Args(visibleCharacterIds.Count)); _logger.LogCallInfo(MareHubLogger.Args(visibleCharacterIds.Count));
bool hadInvalidData = false;
foreach (var replacement in characterCache.FileReplacements.SelectMany(p => p.Value)) foreach (var replacement in characterCache.FileReplacements.SelectMany(p => p.Value))
{ {
var invalidPaths = replacement.GamePaths.Where(p => !GamePathRegex().IsMatch(p)).ToArray(); var invalidPaths = replacement.GamePaths.Where(p => !GamePathRegex().IsMatch(p)).ToArray();
@@ -139,10 +140,12 @@ public partial class MareHub
if (!validGamePaths || !validHash || !validFileSwapPath) if (!validGamePaths || !validHash || !validFileSwapPath)
{ {
_logger.LogCallWarning(MareHubLogger.Args("Invalid Data", "GamePaths", validGamePaths, string.Join(",", invalidPaths), "Hash", validHash, replacement.Hash, "FileSwap", validFileSwapPath, replacement.FileSwapPath)); _logger.LogCallWarning(MareHubLogger.Args("Invalid Data", "GamePaths", validGamePaths, string.Join(",", invalidPaths), "Hash", validHash, replacement.Hash, "FileSwap", validFileSwapPath, replacement.FileSwapPath));
throw new HubException("Invalid data provided"); hadInvalidData = true;
} }
} }
if (hadInvalidData) throw new HubException("Invalid data provided");
var allPairedUsers = await GetAllPairedUnpausedUsers().ConfigureAwait(false); var allPairedUsers = await GetAllPairedUnpausedUsers().ConfigureAwait(false);
var allPairedUsersDict = allPairedUsers.ToDictionary(f => f, f => _clientIdentService.GetCharacterIdentForUid(f), System.StringComparer.Ordinal) var allPairedUsersDict = allPairedUsers.ToDictionary(f => f, f => _clientIdentService.GetCharacterIdentForUid(f), System.StringComparer.Ordinal)