From 1974db9d719640f5cd5a8b51fa1b97f801f5a809 Mon Sep 17 00:00:00 2001 From: Eskil Queseth Date: Sat, 17 Oct 2020 01:19:45 +0200 Subject: change connecting with channel name instead of id --- mumd/src/state.rs | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) (limited to 'mumd') diff --git a/mumd/src/state.rs b/mumd/src/state.rs index 82d671e..d3f9a8e 100644 --- a/mumd/src/state.rs +++ b/mumd/src/state.rs @@ -53,18 +53,25 @@ impl State { command: Command, ) -> (bool, mumlib::error::Result>) { match command { - Command::ChannelJoin { channel_id } => { + Command::ChannelJoin { channel_identifier } => { if !matches!(*self.phase_receiver().borrow(), StatePhase::Connected) { return (false, Err(Error::DisconnectedError)); } - if let Some(server) = &self.server { - if !server.channels().contains_key(&channel_id) { - return (false, Err(Error::InvalidChannelIdError(channel_id))); - } - } + + let channels = self.server() + .unwrap() + .channels(); + let mut idents = channels.iter() + .map(|e| (e.0, e.1.path(channels))); + + let id = match idents.find(|e| e.1.ends_with(&channel_identifier)) { + Some(v) => *v.0, + None => return (false, Err(Error::InvalidChannelIdentifierError(channel_identifier))), + }; + let mut msg = msgs::UserState::new(); msg.set_session(self.session_id.unwrap()); - msg.set_channel_id(channel_id); + msg.set_channel_id(id); self.packet_sender.send(msg.into()).unwrap(); (false, Ok(None)) } @@ -73,7 +80,7 @@ impl State { return (false, Err(Error::DisconnectedError)); } (false, Ok(Some(CommandResponse::ChannelList { - channels: self.server.as_ref().unwrap().channels().clone(), + channels: self.server().unwrap().channels().clone(), })), ) } @@ -188,6 +195,9 @@ impl State { pub fn phase_receiver(&self) -> watch::Receiver { self.phase_watcher.1.clone() } + pub fn server(&self) -> Option<&Server> { + self.server.as_ref() + } pub fn server_mut(&mut self) -> Option<&mut Server> { self.server.as_mut() } -- cgit v1.2.1 From b1c1c227a0f5c171726f16f4f474536a718fd56f Mon Sep 17 00:00:00 2001 From: Eskil Queseth Date: Sat, 17 Oct 2020 01:37:53 +0200 Subject: add error checking if there are multiple valid channels to connect to --- mumd/src/state.rs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'mumd') diff --git a/mumd/src/state.rs b/mumd/src/state.rs index d3f9a8e..623cfba 100644 --- a/mumd/src/state.rs +++ b/mumd/src/state.rs @@ -9,7 +9,7 @@ use mumlib::command::{Command, CommandResponse}; use mumlib::state::Server; use std::net::ToSocketAddrs; use tokio::sync::{mpsc, watch}; -use mumlib::error::Error; +use mumlib::error::{Error, ChannelIdentifierError}; #[derive(Clone, Debug, Eq, PartialEq)] pub enum StatePhase { @@ -61,12 +61,15 @@ impl State { let channels = self.server() .unwrap() .channels(); - let mut idents = channels.iter() - .map(|e| (e.0, e.1.path(channels))); - let id = match idents.find(|e| e.1.ends_with(&channel_identifier)) { - Some(v) => *v.0, - None => return (false, Err(Error::InvalidChannelIdentifierError(channel_identifier))), + let matches = channels.iter() + .map(|e| (e.0, e.1.path(channels))) + .filter(|e| e.1.ends_with(&channel_identifier)) + .collect::>(); + let id = match matches.len() { + 0 => return (false, Err(Error::ChannelIdentifierError(channel_identifier, ChannelIdentifierError::Invalid))), + 1 => *matches.get(0).unwrap().0, + _ => return (false, Err(Error::ChannelIdentifierError(channel_identifier, ChannelIdentifierError::Ambiguous))), }; let mut msg = msgs::UserState::new(); -- cgit v1.2.1 From 74a64c249e0371890f4bb03ee8cd17b5059ddc4c Mon Sep 17 00:00:00 2001 From: Eskil Queseth Date: Sat, 17 Oct 2020 18:45:51 +0200 Subject: minor changes --- mumd/src/state.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mumd') diff --git a/mumd/src/state.rs b/mumd/src/state.rs index 623cfba..62ba865 100644 --- a/mumd/src/state.rs +++ b/mumd/src/state.rs @@ -9,7 +9,7 @@ use mumlib::command::{Command, CommandResponse}; use mumlib::state::Server; use std::net::ToSocketAddrs; use tokio::sync::{mpsc, watch}; -use mumlib::error::{Error, ChannelIdentifierError}; +use mumlib::error::{ChannelIdentifierError, Error}; #[derive(Clone, Debug, Eq, PartialEq)] pub enum StatePhase { -- cgit v1.2.1 From 39b13833187e4331fa32c1601f1bf1b1d6fa036a Mon Sep 17 00:00:00 2001 From: Eskil Queseth Date: Sat, 17 Oct 2020 21:12:31 +0200 Subject: add soft matching for channel joining --- mumd/src/state.rs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'mumd') diff --git a/mumd/src/state.rs b/mumd/src/state.rs index 62ba865..2c48955 100644 --- a/mumd/src/state.rs +++ b/mumd/src/state.rs @@ -67,7 +67,17 @@ impl State { .filter(|e| e.1.ends_with(&channel_identifier)) .collect::>(); let id = match matches.len() { - 0 => return (false, Err(Error::ChannelIdentifierError(channel_identifier, ChannelIdentifierError::Invalid))), + 0 => { + let soft_matches = channels.iter() + .map(|e| (e.0, e.1.path(channels).to_lowercase())) + .filter(|e| e.1.ends_with(&channel_identifier.to_lowercase())) + .collect::>(); + match soft_matches.len() { + 0 => return (false, Err(Error::ChannelIdentifierError(channel_identifier, ChannelIdentifierError::Invalid))), + 1 => *soft_matches.get(0).unwrap().0, + _ => return (false, Err(Error::ChannelIdentifierError(channel_identifier, ChannelIdentifierError::Invalid))), + } + }, 1 => *matches.get(0).unwrap().0, _ => return (false, Err(Error::ChannelIdentifierError(channel_identifier, ChannelIdentifierError::Ambiguous))), }; -- cgit v1.2.1