From 3848f263f3eb4b259203915b4c804f92886407d8 Mon Sep 17 00:00:00 2001 From: Kieran Date: Thu, 26 Sep 2024 22:02:23 +0100 Subject: [PATCH] chore: move redirect logic (again) --- VoidCat/Controllers/BaseDownloadController.cs | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/VoidCat/Controllers/BaseDownloadController.cs b/VoidCat/Controllers/BaseDownloadController.cs index f585f71..6126aa9 100644 --- a/VoidCat/Controllers/BaseDownloadController.cs +++ b/VoidCat/Controllers/BaseDownloadController.cs @@ -42,7 +42,19 @@ public abstract class BaseDownloadController : Controller await t.EncodeToAsync(Response.Body); return; } + + if (voidFile.Uploader?.IsNostr ?? false) + { + Response.StatusCode = (int)HttpStatusCode.Redirect; + Response.Headers.Location = $"https://files.v0l.io/{voidFile.Metadata.Digest}"; + return; + } + if (voidFile.Uploader != default) + { + voidFile.Uploader = voidFile.Uploader!.PublicProfile ? voidFile.Uploader : null; + } + var egressReq = new EgressRequest(gid, GetRanges(Request, (long)voidFile!.Metadata!.Size)); if (egressReq.Ranges.Count() > 1) { @@ -97,18 +109,6 @@ public abstract class BaseDownloadController : Controller return default; } - if (meta.Uploader?.IsNostr ?? false) - { - Response.StatusCode = (int)HttpStatusCode.Redirect; - Response.Headers.Location = $"https://files.v0l.io/{meta.Metadata.Digest}"; - return default; - } - - if (meta.Uploader != default) - { - meta.Uploader = meta.Uploader!.PublicProfile ? meta.Uploader : null; - } - return await CheckDownload(meta); }