From 76a3f94fe8044dda6ce5b2cdf6ba033d668b41fd Mon Sep 17 00:00:00 2001
From: Laura Hausmann <laura@hausmann.dev>
Date: Tue, 7 Jan 2025 08:29:15 +0100
Subject: [PATCH] [backend/masto-client] Fix missing replyInaccessible marker

---
 .../Mastodon/Renderers/NoteRenderer.cs        | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/Iceshrimp.Backend/Controllers/Mastodon/Renderers/NoteRenderer.cs b/Iceshrimp.Backend/Controllers/Mastodon/Renderers/NoteRenderer.cs
index 35e972ae..bdf4a098 100644
--- a/Iceshrimp.Backend/Controllers/Mastodon/Renderers/NoteRenderer.cs
+++ b/Iceshrimp.Backend/Controllers/Mastodon/Renderers/NoteRenderer.cs
@@ -111,6 +111,23 @@ public class NoteRenderer(
 			AttachmentType.Image or AttachmentType.Gif => MfmInlineMedia.MediaType.Image,
 			_                                          => MfmInlineMedia.MediaType.Other
 		}, p.RemoteUrl ?? p.Url, p.Description)).ToList();
+		
+		var filters = data?.Filters ?? await GetFiltersAsync(user, filterContext);
+
+		List<FilterResultEntity> filterResult;
+		if (filters.Count > 0 && filterContext == null)
+		{
+			var filtered = FilterHelper.CheckFilters([note, note.Reply, note.Renote, note.Renote?.Renote], filters);
+			filterResult = GetFilterResult(filtered);
+		}
+		else
+		{
+			var filtered = FilterHelper.IsFiltered([note, note.Reply, note.Renote, note.Renote?.Renote], filters);
+			filterResult = GetFilterResult(filtered.HasValue ? [filtered.Value] : []);
+		}
+
+		if ((user?.UserSettings?.FilterInaccessible ?? false) && (replyInaccessible || quoteInaccessible))
+			filterResult.Insert(0, InaccessibleFilter);
 
 		var cw = note.Cw;
 		if (replyInaccessible && !string.IsNullOrEmpty(cw))
@@ -145,23 +162,6 @@ public class NoteRenderer(
 			? (data?.Polls ?? await GetPollsAsync([note], user)).FirstOrDefault(p => p.Id == note.Id)
 			: null;
 
-		var filters = data?.Filters ?? await GetFiltersAsync(user, filterContext);
-
-		List<FilterResultEntity> filterResult;
-		if (filters.Count > 0 && filterContext == null)
-		{
-			var filtered = FilterHelper.CheckFilters([note, note.Reply, note.Renote, note.Renote?.Renote], filters);
-			filterResult = GetFilterResult(filtered);
-		}
-		else
-		{
-			var filtered = FilterHelper.IsFiltered([note, note.Reply, note.Renote, note.Renote?.Renote], filters);
-			filterResult = GetFilterResult(filtered.HasValue ? [filtered.Value] : []);
-		}
-
-		if ((user?.UserSettings?.FilterInaccessible ?? false) && (replyInaccessible || quoteInaccessible))
-			filterResult.Insert(0, InaccessibleFilter);
-
 		var res = new StatusEntity
 		{
 			Id               = note.Id,
@@ -185,7 +185,7 @@ public class NoteRenderer(
 			IsBookmarked     = bookmarked,
 			IsMuted          = muted,
 			IsSensitive      = sensitive,
-			ContentWarning   = note.Cw ?? "",
+			ContentWarning   = cw ?? "",
 			Visibility       = StatusEntity.EncodeVisibility(note.Visibility),
 			Content          = content,
 			Text             = text,