From: Simon Tatham <anakin@pobox.com>
Date: Fri, 5 Jan 2024 22:17:59 +0000 (+0000)
Subject: Fix inconsistent colour of visibility keywords.
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=932002c2e116cce569c3cf48c72be605b5e6fb83;p=mastodonochrome.git

Fix inconsistent colour of visibility keywords.

In DetailedStatusDisplay I still had "unlisted" as red, whereas I'd
changed my mind elsewhere.

The easiest fix is to use an actual VisibilityLine object, removing
one place I have to make all these things agree.
---

diff --git a/src/text.rs b/src/text.rs
index 3b9e42f..e882753 100644
--- a/src/text.rs
+++ b/src/text.rs
@@ -1889,7 +1889,7 @@ pub struct DetailedStatusDisplay {
     reply_to_user: Paragraph,
     reply_to_user_id: Option<String>,
     language: Paragraph,
-    visibility: Paragraph,
+    visibility: VisibilityLine,
     sensitive: Paragraph,
     spoiler: Paragraph,
     replies: Paragraph,
@@ -1941,15 +1941,7 @@ impl DetailedStatusDisplay {
             .add(&st.language.as_ref().map_or_else(
                 || ColouredString::uniform("none", '0'),
                 |s| ColouredString::plain(s)));
-        let vis_str = match st.visibility {
-            Visibility::Public => ColouredString::uniform("public", 'f'),
-            Visibility::Unlisted => ColouredString::uniform("unlisted", 'r'),
-            Visibility::Private => ColouredString::uniform("private", 'r'),
-            Visibility::Direct => ColouredString::uniform("direct", 'r'),
-        };
-        let visibility = Paragraph::new()
-            .add(&ColouredString::plain("Visibility: "))
-            .add(&vis_str);
+        let visibility = VisibilityLine::new(st.visibility);
         let sens_str = match st.sensitive {
             false => ColouredString::uniform("no", 'f'),
             true => ColouredString::uniform("yes", 'r'),