From f55ff9f6a3af422436916460ae7a4e52048ce05e Mon Sep 17 00:00:00 2001 From: Stanley Dimant Date: Mon, 15 Aug 2022 17:56:16 +0200 Subject: [PATCH] adjust server to new api and send back url for file download on DownloadFilesDto --- MareAPI | 2 +- .../MareSynchronosServer/Hubs/MareHub.Files.cs | 3 ++- MareSynchronosServer/MareSynchronosServer/appsettings.json | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/MareAPI b/MareAPI index 1ee1304..21fe024 160000 --- a/MareAPI +++ b/MareAPI @@ -1 +1 @@ -Subproject commit 1ee130413f75da38618f968f4ac813c3205d2adb +Subproject commit 21fe024dfb8cecad466dfc8ceef15040300ad342 diff --git a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Files.cs b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Files.cs index a9de7f9..772c24d 100644 --- a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Files.cs +++ b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Files.cs @@ -77,7 +77,8 @@ namespace MareSynchronosServer.Hubs ForbiddenBy = forbidden?.ForbiddenBy ?? string.Empty, IsForbidden = forbidden != null, Hash = hash, - Size = fileSize + Size = fileSize, + Url = _configuration["CdnFullUrl"] + hash.ToUpperInvariant() }; if (!fileInfo.Exists && file != null) diff --git a/MareSynchronosServer/MareSynchronosServer/appsettings.json b/MareSynchronosServer/MareSynchronosServer/appsettings.json index a03d25f..dbaa2e8 100644 --- a/MareSynchronosServer/MareSynchronosServer/appsettings.json +++ b/MareSynchronosServer/MareSynchronosServer/appsettings.json @@ -23,6 +23,7 @@ ] } }, + "CdnBaseUrl": "https:///cache/", "FailedAuthForTempBan": 5, "TempBanDurationInMinutes": 30, "DiscordBotToken": "",