diff --git a/src/modules/autolink.rs b/src/modules/autolink.rs index 40abf96..8ee7c67 100644 --- a/src/modules/autolink.rs +++ b/src/modules/autolink.rs @@ -17,14 +17,34 @@ use stc::searchers::mediawiki::MediawikiSearcher; use regex::Regex; use std::collections::BTreeMap; -pub struct AutolinkModule {} +pub struct AutolinkModule { + searcher_config: Table +} impl AutolinkModule { - pub fn new (_: &Table, _: &Table) -> Box { - Box::new(AutolinkModule {}) + pub fn new (_: &Table, configuration: &Table) -> Box { + let searcher_config = configuration.get("searchers").expect("No configuration for searcher found") + .as_table().expect("Searcher config must be a table"); + + Box::new(AutolinkModule { + searcher_config: searcher_config.clone() + }) } } +fn create_searcher (configuration: &Table) -> AggregateSearcher { + let mut searchers = AggregateSearcher::new(); + searchers.add_searcher("mtg", Box::new(MtgSearcher::new())); + searchers.add_searcher("ygo", Box::new(YugiohSearcher::new())); + searchers.add_searcher("ygp", Box::new(MediawikiSearcher::new(String::from("https://yugipedia.com/wiki/")))); + searchers.add_searcher("pk", Box::new(MediawikiSearcher::new(String::from("https://bulbapedia.bulbagarden.net/wiki/")))); + searchers.add_searcher("gp", Box::new(MediawikiSearcher::new(String::from("https://gammapedia.monarch-pass.net/wiki/")))); + searchers.add_searcher("ip", Box::new(MediawikiSearcher::new(String::from("http://infinitypedia.org/wiki/")))); + searchers.add_searcher("gcl", Box::new(MediawikiSearcher::new(String::from("https://glitchcity.info/wiki/")))); + searchers.add_searcher("wp", Box::new(MediawikiSearcher::new(String::from("https://en.wikipedia.org/wiki/")))); + searchers +} + fn print_mtg_card (card: &MtgCard, message: &Message) { if let Some(ref image_uris) = card.image_uris { if let Some(ref image_uri) = image_uris.get("normal") { @@ -86,16 +106,7 @@ fn print_any_link (link: &Link, message: &Message) { impl EventLoop for AutolinkModule { fn run (&self, _: Box>, receiver: Receiver>) { let link_regex = Regex::new(r"\[\[([^\[\]]*)\]\]").expect("Invalid regex..."); - let mut searchers = AggregateSearcher::new(); - searchers.add_searcher("mtg", Box::new(MtgSearcher::new())); - searchers.add_searcher("ygo", Box::new(YugiohSearcher::new())); - searchers.add_searcher("ygp", Box::new(MediawikiSearcher::new(String::from("https://yugipedia.com/wiki/")))); - searchers.add_searcher("pk", Box::new(MediawikiSearcher::new(String::from("https://bulbapedia.bulbagarden.net/wiki/")))); - searchers.add_searcher("gp", Box::new(MediawikiSearcher::new(String::from("https://gammapedia.monarch-pass.net/wiki/")))); - searchers.add_searcher("ip", Box::new(MediawikiSearcher::new(String::from("http://infinitypedia.org/wiki/")))); - searchers.add_searcher("gcl", Box::new(MediawikiSearcher::new(String::from("https://glitchcity.info/wiki/")))); - searchers.add_searcher("wp", Box::new(MediawikiSearcher::new(String::from("https://en.wikipedia.org/wiki/")))); - + let searcher = create_searcher(&self.searcher_config); let mut searcher_cache = BTreeMap::new(); loop { @@ -105,7 +116,7 @@ impl EventLoop for AutolinkModule { debug!("Received message from module {:?}... {:?}", envelope.from, message.content); for cap in link_regex.captures_iter(&message.content) { let term = cap[1].to_owned(); - if let &mut Some(ref mut item) = searcher_cache.entry(term.to_owned()).or_insert_with(|| searchers.exact_search(&term)) { + if let &mut Some(ref mut item) = searcher_cache.entry(term.to_owned()).or_insert_with(|| searcher.exact_search(&term)) { print_any_link(item, message); if let Some(card) = item.downcast_ref::() { print_mtg_card(card, message);