danderson/ofborg
0
0
Fork 0
forked from the-distro/ofborg
Code Pull requests Activity

Merge remote-tracking branch 'origin/released' into next

Browse source
This commit is contained in:
Graham Christensen 2018-02-09 19:11:02 -05:00
parent c5fef482ec d46e0b7b0f
commit 666596b251
No known key found for this signature in database
GPG key ID: ACA1C1D120C83D5C
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ircbot/src/bin/gateway.rs
View file

@ -30,7 +30,9 @@ use std::env;
#[derive(Serialize, Deserialize, Debug)] #[derive(Serialize, Deserialize, Debug)]
struct MessageToIRC { struct MessageToIRC {
target: String, target: String,
body: String body: String,
#[serde(default = "default_irc_message_type")]
message_type: IRCMessageType
} }
#[derive(Serialize, Deserialize, Debug)] #[derive(Serialize, Deserialize, Debug)]
@ -40,6 +42,17 @@ struct MessageFromIRC {
body: String body: String
} }
#[derive(Serialize, Deserialize, Debug)]
#[serde(rename_all = "lowercase")]
enum IRCMessageType {
Privmsg,
Notice
}
fn default_irc_message_type() -> IRCMessageType {
IRCMessageType::Privmsg
}
fn main() { fn main() {
if let Err(_) = env::var("RUST_LOG") { if let Err(_) = env::var("RUST_LOG") {
env::set_var("RUST_LOG", "info"); env::set_var("RUST_LOG", "info");
@ -81,7 +94,14 @@ fn main() {
move |_channel: &mut Channel, _deliver: Deliver, _headers: BasicProperties, body: Vec<u8>| { move |_channel: &mut Channel, _deliver: Deliver, _headers: BasicProperties, body: Vec<u8>| {
let msg: Result<MessageToIRC, serde_json::Error> = serde_json::from_slice(&body); let msg: Result<MessageToIRC, serde_json::Error> = serde_json::from_slice(&body);
if let Ok(msg) = msg { if let Ok(msg) = msg {
server.send_privmsg(&msg.target, &msg.body).unwrap(); match msg.message_type {
IRCMessageType::Notice => {
server.send_notice(&msg.target, &msg.body).unwrap();
}
IRCMessageType::Privmsg => {
server.send_privmsg(&msg.target, &msg.body).unwrap();
}
}
} }
}, },
"queue-publish", "", false, true, false, false, Table::new()); "queue-publish", "", false, true, false, false, Table::new());