From db9767271409ffcad308c16a0e74bcc119f59d07 Mon Sep 17 00:00:00 2001
From: Nicola Benaglia <nico.benaz@gmail.com>
Date: Sat, 19 Aug 2023 23:59:43 +0200
Subject: [PATCH] Move check for approve_content_warning

---
 src/ui/feed/note/mod.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ui/feed/note/mod.rs b/src/ui/feed/note/mod.rs
index 13525140..a745006e 100644
--- a/src/ui/feed/note/mod.rs
+++ b/src/ui/feed/note/mod.rs
@@ -904,7 +904,7 @@ fn render_content(
                     } else if app.render_qr == Some(event.id) {
                         app.render_qr(ui, ctx, "feedqr", event.content.trim());
                     // FIXME should this be the unmodified content (event.content)?
-                    } else if event.content_warning().is_some() && !app.approved.contains(&event.id)
+                    } else if event.content_warning().is_some() && !app.approved.contains(&event.id) && !app.settings.approve_content_warning
                     {
                         ui.label(
                             RichText::new(format!(
@@ -914,7 +914,7 @@ fn render_content(
                             .monospace()
                             .italics(),
                         );
-                        if ui.button("Show Post").clicked() || app.settings.approve_content_warning
+                        if ui.button("Show Post").clicked()
                         {
                             app.approved.insert(event.id);
                             app.height.remove(&event.id); // will need to be recalculated.