elsanctum/tenquestionmarks
2
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity

prefer if let where possible, removes empty blocks and reduces nesting

Browse Source
This commit is contained in:
Adrian Malacoda 2017-05-17 21:23:00 -05:00
parent c69cc61114
commit 0b289b6956
1 changed files with 35 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
src/modules/autolink.rs
View File

@ -12,7 +12,7 @@ use stc::Link;
use stc::searchers::{Searcher, AggregateSearcher}; use stc::searchers::{Searcher, AggregateSearcher};
use stc::searchers::yugioh::{YugiohCard, YugiohSearcher}; use stc::searchers::yugioh::{YugiohCard, YugiohSearcher};
use stc::searchers::mtg::{MtgCard, MtgSearcher}; use stc::searchers::mtg::{MtgCard, MtgSearcher};
use stc::searchers::mediawiki::{WikiPage, MediawikiSearcher}; use stc::searchers::mediawiki::MediawikiSearcher;
use regex::Regex; use regex::Regex;
@ -30,67 +30,51 @@ impl AutolinkModule {
fn print_mtg_card (card: &MtgCard, message: &Message) { fn print_mtg_card (card: &MtgCard, message: &Message) {
message.reply(&format!("{}", card.image_url)); message.reply(&format!("{}", card.image_url));
message.reply(&format!("**{}** (**{}**)", card.name, card.cost));
if let Some(ref cost) = card.cost {
message.reply(&format!("**{}** (**{}**)", card.name, cost));
} else {
message.reply(&format!("**{}**", card.name));
}
message.reply(&format!("**{}**", card.typeline)); message.reply(&format!("**{}**", card.typeline));
message.reply(&format!("{}", card.rules)); message.reply(&format!("{}", card.rules));
match card.flavor { if let Some(ref flavor) = card.flavor {
Some(ref flavor) => message.reply(&format!("*{}*", flavor)), message.reply(&format!("*{}*", flavor));
None => {}
} }
// 12 March 2017: Is there a better way to do this? // 12 March 2017: Is there a better way to do this?
match card.power { if let Some(ref power) = card.power {
Some(ref power) => { if let Some(ref toughness) = card.toughness {
match card.toughness { message.reply(&format!("{}/{}", power, toughness));
Some(ref toughness) => {
message.reply(&format!("{}/{}", power, toughness));
},
None => {}
}
} }
None => {}
} }
} }
fn print_ygo_card (card: &YugiohCard, message: &Message) { fn print_ygo_card (card: &YugiohCard, message: &Message) {
match card.family { if let Some(ref family) = card.family {
Some(ref family) => { message.reply(&format!("**{}** ({})", card.name, family));
message.reply(&format!("**{}** ({})", card.name, family)); } else {
}, message.reply(&format!("**{}**", card.name));
None => {
message.reply(&format!("**{}**", card.name));
}
} }
match card.level { if let Some(ref level) = card.level {
Some(ref level) => { message.reply(&format!("**Level**: {}", level));
message.reply(&format!("**Level**: {}", level));
}
None => {}
} }
match card.subtype { if let Some(ref subtype) = card.subtype {
Some(ref subtype) => { message.reply(&format!("**{} - {}**", card.card_type, subtype));
message.reply(&format!("**{} - {}**", card.card_type, subtype)); } else {
} message.reply(&format!("**{}**", card.card_type));
None => {
message.reply(&format!("**{}**", card.card_type));
}
} }
message.reply(&format!("{}", card.text)); message.reply(&format!("{}", card.text));
match card.atk { if let Some(ref atk) = card.atk {
Some(ref atk) => { if let Some(ref def) = card.def {
match card.def { message.reply(&format!("{}/{}", atk, def));
Some(ref def) => {
message.reply(&format!("{}/{}", atk, def));
},
None => {}
}
} }
None => {}
} }
} }
@ -112,21 +96,18 @@ impl EventLoop for AutolinkModule {
loop { loop {
match receiver.recv() { match receiver.recv() {
Ok(envelope) => { Ok(envelope) => {
match envelope.event { if let Event::Message { ref message } = envelope.event {
Event::Message { ref message } => { debug!("Received message from module {:?}... {:?}", envelope.from, message.content);
debug!("Received message from module {:?}... {:?}", envelope.from, message.content); for cap in link_regex.captures_iter(&message.content) {
for cap in link_regex.captures_iter(&message.content) { if let Some(item) = searchers.exact_search(&cap[1]) {
if let Some(item) = searchers.exact_search(&cap[1]) { print_any_link(&item, message);
print_any_link(&item, message); if let Some(card) = item.downcast_ref::<MtgCard>() {
if let Some(card) = item.downcast_ref::<MtgCard>() { print_mtg_card(card, message);
print_mtg_card(card, message); } else if let Some(card) = item.downcast_ref::<YugiohCard>() {
} else if let Some(card) = item.downcast_ref::<YugiohCard>() { print_ygo_card(card, message);
print_ygo_card(card, message);
}
} }
} }
} }
_ => ()
} }
} }
Err(error) => { error!("Error {:?}", error) } Err(error) => { error!("Error {:?}", error) }