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

Changes message_type to an Enum.

Browse source
This commit is contained in:
Samuel Dionne-Riel 2018-02-09 12:58:03 -05:00
parent 23081ad5d5
commit bb406624d8
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -32,7 +32,7 @@ struct MessageToIRC {
target: String, target: String,
body: String, body: String,
#[serde(default = "default_irc_message_type")] #[serde(default = "default_irc_message_type")]
message_type: String message_type: IRCMessageType
} }
#[derive(Serialize, Deserialize, Debug)] #[derive(Serialize, Deserialize, Debug)]
@ -42,8 +42,15 @@ struct MessageFromIRC {
body: String body: String
} }
fn default_irc_message_type() -> String { #[derive(Serialize, Deserialize, Debug)]
"privmsg".to_string() #[serde(rename_all = "lowercase")]
enum IRCMessageType {
Privmsg,
Notice
}
fn default_irc_message_type() -> IRCMessageType {
IRCMessageType::Privmsg
} }
fn main() { fn main() {
@ -87,11 +94,13 @@ 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 {
if &msg.message_type == "notice" { match msg.message_type {
server.send_notice(&msg.target, &msg.body).unwrap(); IRCMessageType::Notice => {
} server.send_notice(&msg.target, &msg.body).unwrap();
else { }
server.send_privmsg(&msg.target, &msg.body).unwrap(); IRCMessageType::Privmsg => {
server.send_privmsg(&msg.target, &msg.body).unwrap();
}
} }
} }
}, },