DGNum/rust-irc
6
0
Fork 0
Code Issues 1 Pull requests 3 Projects Releases Packages Wiki Activity Actions

Implemented channel keys for autojoined channels (fixes #51).

Browse source
This commit is contained in:
Aaron Weiss 2016-07-05 16:21:21 -04:00
parent ee7f963893
commit 5b8f320050
No known key found for this signature in database
GPG key ID: 0237035D9BF03AE2
3 changed files with 39 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/client/data/config.rs
View file

@ -36,6 +36,8 @@ pub struct Config {
pub encoding: Option<String>,
/// A list of channels to join on connection.
pub channels: Option<Vec<String>>,
/// A mapping of channel names to keys for join-on-connect.
pub channel_keys: Option<HashMap<String, String>>,
/// User modes to set on connect. Example: "+RB-x"
pub umodes: Option<String>,
/// The text that'll be sent in response to CTCP USERINFO requests.
@ -149,6 +151,12 @@ impl Config {
self.channels.as_ref().map_or(vec![], |v| v.iter().map(|s| &s[..]).collect())
}
/// Gets the key for the specified channel if it exists in the configuration.
pub fn channel_key(&self, chan: &str) -> Option<&str> {
self.channel_keys.as_ref().and_then(|m| m.get(&chan.to_owned()).map(|s| &s[..]))
}
/// Gets the user modes to set on connect specified in the configuration.
/// This defaults to an empty string when not specified.
pub fn umodes(&self) -> &str {
@ -217,6 +225,7 @@ mod test {
use_ssl: Some(false),
encoding: Some(format!("UTF-8")),
channels: Some(vec![format!("#test"), format!("#test2")]),
channel_keys: None,
user_info: None,
ping_time: None,
ping_timeout: None,
@ -243,6 +252,7 @@ mod test {
use_ssl: Some(false),
encoding: Some(format!("UTF-8")),
channels: Some(vec![format!("#test"), format!("#test2")]),
channel_keys: None,
user_info: None,
ping_time: None,
ping_timeout: None,