From ac3b965d5d6d80959d380f836eecd5492d637e56 Mon Sep 17 00:00:00 2001 From: Kieran Date: Thu, 26 Sep 2024 16:52:16 +0100 Subject: [PATCH] Redirect to files.v0l.io --- VoidCat/Controllers/BaseDownloadController.cs | 7 +++++++ VoidCat/Model/ApiUser.cs | 2 ++ VoidCat/Model/Extensions.cs | 3 ++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/VoidCat/Controllers/BaseDownloadController.cs b/VoidCat/Controllers/BaseDownloadController.cs index 9462e1d..3be9786 100644 --- a/VoidCat/Controllers/BaseDownloadController.cs +++ b/VoidCat/Controllers/BaseDownloadController.cs @@ -43,6 +43,13 @@ public abstract class BaseDownloadController : Controller return; } + if (voidFile.Uploader?.IsNostr ?? false) + { + Response.StatusCode = (int)HttpStatusCode.Redirect; + Response.Headers.Location = $"https://files.v0l.io/{voidFile.Metadata.Digest}"; + return; + } + var egressReq = new EgressRequest(gid, GetRanges(Request, (long)voidFile!.Metadata!.Size)); if (egressReq.Ranges.Count() > 1) { diff --git a/VoidCat/Model/ApiUser.cs b/VoidCat/Model/ApiUser.cs index d6da920..094e14b 100644 --- a/VoidCat/Model/ApiUser.cs +++ b/VoidCat/Model/ApiUser.cs @@ -48,4 +48,6 @@ public class ApiUser /// When the account was created /// public DateTime Created { get; init; } + + public bool IsNostr { get; init; } } diff --git a/VoidCat/Model/Extensions.cs b/VoidCat/Model/Extensions.cs index 9e092ab..a3e8999 100644 --- a/VoidCat/Model/Extensions.cs +++ b/VoidCat/Model/Extensions.cs @@ -375,7 +375,8 @@ public static class Extensions NeedsVerification = isSelf ? !u.Flags.HasFlag(UserFlags.EmailVerified) : null, PublicProfile = u.Flags.HasFlag(UserFlags.PublicProfile), PublicUploads = u.Flags.HasFlag(UserFlags.PublicUploads), - Roles = u.Roles.Select(a => a.Role).ToList() + Roles = u.Roles.Select(a => a.Role).ToList(), + IsNostr = u.AuthType is UserAuthType.Nostr }; }