moparisthebest/sendxmpp-rs
1
0
Fork 0
Code Issues Pull Requests Releases 3 Wiki Activity

Allow optional nick in config file

Browse Source 
Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
This commit is contained in:
Maxime “pep” Buquet 2022-09-25 00:35:25 +02:00
parent 06ecb97f4c
commit 3b36852749
No known key found for this signature in database
GPG Key ID: DEDA74AEECA9D0F2
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sendxmpp.toml
View File

@ -1,4 +1,5 @@
# jid and password exactly like this, nothing else # jid and password exactly like this
jid = "jid@example.org" jid = "jid@example.org"
password = "sOmePa55W0rD" password = "sOmePa55W0rD"
# nick = "foobar" # optional nick for Multi-User Chat

12
src/main.rs
View File

@ -25,6 +25,7 @@ use anyhow::{anyhow, bail, Result};
struct Config { struct Config {
jid: String, jid: String,
password: String, password: String,
nick: Option<String>,
} }
fn parse_cfg<P: AsRef<Path>>(path: P) -> Result<Config> { fn parse_cfg<P: AsRef<Path>>(path: P) -> Result<Config> {
@ -169,11 +170,12 @@ async fn main() {
for recipient in recipients { for recipient in recipients {
if opts.muc { if opts.muc {
let nick = { let nick = opts
let opt = opts.nick.clone(); .nick
let node = BareJid::from_str(cfg.jid.as_str()).unwrap().node; .clone()
opt.or(node).die("couldn't find a nick to use") .or(cfg.nick.clone())
}; .or_else(|| BareJid::from_str(cfg.jid.as_str()).unwrap().node)
.die("couldn't find a nick to use");
let participant = match recipient.clone() { let participant = match recipient.clone() {
Jid::Full(_) => die!("Invalid room address"), Jid::Full(_) => die!("Invalid room address"),
Jid::Bare(bare) => bare.with_resource(nick.clone()), Jid::Bare(bare) => bare.with_resource(nick.clone()),