chiark / gitweb /
Fix inconsistent colour of visibility keywords.
authorSimon Tatham <anakin@pobox.com>
Fri, 5 Jan 2024 22:17:59 +0000 (22:17 +0000)
committerSimon Tatham <anakin@pobox.com>
Fri, 5 Jan 2024 22:17:59 +0000 (22:17 +0000)
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.

src/text.rs

index 3b9e42f0123ccde912ebfb6d4a8a69970d264f50..e8827536253366f1ee774827939d438036fd2789 100644 (file)
@@ -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'),