Option: Add query-users to matirc channel

Author: noctux

src/ircd/login.rs

@@ -1,5 +1,6 @@
 use anyhow::{Context, Error, Result};
 use irc::{client::prelude::Command, proto::IrcCodec};
+use crate::ircd::proto::{join, raw_msg};
 use log::{debug, info, trace, warn};
 use tokio::net::TcpStream;
 use tokio::sync::oneshot;
@@ -53,6 +54,22 @@ pub async fn auth_loop(
         )))
         .await?;
     info!("Processing login from {}!{}", nick, user);
+    // Promote matric to chan
+    let matrircchan = "matrirc".to_string();
+    stream
+        .send(join(
+            Some(format!("{}!{}@matrirc", nick, user)),
+            "matrirc".to_string(),
+        ))
+        .await?;
+    stream
+        .send(join(
+            Some(format!("{}!{}@matrirc", nick, user)),
+            "matrirc".to_string(),
+        ))
+        .await?;
+    stream.send(raw_msg(format!(":matrirc 353 {} = {} :@matrirc", nick, matrircchan))).await?;
+    stream.send(raw_msg(format!(":matrirc 366 {} {} :End", nick, matrircchan))).await?;
     let client = match state::login(&nick, &pass)? {
         Some(session) => matrix_restore_session(stream, &nick, &pass, session).await?,
         None => matrix_login_loop(stream, &nick, &pass).await?,

src/ircd/proto.rs

@@ -165,10 +165,6 @@ pub async fn ircd_sync_write(
 }
 
 pub async fn join_channels(matrirc: &Matrirc) -> Result<()> {
-    if args().autojoin == AutoJoinOptions::None {
-        return Ok(());
-    }
-
     let irc = matrirc.irc();
     let matrix = matrirc.matrix();
     let mapping = matrirc.mappings();
@@ -189,14 +185,18 @@ pub async fn join_channels(matrirc: &Matrirc) -> Result<()> {
             && args().autojoin.join_channels()
         {
             roomtarget.join_chan(irc).await;
-        } else if chantype == RoomTargetType::Query && args().autojoin.join_queries() {
-            let _ = irc
-                .send(privmsg(
-                    roomtarget.target().await,
-                    &irc.nick,
-                    "* <Resumed connection to matrirc>",
-                ))
-                .await;
+        } else if chantype == RoomTargetType::Query {
+            let name = roomtarget.target().await;
+            let _ = irc.send(join(Some(format!("{}!{}@matrirc", name, name)), "matrirc".to_string())).await?;
+            if args().autojoin.join_queries() {
+                let _ = irc
+                    .send(privmsg(
+                            name,
+                            &irc.nick,
+                            "* <Resumed connection to matrirc>",
+                    ))
+                    .await;
+            }
         }
     }
     Ok(())