From e97f4cb6d621cc23ec5d4f1f44fab8f045f5fd09 Mon Sep 17 00:00:00 2001 From: rootdarkarchon Date: Wed, 18 Jan 2023 11:06:30 +0100 Subject: [PATCH] enqueue user if they somehow lost the queue but got no positive reply from the server --- MareAPI | 2 +- .../Controllers/RequestController.cs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MareAPI b/MareAPI index 18b93b8..9fea4c3 160000 --- a/MareAPI +++ b/MareAPI @@ -1 +1 @@ -Subproject commit 18b93b889507733cbc775a263f49f7af989bc9cb +Subproject commit 9fea4c30da56d842a10a209a9945fd7f3cb98f4b diff --git a/MareSynchronosServer/MareSynchronosStaticFilesServer/Controllers/RequestController.cs b/MareSynchronosServer/MareSynchronosStaticFilesServer/Controllers/RequestController.cs index 0bd3f1b..f72bcb6 100644 --- a/MareSynchronosServer/MareSynchronosStaticFilesServer/Controllers/RequestController.cs +++ b/MareSynchronosServer/MareSynchronosStaticFilesServer/Controllers/RequestController.cs @@ -78,14 +78,14 @@ public class RequestController : ControllerBase [HttpGet] [Route(MareFiles.Request_Check)] - public async Task CheckQueueAsync(Guid requestId) + public async Task CheckQueueAsync(Guid requestId, string file) { try { await _parallelRequestSemaphore.WaitAsync(HttpContext.RequestAborted); - if (_requestQueue.StillEnqueued(requestId, MareUser)) - return Ok(); - return BadRequest(); + if (!_requestQueue.StillEnqueued(requestId, MareUser)) + await _requestQueue.EnqueueUser(new(requestId, MareUser, file)); + return Ok(); } catch (OperationCanceledException) { return BadRequest(); } finally