IRC: unify disconnect logic and return an error when server shuts down (

#105)
TicClick · Apr 9, 2024 · 82d68e6 · 82d68e6
1 parent 95ea9ce
commit 82d68e6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/src/core/irc/actor.rs b/src/core/irc/actor.rs
@@ -120,6 +120,7 @@ impl IRCActor {
                         .unwrap();
                     *irc_stream_sender.lock().unwrap() = Some(clt.sender());
 
+                    let mut disconnected_by_user = false;
                     let mut stream = clt.stream().unwrap();
                     loop {
                         let (lock, cv) = &*arc;
@@ -130,10 +131,7 @@ impl IRCActor {
                             if *g {
                                 *g = false;
                                 clt.send_quit("").unwrap();
-                                tx.blocking_send(AppMessageIn::ConnectionChanged(
-                                    ConnectionStatus::Disconnected { by_user: true },
-                                ))
-                                .unwrap();
+                                disconnected_by_user = true;
                                 break;
                             }
                         }
@@ -148,25 +146,28 @@ impl IRCActor {
                                         )),
                                     ))
                                     .unwrap();
-                                    tx.blocking_send(AppMessageIn::ConnectionChanged(
-                                        ConnectionStatus::Disconnected { by_user: false },
-                                    ))
-                                    .unwrap();
                                     break;
                                 }
                                 Ok(msg) => {
                                     event_handler::dispatch_message(&tx, msg, &own_username);
                                 }
                             },
                             None => {
-                                tx.blocking_send(AppMessageIn::ConnectionChanged(
-                                    ConnectionStatus::Disconnected { by_user: false },
-                                ))
+                                tx.blocking_send(AppMessageIn::ChatError(IRCError::FatalError(
+                                    "remote server has closed the connection, probably because it went offline".to_owned(),
+                                )))
                                 .unwrap();
                                 break;
                             }
                         }
                     }
+
+                    tx.blocking_send(AppMessageIn::ConnectionChanged(
+                        ConnectionStatus::Disconnected {
+                            by_user: disconnected_by_user,
+                        },
+                    ))
+                    .unwrap();
                 }
             }
         }));

diff --git a/src/gui/menu.rs b/src/gui/menu.rs
@@ -122,7 +122,7 @@ impl Menu {
                 ConnectionStatus::InProgress => ("connecting...".to_owned(), false),
                 ConnectionStatus::Scheduled(when) => {
                     let action = format!(
-                        "reconnecting ({}s)",
+                        "reconnect (or wait {}s)",
                         (when - chrono::Local::now()).num_seconds()
                     );
                     (action, true)