Add error to disconnected message

data/src/history/manager.rs

@@ -272,7 +272,9 @@ impl Manager {
  .cloned();
 
  let messages = match broadcast {
- Broadcast::Disconnected => message::broadcast::disconnected(channels, queries),
+ Broadcast::Disconnected { error } => {
+ message::broadcast::disconnected(channels, queries, error)
+ }
  Broadcast::Reconnected => message::broadcast::reconnected(channels, queries),
  Broadcast::Quit {
  user,
@@ -472,7 +474,9 @@ impl Data {
 
 #[derive(Debug, Clone)]
 pub enum Broadcast {
- Disconnected,
+ Disconnected {
+ error: Option<String>,
+ },
  Reconnected,
  Quit {
  user: User,

data/src/message.rs

@@ -421,8 +421,10 @@ pub(crate) mod broadcast {
  pub fn disconnected(
  channels: impl IntoIterator<Item = String>,
  queries: impl IntoIterator<Item = Nick>,
+ error: Option<String>,
  ) -> Vec<Message> {
- let text = " ∙ connection to server lost".into();
+ let error = error.map(|error| format!(" ({error})")).unwrap_or_default();
+ let text = format!(" ∙ connection to server lost{error}");
  expand(channels, queries, true, text)
  }
 

data/src/stream.rs

@@ -27,6 +27,7 @@ pub enum Update {
  Disconnected {
  server: Server,
  is_initial: bool,
+ error: Option<String>,
  },
  MessagesReceived(Server, Vec<message::Encoded>),
 }
@@ -58,6 +59,7 @@ pub async fn run(server: server::Entry, mut sender: mpsc::Sender<Update>) -> Nev
  .send(Update::Disconnected {
  server: server.clone(),
  is_initial,
+ error: None,
  })
  .await;
 
@@ -114,6 +116,7 @@ pub async fn run(server: server::Entry, mut sender: mpsc::Sender<Update>) -> Nev
  .send(Update::Disconnected {
  server: server.clone(),
  is_initial,
+ error: Some(e.to_string()),
  })
  .await;
  state = State::Disconnected {

src/main.rs

@@ -282,15 +282,19 @@ impl Application for Halloy {
  Command::none()
  }
  Message::Stream(update) => match update {
- stream::Update::Disconnected { server, is_initial } => {
+ stream::Update::Disconnected {
+ server,
+ is_initial,
+ error,
+ } => {
  self.clients.disconnected(server.clone());
 
  if !is_initial {
  let Screen::Dashboard(dashboard) = &mut self.screen else {
  return Command::none()
  };
 
- dashboard.broadcast_disconnected(&server);
+ dashboard.broadcast_disconnected(&server, error);
  }
 
  Command::none()

src/screen/dashboard.rs

@@ -534,8 +534,9 @@ impl Dashboard {
  );
  }
 
- pub fn broadcast_disconnected(&mut self, server: &Server) {
- self.history.broadcast(server, Broadcast::Disconnected);
+ pub fn broadcast_disconnected(&mut self, server: &Server, error: Option<String>) {
+ self.history
+ .broadcast(server, Broadcast::Disconnected { error });
  }
 
  pub fn broadcast_reconnected(&mut self, server: &Server) {