diff options
Diffstat (limited to 'mumlib')
| -rw-r--r-- | mumlib/src/command.rs | 2 | ||||
| -rw-r--r-- | mumlib/src/error.rs | 4 | ||||
| -rw-r--r-- | mumlib/src/state.rs | 7 |
3 files changed, 10 insertions, 3 deletions
diff --git a/mumlib/src/command.rs b/mumlib/src/command.rs index b2ac321..a0673f4 100644 --- a/mumlib/src/command.rs +++ b/mumlib/src/command.rs @@ -6,7 +6,7 @@ use std::collections::HashMap; #[derive(Clone, Debug, Deserialize, Serialize)] pub enum Command { ChannelJoin { - channel_id: u32, + channel_identifier: String, }, ChannelList, ServerConnect { diff --git a/mumlib/src/error.rs b/mumlib/src/error.rs index cb88aa7..3e514fd 100644 --- a/mumlib/src/error.rs +++ b/mumlib/src/error.rs @@ -8,7 +8,7 @@ pub type Result<T> = std::result::Result<T, Error>; pub enum Error { DisconnectedError, AlreadyConnectedError, - InvalidChannelIdError(u32), + InvalidChannelIdentifierError(String), InvalidServerAddrError(String, u16), } @@ -17,7 +17,7 @@ impl Display for Error { match self { Error::DisconnectedError => write!(f, "Not connected to a server"), Error::AlreadyConnectedError => write!(f, "Already connected to a server"), - Error::InvalidChannelIdError(id) => write!(f, "Invalid channel id: {}", id), + Error::InvalidChannelIdentifierError(id) => write!(f, "Couldn't find channel {}", id), Error::InvalidServerAddrError(addr, port) => write!(f, "Invalid server address: {}:{}", addr, port), } } diff --git a/mumlib/src/state.rs b/mumlib/src/state.rs index f90634e..51fb492 100644 --- a/mumlib/src/state.rs +++ b/mumlib/src/state.rs @@ -128,6 +128,13 @@ impl Channel { pub fn name(&self) -> &str { &self.name } + + pub fn path(&self, channels: &HashMap<u32, Channel>) -> String { + match &self.parent { + Some(t) => format!("{}/{}", channels.get(t).unwrap().path(channels), self.name), + None => self.name.clone(), + } + } } #[derive(Clone, Debug, Deserialize, Serialize)] |