Merge pull request #58 from tinaun/playground

Small fixes

Author: technetos

Cargo.lock

@@ -18,3 +18,4 @@ lazy_static = "1.4.0"
 log = "0.4.0"
 env_logger = "0.7.1"
 envy = "0.4"
+indexmap = "1.3"

Cargo.toml

@@ -2,6 +2,7 @@ use crate::{
     api,
     state_machine::{CharacterSet, StateMachine},
 };
+use indexmap::IndexMap;
 use reqwest::blocking::Client as HttpClient;
 use serenity::{model::channel::Message, prelude::Context};
 use std::{collections::HashMap, sync::Arc};
@@ -35,15 +36,15 @@ pub struct Args<'m> {
 pub(crate) struct Commands {
     state_machine: StateMachine<Arc<Command>>,
     client: HttpClient,
-    menu: Option<HashMap<&'static str, (&'static str, GuardFn)>>,
+    menu: Option<IndexMap<&'static str, (&'static str, GuardFn)>>,
 }
 
 impl Commands {
     pub(crate) fn new() -> Self {
         Self {
             state_machine: StateMachine::new(),
             client: HttpClient::new(),
-            menu: Some(HashMap::new()),
+            menu: Some(IndexMap::new()),
         }
     }
 
@@ -168,7 +169,7 @@ impl Commands {
         );
     }
 
-    pub(crate) fn menu(&mut self) -> Option<HashMap<&'static str, (&'static str, GuardFn)>> {
+    pub(crate) fn menu(&mut self) -> Option<IndexMap<&'static str, (&'static str, GuardFn)>> {
         self.menu.take()
     }
 

src/commands.rs

@@ -80,23 +80,31 @@ fn rustc_crate(crate_name: &str) -> Option<&str> {
 }
 
 pub fn doc_search(args: Args) -> Result<()> {
-    let crate_name = args
+    let query = args
         .params
         .get("query")
         .ok_or("Unable to retrieve param: query")?;
 
-    if crate_name.contains("::") {
-        let message = "`?docs` cannot retrieve documentation for items within a crate.";
-        api::send_reply(&args, message)?;
-    } else if let Some(rustc_crate) = rustc_crate(crate_name) {
-        api::send_reply(&args, rustc_crate)?;
+    let mut query_iter = query.splitn(2, "::");
+    let crate_name = query_iter.next().unwrap();
+
+    let doc_url = if let Some(rustc_crate) = rustc_crate(crate_name) {
+        Some(rustc_crate.to_string())
     } else if let Some(krate) = get_crate(&args)? {
         let name = krate.name;
-        let message = krate
+        krate
             .documentation
-            .unwrap_or_else(|| format!("https://docs.rs/{}", name));
+            .or_else(|| Some(format!("https://docs.rs/{}", name)))
+    } else {
+        None
+    };
+
+    if let Some(mut url) = doc_url {
+        if let Some(item_path) = query_iter.next() {
+            url += &format!("?search={}", item_path);
+        }
 
-        api::send_reply(&args, &message)?;
+        api::send_reply(&args, &url)?;
     } else {
         let message = "No crates found.";
         api::send_reply(&args, message)?;

src/crates.rs

@@ -23,9 +23,9 @@ use crate::db::DB;
 use commands::{Args, Commands, GuardFn, Result};
 use diesel::prelude::*;
 use envy;
+use indexmap::IndexMap;
 use serde::Deserialize;
 use serenity::{model::prelude::*, prelude::*};
-use std::collections::HashMap;
 
 #[derive(Deserialize)]
 struct Config {
@@ -196,7 +196,7 @@ fn app() -> Result<()> {
     Ok(())
 }
 
-fn main_menu(args: &Args, commands: &HashMap<&str, (&str, GuardFn)>) -> String {
+fn main_menu(args: &Args, commands: &IndexMap<&str, (&str, GuardFn)>) -> String {
     let mut menu = format!("Commands:\n");
 
     menu = commands