move show_access_levels back to nicklist

Author: casperstorm

CHANGELOG.md

@@ -14,7 +14,7 @@ Added:
 Changed:
 
 - Moved `typing` settings from `buffer.channel.typing` to `buffer.typing` to clarify that they appliy to queries as well as channels
-- Moved nicklist nickname settings from `buffer.channel.nicklist` to `buffer.nickname` (`away`, `color`, and `show_access_levels`)
+- Moved nicklist nickname settings from `buffer.channel.nicklist` to `buffer.nickname` (`away` and `color`)
 
 Fixed:
 

data/src/config/buffer/channel.rs

@@ -2,6 +2,7 @@ use serde::Deserialize;
 
 use super::NicknameClickAction;
 use crate::channel::Position;
+use crate::config::buffer::AccessLevelFormat;
 use crate::isupport;
 use crate::serde::deserialize_u32_positive_integer;
 
@@ -56,6 +57,7 @@ pub struct Nicklist {
     pub position: Position,
     pub width: Option<f32>,
     pub alignment: Alignment,
+    pub show_access_levels: AccessLevelFormat,
     pub click: NicknameClickAction,
 }
 
@@ -66,6 +68,7 @@ impl Default for Nicklist {
             position: Position::default(),
             width: None,
             alignment: Alignment::default(),
+            show_access_levels: AccessLevelFormat::default(),
             click: NicknameClickAction::default(),
         }
     }

docs/configuration/buffer.md

@@ -163,6 +163,19 @@ Nicklist position in the pane.
 position = "right"
 ```
 
+#### `show_access_levels`
+
+Show access level(s) in front of nicknames (`@`, `+`, `~`, etc.).
+
+```toml
+# Type: string
+# Values: "all", "highest", or "none"
+# Default: "highest"
+
+[buffer.channel.nicklist]
+show_access_levels = "all"
+```
+
 #### `width`
 
 Overwrite nicklist width in pixels.

src/buffer/channel.rs

@@ -508,7 +508,6 @@ mod nick_list {
         theme: &'a Theme,
     ) -> Element<'a, Message> {
         let nicklist_config = &config.buffer.channel.nicklist;
-        let nickname_config = &config.buffer.nickname;
 
         let width = match nicklist_config.width {
             Some(width) => width,
@@ -517,7 +516,7 @@ mod nick_list {
                     .into_iter()
                     .flatten()
                     .map(|user| {
-                        user.display(nickname_config.show_access_levels, None)
+                        user.display(nicklist_config.show_access_levels, None)
                             .chars()
                             .count()
                     })
@@ -530,7 +529,7 @@ mod nick_list {
 
         let content = column(users.into_iter().flatten().map(|user| {
             let content = selectable_text(
-                user.display(nickname_config.show_access_levels, None),
+                user.display(nicklist_config.show_access_levels, None),
             )
             .font_maybe(
                 theme::font_style::nickname(theme, false).map(font::get),