the-distro/ofborg
2
0
Fork 1
Code Issues 1 Pull requests 1 Packages Projects Releases Wiki Activity

Merge pull request #69 from samueldr/feature/irc-notice

Browse source 
Adds a `message_type` field to `MessageFromIRC`.
This commit is contained in:
Graham Christensen 2018-02-09 19:08:43 -05:00 committed by GitHub
parent 29b5035fdf bb406624d8
commit d46e0b7b0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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)]
struct MessageToIRC {
target: String,
body: String
body: String,
#[serde(default = "default_irc_message_type")]
message_type: IRCMessageType
}
#[derive(Serialize, Deserialize, Debug)]
@ -40,6 +42,17 @@ struct MessageFromIRC {
body: String
}
#[derive(Serialize, Deserialize, Debug)]
#[serde(rename_all = "lowercase")]
enum IRCMessageType {
Privmsg,
Notice
}
fn default_irc_message_type() -> IRCMessageType {
IRCMessageType::Privmsg
}
fn main() {
if let Err(_) = env::var("RUST_LOG") {
env::set_var("RUST_LOG", "info");
@ -81,7 +94,14 @@ fn main() {
move |_channel: &mut Channel, _deliver: Deliver, _headers: BasicProperties, body: Vec<u8>| {
let msg: Result<MessageToIRC, serde_json::Error> = serde_json::from_slice(&body);
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());