From 72bc5e1090afde142b32a6dcf4567a7d2cb947c4 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Sat, 24 Feb 2024 21:28:52 +0100 Subject: [PATCH] [backend/masto-client] Respect autoDetectQuotes option --- Iceshrimp.Backend/Controllers/Mastodon/StatusController.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Iceshrimp.Backend/Controllers/Mastodon/StatusController.cs b/Iceshrimp.Backend/Controllers/Mastodon/StatusController.cs index b7f87866..b98fa5e2 100644 --- a/Iceshrimp.Backend/Controllers/Mastodon/StatusController.cs +++ b/Iceshrimp.Backend/Controllers/Mastodon/StatusController.cs @@ -183,7 +183,8 @@ public class StatusController( [ProducesResponseType(StatusCodes.Status400BadRequest, Type = typeof(MastodonErrorResponse))] public async Task PostNote([FromHybrid] StatusSchemas.PostStatusRequest request) { - var user = HttpContext.GetUserOrFail(); + var token = HttpContext.GetOauthToken() ?? throw new Exception("Token must not be null at this stage"); + var user = token.User; //TODO: handle scheduled statuses Request.Headers.TryGetValue("Idempotency-Key", out var idempotencyKeyHeader); @@ -229,7 +230,7 @@ public class StatusController( : null; var lastToken = request.Text?.Split(' ').LastOrDefault(); - var quoteUri = lastToken?.StartsWith("https://") ?? false ? lastToken : null; + var quoteUri = token.AutoDetectQuotes && (lastToken?.StartsWith("https://") ?? false) ? lastToken : null; var quote = quoteUri != null ? lastToken?.StartsWith($"https://{config.Value.WebDomain}/notes/") ?? false ? await db.Notes.IncludeCommonProperties()