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

update server to api 11

Browse Source
This commit is contained in:
Stanley Dimant
2022-08-19 11:37:31 +02:00
parent c21e2f740c
commit 7abe4f9f2e
3 changed files with 53 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MareAPI

Submodule MareAPI updated: 21fe024dfb...374cc31bab

30
MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Files.cs
View File

@@ -54,12 +54,15 @@ namespace MareSynchronosServer.Hubs
} }
[Authorize(AuthenticationSchemes = SecretKeyAuthenticationHandler.AuthScheme)] [Authorize(AuthenticationSchemes = SecretKeyAuthenticationHandler.AuthScheme)]
[HubMethodName(Api.InvokeFileGetFileSize)] [HubMethodName(Api.InvokeGetFilesSizes)]
public async Task<DownloadFileDto> GetFileSize(string hash) public async Task<List<DownloadFileDto>> GetFilesSizes(List<string> hashes)
{
var allFiles = await _dbContext.Files.Where(f => hashes.Contains(f.Hash)).ToListAsync();
var forbiddenFiles = await _dbContext.ForbiddenUploadEntries.
Where(f => hashes.Contains(f.Hash)).ToListAsync();
List<DownloadFileDto> response = new();
foreach (var hash in hashes)
{ {
var file = await _dbContext.Files.AsNoTracking().SingleOrDefaultAsync(f => f.Hash == hash);
var forbidden = _dbContext.ForbiddenUploadEntries.AsNoTracking().
SingleOrDefault(f => f.Hash == hash);
var fileInfo = new FileInfo(Path.Combine(BasePath, hash)); var fileInfo = new FileInfo(Path.Combine(BasePath, hash));
long fileSize = 0; long fileSize = 0;
try try
@@ -71,24 +74,27 @@ namespace MareSynchronosServer.Hubs
// file doesn't exist anymore // file doesn't exist anymore
} }
var response = new DownloadFileDto var forbiddenFile = forbiddenFiles.SingleOrDefault(f => f.Hash == hash);
var downloadFile = allFiles.SingleOrDefault(f => f.Hash == hash);
response.Add(new DownloadFileDto
{ {
FileExists = fileInfo.Exists, FileExists = fileInfo.Exists,
ForbiddenBy = forbidden?.ForbiddenBy ?? string.Empty, ForbiddenBy = forbiddenFile?.ForbiddenBy ?? string.Empty,
IsForbidden = forbidden != null, IsForbidden = forbiddenFile != null,
Hash = hash, Hash = hash,
Size = fileSize, Size = fileSize,
Url = _configuration["CdnFullUrl"] + hash.ToUpperInvariant() Url = _configuration["CdnFullUrl"] + hash.ToUpperInvariant()
}; });
if (!fileInfo.Exists && file != null) if (!fileInfo.Exists && downloadFile != null)
{ {
_dbContext.Files.Remove(file); _dbContext.Files.Remove(downloadFile);
await _dbContext.SaveChangesAsync(); await _dbContext.SaveChangesAsync();
} }
}
return response; return response;
} }
[Authorize(AuthenticationSchemes = SecretKeyAuthenticationHandler.AuthScheme)] [Authorize(AuthenticationSchemes = SecretKeyAuthenticationHandler.AuthScheme)]

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

@@ -205,39 +205,37 @@ namespace MareSynchronosServer.Hubs
[Authorize(AuthenticationSchemes = SecretKeyAuthenticationHandler.AuthScheme)] [Authorize(AuthenticationSchemes = SecretKeyAuthenticationHandler.AuthScheme)]
[HubMethodName(Api.SendUserPairedClientPauseChange)] [HubMethodName(Api.SendUserPairedClientPauseChange)]
public async Task SendPairedClientPauseChange(string uid, bool isPaused) public async Task SendPairedClientPauseChange(string otherUserUid, bool isPaused)
{ {
if (uid == AuthenticatedUserId) return; if (otherUserUid == AuthenticatedUserId) return;
var user = await _dbContext.Users.AsNoTracking() ClientPair pair = await _dbContext.ClientPairs.SingleOrDefaultAsync(w => w.UserUID == AuthenticatedUserId && w.OtherUserUID == otherUserUid);
.SingleAsync(u => u.UID == AuthenticatedUserId); if (pair == null) return;
var otherUser = await _dbContext.Users.AsNoTracking()
.SingleOrDefaultAsync(u => u.UID == uid);
if (otherUser == null) return;
_logger.LogInformation("User " + AuthenticatedUserId + " changed pause status with " + uid + " to " + isPaused);
ClientPair wl =
await _dbContext.ClientPairs.SingleOrDefaultAsync(w => w.User == user && w.OtherUser == otherUser);
wl.IsPaused = isPaused;
_dbContext.Update(wl);
await _dbContext.SaveChangesAsync();
var otherEntry = OppositeEntry(uid);
await Clients.User(user.UID) _logger.LogInformation("User " + AuthenticatedUserId + " changed pause status with " + otherUserUid + " to " + isPaused);
pair.IsPaused = isPaused;
_dbContext.Update(pair);
await _dbContext.SaveChangesAsync();
var selfCharaIdent = (await _dbContext.Users.SingleAsync(u => u.UID == AuthenticatedUserId)).CharacterIdentification;
var otherCharaIdent = (await _dbContext.Users.SingleAsync(u => u.UID == otherUserUid)).CharacterIdentification;
var otherEntry = OppositeEntry(otherUserUid);
await Clients.User(AuthenticatedUserId)
.SendAsync(Api.OnUserUpdateClientPairs, new ClientPairDto() .SendAsync(Api.OnUserUpdateClientPairs, new ClientPairDto()
{ {
OtherUID = otherUser.UID, OtherUID = otherUserUid,
IsPaused = isPaused, IsPaused = isPaused,
IsPausedFromOthers = otherEntry?.IsPaused ?? false, IsPausedFromOthers = otherEntry?.IsPaused ?? false,
IsSynced = otherEntry != null IsSynced = otherEntry != null
}, otherUser.CharacterIdentification); }, otherCharaIdent);
if (otherEntry != null) if (otherEntry != null)
{ {
await Clients.User(uid).SendAsync(Api.OnUserUpdateClientPairs, new ClientPairDto() await Clients.User(otherUserUid).SendAsync(Api.OnUserUpdateClientPairs, new ClientPairDto()
{ {
OtherUID = user.UID, OtherUID = AuthenticatedUserId,
IsPaused = otherEntry.IsPaused, IsPaused = otherEntry.IsPaused,
IsPausedFromOthers = isPaused, IsPausedFromOthers = isPaused,
IsSynced = true IsSynced = true
}, user.CharacterIdentification); }, selfCharaIdent);
} }
if (isPaused) if (isPaused)