Add --autojoin option to select whether to autojoin channels and queries

Author: noctux

Cargo.toml

@@ -30,7 +30,7 @@ matrix-sdk = { version = "0.8", features = ["anyhow", "sso-login"] }
 percent-encoding = "2.3.1"
 rand_core = { version = "0.6", features = ["getrandom"] }
 regex = "1.8"
-serde = "1.0"
+serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 tokio = { version = "1.0.0", features = ["full"] }
 tokio-util = { version = "0.7", features = ["codec"] }

src/args.rs

@@ -1,7 +1,26 @@
 use clap::Parser;
 use lazy_static::lazy_static;
+use serde::Deserialize;
 use std::net::SocketAddr;
 
+#[derive(clap::ValueEnum, Clone, Debug, PartialEq, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub enum AutoJoinOptions {
+    None,
+    Queries,
+    Channels,
+    All,
+}
+
+impl AutoJoinOptions {
+    pub fn join_queries(&self) -> bool {
+        [AutoJoinOptions::Queries, AutoJoinOptions::All].contains(self)
+    }
+    pub fn join_channels(&self) -> bool {
+        [AutoJoinOptions::Channels, AutoJoinOptions::All].contains(self)
+    }
+}
+
 #[derive(Parser, Debug)]
 #[command(author, version, about, long_about = None)]
 pub struct Args {
@@ -19,6 +38,9 @@ pub struct Args {
 
     #[arg(long, default_value = None)]
     pub media_url: Option<String>,
+
+    #[arg(long, value_enum, default_value_t = AutoJoinOptions::None)]
+    pub autojoin: AutoJoinOptions,
 }
 
 pub fn args() -> &'static Args {

src/ircd/proto.rs

@@ -10,6 +10,8 @@ use tokio::net::TcpStream;
 use tokio::sync::mpsc;
 use tokio_util::codec::Framed;
 
+use crate::args::{args, AutoJoinOptions};
+use crate::matrix::room_mappings::RoomTargetType;
 use crate::{matrirc::Matrirc, matrix::MatrixMessageType};
 
 /// it's a bit of a pain to redo the work twice for notice/privmsg,
@@ -163,6 +165,10 @@ 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();
@@ -178,7 +184,20 @@ pub async fn join_channels(matrirc: &Matrirc) -> Result<()> {
             continue;
         }
         let roomtarget = mapping.try_room_target(&joined).await?;
-        roomtarget.join_chan(irc).await;
+        let chantype = roomtarget.target_type().await;
+        if [RoomTargetType::Chan, RoomTargetType::LeftChan].contains(&chantype)
+            && 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;
+        }
     }
     Ok(())
 }