Compare commits

..

No commits in common. "538de5e849e0f89b7b853eb36401a0b99cbc7703" and "cb5651c528f24b2ea33367f5a1adf5d38c5c1428" have entirely different histories.

1 changed files with 15 additions and 23 deletions

View File

@ -893,15 +893,10 @@ async fn handle_join(
) -> Result<()> { ) -> Result<()> {
match chan { match chan {
Chan::Global(chan_name) => { Chan::Global(chan_name) => {
let room_id = RoomId::from(chan_name.clone())?; let room_id = RoomId::try_from(chan_name.clone())?;
match user_handle.join_room(room_id).await? { if let JoinResult::Success(room_info) = user_handle.join_room(room_id).await? {
JoinResult::Success(room_info) => {
produce_on_join_cmd_messages(&config, &user, chan, &room_info, writer).await?; produce_on_join_cmd_messages(&config, &user, chan, &room_info, writer).await?;
} } else {
JoinResult::AlreadyJoined => {
// we do nothing on repeated joins
}
JoinResult::Banned => {
ServerMessage { ServerMessage {
tags: vec![], tags: vec![],
sender: Some(config.server_name.clone()), sender: Some(config.server_name.clone()),
@ -914,12 +909,9 @@ async fn handle_join(
.write_async(writer) .write_async(writer)
.await?; .await?;
} }
}
writer.flush().await?; writer.flush().await?;
} }
Chan::Local(_) => { Chan::Local(_) => {}
// TODO handle join attempts to local chans with an error, we don't support these
}
}; };
Ok(()) Ok(())
} }