Rename KeyModeType and ListModeType methods to be consistent with flags

Libera-Chat · May 4, 2024 · 3117454 · 3117454
1 parent 5e4efa6
commit 3117454
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/sable_ircd/src/command/handlers/mode.rs b/sable_ircd/src/command/handlers/mode.rs
@@ -166,7 +166,7 @@ async fn handle_channel_mode(
                 removed: perm_removed,
             };
             cmd.new_event_with_response(membership.id(), detail).await;
-        } else if let Some(list_type) = ListModeType::from_char(c) {
+        } else if let Some(list_type) = ListModeType::from_mode_char(c) {
             let list = chan.list(list_type);
 
             if dir == Direction::Query || args.is_empty() {
@@ -202,7 +202,7 @@ async fn handle_channel_mode(
                     }
                 }
             }
-        } else if let Some(_key_type) = KeyModeType::from_char(c) {
+        } else if let Some(_key_type) = KeyModeType::from_mode_char(c) {
             match dir {
                 // Can't query keys
                 Direction::Query => (),

diff --git a/sable_ircd/src/messages/send_history.rs b/sable_ircd/src/messages/send_history.rs
@@ -158,7 +158,7 @@ impl SendHistoryItem for update::ChannelTopicChange {
 
 impl SendHistoryItem for update::ListModeAdded {
     fn send_to(&self, conn: impl MessageSink, from_entry: &HistoryLogEntry) -> HandleResult {
-        let text = format!("+{} {}", self.list_type.mode_letter(), self.pattern);
+        let text = format!("+{} {}", self.list_type.mode_char(), self.pattern);
         let message =
             message::Mode::new(&self.set_by, &self.channel, &text).with_tags_from(from_entry);
         conn.send(message);
@@ -168,7 +168,7 @@ impl SendHistoryItem for update::ListModeAdded {
 
 impl SendHistoryItem for update::ListModeRemoved {
     fn send_to(&self, conn: impl MessageSink, from_entry: &HistoryLogEntry) -> HandleResult {
-        let text = format!("-{} {}", self.list_type.mode_letter(), self.pattern);
+        let text = format!("-{} {}", self.list_type.mode_char(), self.pattern);
         let message =
             message::Mode::new(&self.removed_by, &self.channel, &text).with_tags_from(from_entry);
         conn.send(message);

diff --git a/sable_ircd/src/server/mod.rs b/sable_ircd/src/server/mod.rs
@@ -164,8 +164,8 @@ impl ClientServer {
                 .iter()
                 .collect(),
             chan_modes_with_a_parameter: ListModeType::iter()
-                .map(|t| t.mode_letter())
-                .chain(KeyModeType::iter().map(|t| t.mode_letter()))
+                .map(|t| t.mode_char())
+                .chain(KeyModeType::iter().map(|t| t.mode_char()))
                 .chain(MembershipFlagSet::all().map(|m| m.mode_char()).into_iter())
                 .collect(),
         }
@@ -198,8 +198,8 @@ impl ClientServer {
             Username::LENGTH.try_into().unwrap(),
         ));
 
-        let list_modes: String = ListModeType::iter().map(|t| t.mode_letter()).collect();
-        let key_modes: String = KeyModeType::iter().map(|t| t.mode_letter()).collect();
+        let list_modes: String = ListModeType::iter().map(|t| t.mode_char()).collect();
+        let key_modes: String = KeyModeType::iter().map(|t| t.mode_char()).collect();
         let param_modes = "";
         let simple_modes: String = ChannelModeSet::all()
             .map(|m| m.mode_char())

diff --git a/sable_network/src/modes.rs b/sable_network/src/modes.rs
@@ -43,14 +43,14 @@ macro_rules! define_mode_type {
 
         impl $typename
         {
-            pub fn mode_letter(&self) -> char
+            pub fn mode_char(&self) -> char
             {
                 match self {
                     $( Self:: $var => $val ),*
                 }
             }
 
-            pub fn from_char(c: char) -> Option<Self>
+            pub fn from_mode_char(c: char) -> Option<Self>
             {
                 match c {
                     $( $val => Some(Self::$var) ),+,

diff --git a/sable_network/src/network/wrapper/channel_mode.rs b/sable_network/src/network/wrapper/channel_mode.rs
@@ -17,7 +17,7 @@ impl ChannelMode<'_> {
     pub fn format(&self) -> String {
         let mut ret = format!("+{}", self.data.modes.to_chars());
         if self.data.key.is_some() {
-            ret.push(KeyModeType::Key.mode_letter());
+            ret.push(KeyModeType::Key.mode_char());
         }
         ret
     }

diff --git a/sable_network/src/utils/channel_modes.rs b/sable_network/src/utils/channel_modes.rs
@@ -16,15 +16,15 @@ pub fn format_cmode_changes(detail: &ChannelModeChange) -> (String, Vec<String>)
         changes += "+";
         changes += &detail.added.to_chars();
         if let OptionChange::Set(new_key) = detail.key_change {
-            changes.push(KeyModeType::Key.mode_letter());
+            changes.push(KeyModeType::Key.mode_char());
             params.push(new_key.to_string());
         }
     }
     if has_minus(detail) {
         changes += "-";
         changes += &detail.removed.to_chars();
         if detail.key_change.is_unset() {
-            changes.push(KeyModeType::Key.mode_letter());
+            changes.push(KeyModeType::Key.mode_char());
             params.push("*".to_string());
         }
     }