1
0
mirror of https://github.com/pcvolkmer/arsnova-client.git synced 2025-04-19 19:16:51 +00:00

feat: add rooms short id to RoomNotFoundError

This commit is contained in:
Paul-Christian Volkmer 2023-12-20 14:14:02 +01:00
parent c37a75cfcf
commit b116457796

View File

@ -182,7 +182,7 @@ pub enum FeedbackHandler {
pub enum ClientError { pub enum ClientError {
ConnectionError, ConnectionError,
LoginError, LoginError,
RoomNotFoundError, RoomNotFoundError(String),
ParserError(String), ParserError(String),
} }
@ -191,7 +191,7 @@ impl Display for ClientError {
match self { match self {
ConnectionError => write!(f, "Cannot connect"), ConnectionError => write!(f, "Cannot connect"),
LoginError => write!(f, "Cannot login"), LoginError => write!(f, "Cannot login"),
RoomNotFoundError => write!(f, "Requested room not found"), RoomNotFoundError(short_id) => write!(f, "Requested room '{}' not found", short_id),
ParserError(msg) => write!(f, "Cannot parse response: {}", msg), ParserError(msg) => write!(f, "Cannot parse response: {}", msg),
} }
} }
@ -258,7 +258,7 @@ impl Client {
.json::<MembershipResponse>() .json::<MembershipResponse>()
.await .await
.map_err(|err| ParserError(err.to_string()))?, .map_err(|err| ParserError(err.to_string()))?,
StatusCode::NOT_FOUND => return Err(RoomNotFoundError), StatusCode::NOT_FOUND => return Err(RoomNotFoundError(short_id.into())),
_ => return Err(ConnectionError), _ => return Err(ConnectionError),
}, },
Err(_) => { Err(_) => {
@ -290,7 +290,7 @@ impl Client {
.await .await
.map_err(|err| ParserError(err.to_string()))?, .map_err(|err| ParserError(err.to_string()))?,
)), )),
StatusCode::NOT_FOUND => Err(RoomNotFoundError), StatusCode::NOT_FOUND => Err(RoomNotFoundError(short_id.into())),
_ => Err(ConnectionError), _ => Err(ConnectionError),
}, },
Err(_) => Err(ConnectionError), Err(_) => Err(ConnectionError),