diff --git a/Cargo.lock b/Cargo.lock index f36d014..73f11ef 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6,20 +6,9 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "aho-corasick" -version = "0.7.6" +name = "anyhow" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "arrayvec" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", -] [[package]] name = "autocfg" @@ -33,7 +22,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -42,8 +31,8 @@ name = "backtrace-sys" version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -54,6 +43,11 @@ dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "base64" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "bitflags" version = "1.2.1" @@ -64,7 +58,7 @@ name = "block-buffer" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "block-padding 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -72,7 +66,7 @@ dependencies = [ [[package]] name = "block-padding" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -103,9 +97,17 @@ dependencies = [ "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "c2-chacha" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "cc" -version = "1.0.46" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -115,13 +117,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "chrono" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -140,7 +141,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -161,9 +162,9 @@ dependencies = [ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "publicsuffix 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", + "publicsuffix 1.5.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", "try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -179,23 +180,23 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "crossbeam-epoch" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -216,6 +217,16 @@ dependencies = [ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "crossbeam-utils" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "ct-logs" version = "0.6.0" @@ -260,7 +271,6 @@ name = "error-chain" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)", "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -280,8 +290,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "synstructure 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", + "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -291,13 +301,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "flate2" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "miniz_oxide 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -335,7 +345,7 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -346,6 +356,16 @@ dependencies = [ "typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "getrandom" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "h2" version = "0.1.26" @@ -355,7 +375,7 @@ dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "http 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)", + "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -368,12 +388,20 @@ name = "heck" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "hermit-abi" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "http" -version = "0.1.19" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", @@ -388,7 +416,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "http 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)", + "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -406,7 +434,7 @@ dependencies = [ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", - "http 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)", + "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", "http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -417,12 +445,12 @@ dependencies = [ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-reactor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-threadpool 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-threadpool 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-timer 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -449,7 +477,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-normalization 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -459,7 +487,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-normalization 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -483,7 +511,7 @@ name = "iovec" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -493,10 +521,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "js-sys" -version = "0.3.29" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "wasm-bindgen 0.2.52 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -515,7 +543,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "libc" -version = "0.2.65" +version = "0.2.66" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -525,7 +553,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "lock_api" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -544,6 +572,11 @@ name = "matches" version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "maybe-uninit" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "memchr" version = "2.2.1" @@ -551,7 +584,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "memoffset" -version = "0.5.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -568,12 +601,12 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "mime 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", - "unicase 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "miniz_oxide" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -581,14 +614,15 @@ dependencies = [ [[package]] name = "mio" -version = "0.6.19" +version = "0.6.21" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", @@ -613,15 +647,10 @@ version = "0.2.33" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "nodrop" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "nom" version = "4.2.3" @@ -637,12 +666,12 @@ version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "num-traits" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -650,10 +679,11 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.10.1" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -666,7 +696,7 @@ name = "parking_lot" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "lock_api 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -678,10 +708,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -695,6 +725,11 @@ name = "percent-encoding" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "ppv-lite86" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "proc-macro2" version = "1.0.6" @@ -705,7 +740,7 @@ dependencies = [ [[package]] name = "publicsuffix" -version = "1.5.3" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -729,7 +764,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -741,6 +776,18 @@ dependencies = [ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "rand" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "rand_chacha" version = "0.1.1" @@ -750,6 +797,15 @@ dependencies = [ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "rand_chacha" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "rand_core" version = "0.3.1" @@ -763,6 +819,14 @@ name = "rand_core" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "rand_hc" version = "0.1.0" @@ -771,6 +835,14 @@ dependencies = [ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "rand_isaac" version = "0.1.1" @@ -784,7 +856,7 @@ name = "rand_jitter" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -796,7 +868,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -837,10 +909,7 @@ name = "regex" version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", - "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -858,25 +927,25 @@ dependencies = [ "cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "cookie_store 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "encoding_rs 0.8.20 (registry+https://github.com/rust-lang/crates.io-index)", - "flate2 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)", + "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "http 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)", + "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)", "hyper-rustls 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "mime_guess 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustls 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", "serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-rustls 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-threadpool 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-threadpool 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-timer 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "webpki-roots 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -888,12 +957,12 @@ name = "ring" version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "web-sys 0.3.29 (registry+https://github.com/rust-lang/crates.io-index)", + "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -903,7 +972,7 @@ version = "2.0.0-rc3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", "serde_yaml 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -966,30 +1035,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde" -version = "1.0.101" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "serde_derive" -version = "1.0.101" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "serde_json" -version = "1.0.41" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -999,7 +1068,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1010,28 +1079,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "serenity" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", + "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", "command_attr 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "flate2 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)", + "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest 0.9.22 (registry+https://github.com/rust-lang/crates.io-index)", "rustls 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", "threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "tungstenite 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "tungstenite 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", "typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "uwl 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1057,7 +1126,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "smallvec" -version = "0.6.10" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "smallvec" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1070,6 +1147,11 @@ name = "spin" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "string" version = "0.2.1" @@ -1080,7 +1162,7 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.5" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1090,29 +1172,21 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "thread_local" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "threadpool" version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1120,7 +1194,7 @@ name = "time" version = "0.1.42" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1132,15 +1206,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-reactor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-threadpool 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-threadpool 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-timer 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1159,12 +1233,12 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "tokio-executor" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1183,18 +1257,18 @@ dependencies = [ [[package]] name = "tokio-reactor" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-sync 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1229,36 +1303,36 @@ dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", + "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-reactor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "tokio-threadpool" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "tokio-timer" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1281,17 +1355,17 @@ dependencies = [ [[package]] name = "tungstenite" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "http 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)", + "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "input_buffer 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "utf-8 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1312,10 +1386,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "unicase" -version = "2.5.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1328,15 +1402,15 @@ dependencies = [ [[package]] name = "unicode-normalization" -version = "0.1.8" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "unicode-segmentation" -version = "1.3.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1400,6 +1474,11 @@ name = "version_check" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "version_check" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "want" version = "0.2.0" @@ -1410,18 +1489,23 @@ dependencies = [ "try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "wasi" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "wasm-bindgen" -version = "0.2.52" +version = "0.2.55" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "wasm-bindgen-macro 0.2.52 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen-macro 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.52" +version = "0.2.55" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1429,61 +1513,61 @@ dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "wasm-bindgen-shared 0.2.52 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen-shared 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.52" +version = "0.2.55" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "wasm-bindgen-macro-support 0.2.52 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen-macro-support 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.52" +version = "0.2.55" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "wasm-bindgen-backend 0.2.52 (registry+https://github.com/rust-lang/crates.io-index)", - "wasm-bindgen-shared 0.2.52 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen-backend 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen-shared 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.52" +version = "0.2.55" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "wasm-bindgen-webidl" -version = "0.2.52" +version = "0.2.55" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "wasm-bindgen-backend 0.2.52 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen-backend 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", "weedle 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "web-sys" -version = "0.3.29" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "js-sys 0.3.29 (registry+https://github.com/rust-lang/crates.io-index)", + "anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", + "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)", "sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "wasm-bindgen 0.2.52 (registry+https://github.com/rust-lang/crates.io-index)", - "wasm-bindgen-webidl 0.2.52 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen-webidl 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1569,47 +1653,51 @@ dependencies = [ name = "youmubot" version = "0.1.0" dependencies = [ - "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", + "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", "dotenv 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustbreak 2.0.0-rc3 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serenity 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", + "serenity 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", + "static_assertions 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "youmubot-osu" version = "0.1.0" dependencies = [ - "serenity 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serenity 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [metadata] "checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" -"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" -"checksum arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" +"checksum anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "9267dff192e68f3399525901e709a48c1d3982c9c072fa32f2127a0cb0babf14" "checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" "checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea" "checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" "checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" +"checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" "checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" "checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -"checksum block-padding 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6d4dc3af3ee2e12f3e5d224e5e1e3d73668abbeb69e566d361f7d5563a4fdf09" +"checksum block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" "checksum bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad807f2fc2bf185eeb98ff3a901bd46dc5ad58163d0fa4577ba0d25674d71708" "checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" "checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" "checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" -"checksum cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)" = "0213d356d3c4ea2c18c40b037c3be23cd639825c18f25ee670ac7813beeef99c" +"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" +"checksum cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)" = "f52a465a666ca3d838ebbf08b241383421412fe7ebb463527bba275526d89f76" "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" -"checksum chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e8493056968583b0193c1bb04d6f7684586f3726992d6c573261941a895dbd68" +"checksum chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "31850b4a4d6bae316f7a09e691c944c28299298837edc0a03f755618c23cbc01" "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" "checksum command_attr 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "5e331e10b98950feec95fd4e44c0dd240ddb91097d0cc0bd4d128502cd2d6d5d" "checksum cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "888604f00b3db336d2af898ec3c1d5d0ddf5e6d462220f2ededc33a87ac4bbd5" "checksum cookie_store 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46750b3f362965f197996c4448e4a0935e791bf7d6631bfce9ee0af3d24c919c" "checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" -"checksum crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71" -"checksum crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9" +"checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca" +"checksum crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac" "checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" "checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" +"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4" "checksum ct-logs 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4d3686f5fa27dbc1d76c751300376e167c5a43387f44bb451fd1c24776e49113" "checksum digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" "checksum dotenv 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" @@ -1620,7 +1708,7 @@ dependencies = [ "checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9" "checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08" "checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" -"checksum flate2 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)" = "ad3c5233c9a940c8719031b423d7e6c16af66e031cb0420b0896f5245bf181d3" +"checksum flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f" "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" "checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" @@ -1628,9 +1716,11 @@ dependencies = [ "checksum futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)" = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef" "checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" "checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" +"checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407" "checksum h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462" "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" -"checksum http 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)" = "d7e06e336150b178206af098a055e3621e8336027e2b4d126bda0bc64824baaf" +"checksum hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120" +"checksum http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0" "checksum http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d" "checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" "checksum hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)" = "9dbe6ed1438e1f8ad955a4701e9a944938e9519f6888d12d8558b645e247d5f6" @@ -1641,40 +1731,45 @@ dependencies = [ "checksum input_buffer 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8e1b822cc844905551931d6f81608ed5f50a79c1078a4e2b4d42dbc7c1eedfbf" "checksum iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" "checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" -"checksum js-sys 0.3.29 (registry+https://github.com/rust-lang/crates.io-index)" = "5061eb59a5afd4f6ff96dc565963e4e2737b915d070233cb26b88e3f58af41b4" +"checksum js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)" = "1c840fdb2167497b0bd0db43d6dfe61e91637fa72f9d061f8bd17ddc44ba6414" "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -"checksum libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8" +"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" "checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83" -"checksum lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8912e782533a93a167888781b836336a6ca5da6175c05944c86cf28c31104dc" +"checksum lock_api 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e57b3997725d2b60dbec1297f6c2e2957cc383db1cebd6be812163f969c7d586" "checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" +"checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" "checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" -"checksum memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ce6075db033bbbb7ee5a0bbd3a3186bbae616f57fb001c485c7ff77955f8177f" +"checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9" "checksum mime 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "dd1d63acd1b78403cc0c325605908475dd9b9a3acbf65ed8bcab97e27014afcf" "checksum mime_guess 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1a0ed03949aef72dbdf3116a383d7b38b4768e6f960528cd6a6044aa9ed68599" -"checksum miniz_oxide 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "304f66c19be2afa56530fa7c39796192eef38618da8d19df725ad7c6d6b2aaae" -"checksum mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)" = "83f51996a3ed004ef184e16818edc51fadffe8e7ca68be67f9dee67d84d0ff23" +"checksum miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6f3f74f726ae935c3f514300cc6773a0c9492abc5e972d42ba0c0ebb88757625" +"checksum mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)" = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f" "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" -"checksum nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" "checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" "checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" -"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" -"checksum num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273" +"checksum num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c81ffc11c212fa327657cb19dd85eb7419e163b5b076bede2bdb5c974c07e4" +"checksum num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72" "checksum opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" "checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" "checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" "checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" "checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" "checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27" -"checksum publicsuffix 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9bf259a81de2b2eb9850ec990ec78e6a25319715584fd7652b9b26f96fcb1510" +"checksum publicsuffix 1.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3bbaa49075179162b49acac1c6aa45fb4dafb5f13cf6794276d77bc7fd95757b" "checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" "checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" +"checksum rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412" "checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" +"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" "checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" "checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" +"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" "checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" +"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" "checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" "checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" "checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" @@ -1695,44 +1790,45 @@ dependencies = [ "checksum sct 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c" "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -"checksum serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "9796c9b7ba2ffe7a9ce53c2287dfc48080f4b2b362fcc245a259b3a7201119dd" -"checksum serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "4b133a43a1ecd55d4086bd5b4dc6c1751c68b1bfbeba7a5040442022c7e7c02e" -"checksum serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)" = "2f72eb2a68a7dc3f9a691bfda9305a1c017a6215e5a4545c258500d2099a37c2" +"checksum serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "1217f97ab8e8904b57dd22eb61cde455fa7446a9c1cf43966066da047c1f3702" +"checksum serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "a8c6faef9a2e64b0064f48570289b4bf8823b7581f1d6157c1b52152306651d0" +"checksum serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)" = "48c575e0cc52bdd09b47f330f646cf59afc586e9c4e3ccd6fc1f625b8ea1dad7" "checksum serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a" "checksum serde_yaml 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ef8099d3df28273c99a1728190c7a9f19d444c941044f64adf986bee7ec53051" -"checksum serenity 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "644b296c0c732d33d1258f74a5862e25fa8b91aff16df90e2c98c594d0f019f5" +"checksum serenity 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "17604ea88d40d2120b2916ce93112628925e4de01238c160117b664b5a121bcb" "checksum sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "23962131a91661d643c98940b20fcaffe62d776a823247be80a48fcb8b6fce68" "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" -"checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7" +"checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" +"checksum smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86" "checksum sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3" "checksum spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +"checksum static_assertions 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" "checksum string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d" -"checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf" -"checksum synstructure 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3f085a5855930c0441ca1288cf044ea4aecf4f43a91668abdb870b4ba546a203" -"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" +"checksum syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "dff0acdb207ae2fe6d5976617f887eb1e35a2ba52c13c7234c790960cdad9238" +"checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" "checksum threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e2f0c90a5f3459330ac8bc0d2f879c693bb7a2f59689c1083fc4ef83834da865" "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" "checksum tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)" = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" "checksum tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46" "checksum tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d16217cad7f1b840c5a97dfb3c43b0c871fef423a6e8d2118c604e843662a443" -"checksum tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "0f27ee0e6db01c5f0b2973824547ce7e637b2ed79b891a9677b0de9bd532b6ac" +"checksum tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "ca6df436c42b0c3330a82d855d2ef017cd793090ad550a6bc2184f4b933532ab" "checksum tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5090db468dad16e1a7a54c8c67280c5e4b544f3d3e018f0b913b400261f85926" -"checksum tokio-reactor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "c56391be9805bc80163151c0b9e5164ee64f4b0200962c346fea12773158f22d" +"checksum tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "6732fe6b53c8d11178dcb77ac6d9682af27fc6d4cb87789449152e5377377146" "checksum tokio-rustls 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1df2fa53ac211c136832f530ccb081af9af891af22d685a9493e232c7a359bc2" "checksum tokio-sync 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "d06554cce1ae4a50f42fba8023918afa931413aded705b560e29600ccf7c6d76" "checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119" -"checksum tokio-threadpool 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "2bd2c6a3885302581f4401c82af70d792bb9df1700e7437b0aeb4ada94d5388c" -"checksum tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "f2106812d500ed25a4f38235b9cae8f78a09edf43203e16e59c3b769a342a60e" +"checksum tokio-threadpool 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "f0c32ffea4827978e9aa392d2f743d973c1dfa3730a2ed3f22ce1e6984da848c" +"checksum tokio-timer 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "1739638e364e558128461fc1ad84d997702c8e31c2e6b18fb99842268199e827" "checksum traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" "checksum try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" "checksum try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "283d3b89e1368717881a9d51dad843cc435380d8109c9e47d38780a324698d8b" -"checksum tungstenite 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "577caf571708961603baf59d2e148d12931e0da2e4bb6c5b471dd4a524fef3aa" +"checksum tungstenite 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8a0c2bd5aeb7dcd2bb32e472c8872759308495e5eccc942e929a513cd8d36110" "checksum typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" "checksum typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9" -"checksum unicase 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2e2e6bd1e59e56598518beb94fd6db628ded570326f0a98c679a304bd9f00150" +"checksum unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -"checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426" -"checksum unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9" +"checksum unicode-normalization 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b561e267b2326bb4cebfc0ef9e68355c7abe6c6f522aeac2f5bf95d56c59bdcf" +"checksum unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" "checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" "checksum unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" "checksum untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60369ef7a31de49bcb3f6ca728d4ba7300d9a1658f94c727d4cab8c8d9f4aece" @@ -1742,14 +1838,16 @@ dependencies = [ "checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" "checksum uwl 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dfabe4f248cd69106fdbea55ddd1a1d7aa7abd1a2b167ad62245b7a9306fb1f1" "checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" +"checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce" "checksum want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230" -"checksum wasm-bindgen 0.2.52 (registry+https://github.com/rust-lang/crates.io-index)" = "637353fd57864c20f1968dc21680fe03985ca3a7ef6a5ce027777513bdecc282" -"checksum wasm-bindgen-backend 0.2.52 (registry+https://github.com/rust-lang/crates.io-index)" = "c85481ca7d1aad8cf40e0140830b2197ce89184a80e54e307b55fd64d78ed63e" -"checksum wasm-bindgen-macro 0.2.52 (registry+https://github.com/rust-lang/crates.io-index)" = "9f627667b5f4f8bd923c93107b96907c60e7e8eb2636802499fce468c87e3689" -"checksum wasm-bindgen-macro-support 0.2.52 (registry+https://github.com/rust-lang/crates.io-index)" = "a48f5147b0c049bc306d5b9e53c891056a1fd8c4e7311fffbce233e4f200d45e" -"checksum wasm-bindgen-shared 0.2.52 (registry+https://github.com/rust-lang/crates.io-index)" = "1e272b0d31b78cdcaf5ad440d28276546d99b059a953e5afb387aefce66c3c5a" -"checksum wasm-bindgen-webidl 0.2.52 (registry+https://github.com/rust-lang/crates.io-index)" = "6965845db6189148d8b26387aee0bbf1c84f3da78f57ac543f364fc8ff7ab6e9" -"checksum web-sys 0.3.29 (registry+https://github.com/rust-lang/crates.io-index)" = "0a8b4b06314fd2ce36977e9487607ccff4030779129813f89d0e618710910146" +"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d" +"checksum wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "29ae32af33bacd663a9a28241abecf01f2be64e6a185c6139b04f18b6385c5f2" +"checksum wasm-bindgen-backend 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "1845584bd3593442dc0de6e6d9f84454a59a057722f36f005e44665d6ab19d85" +"checksum wasm-bindgen-macro 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "87fcc747e6b73c93d22c947a6334644d22cfec5abd8b66238484dc2b0aeb9fe4" +"checksum wasm-bindgen-macro-support 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "3dc4b3f2c4078c8c4a5f363b92fcf62604c5913cbd16c6ff5aaf0f74ec03f570" +"checksum wasm-bindgen-shared 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "ca0b78d6d3be8589b95d1d49cdc0794728ca734adf36d7c9f07e6459508bb53d" +"checksum wasm-bindgen-webidl 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "3126356474ceb717c8fb5549ae387c9fbf4872818454f4d87708bee997214bb5" +"checksum web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)" = "98405c0a2e722ed3db341b4c5b70eb9fe0021621f7350bab76df93b09b649bbf" "checksum webpki 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d7e664e770ac0110e2384769bcc59ed19e329d81f555916a6e072714957b81b4" "checksum webpki-roots 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a262ae37dd9d60f60dd473d1158f9fbebf110ba7b6a5051c8160460f6043718b" "checksum weedle 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3bb43f70885151e629e2a19ce9e50bd730fd436cfd4b666894c9ce4de9141164" diff --git a/youmubot/Cargo.toml b/youmubot/Cargo.toml index 06b8644..c050d17 100644 --- a/youmubot/Cargo.toml +++ b/youmubot/Cargo.toml @@ -11,6 +11,8 @@ serenity = "0.7" dotenv = "0.15" serde = { version = "1.0", features = ["derive"] } chrono = "0.4.9" +rand = "0.7.2" +static_assertions = "1.1.0" [dependencies.rustbreak] version = "2.0.0-rc3" diff --git a/youmubot/src/commands/args.rs b/youmubot/src/commands/args.rs index 4a1db68..45dd457 100644 --- a/youmubot/src/commands/args.rs +++ b/youmubot/src/commands/args.rs @@ -2,7 +2,8 @@ pub use duration::Duration; mod duration { use chrono::Duration as StdDuration; - use serenity::framework::standard::CommandError as Error; + use std::fmt; + use String as Error; // Parse a single duration unit fn parse_duration_string(s: &str) -> Result { // We reject the empty case @@ -28,12 +29,12 @@ mod duration { (item, Some(v)) => Ok(ParseStep { current_value: None, current_duration: s.current_duration - + match item { + + match item.to_ascii_lowercase() { 's' => StdDuration::seconds, 'm' => StdDuration::minutes, 'h' => StdDuration::hours, - 'D' => StdDuration::days, - 'W' => StdDuration::weeks, + 'd' => StdDuration::days, + 'w' => StdDuration::weeks, _ => return Err(Error::from("Not a valid duration")), }(v as i64), }), @@ -64,6 +65,40 @@ mod duration { } } + impl fmt::Display for Duration { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + let d = &self.0; + // weeks + let weeks = d.num_weeks(); + let days = d.num_days() - d.num_weeks() * 7; + let hours = d.num_hours() - d.num_days() * 24; + let minutes = d.num_minutes() - d.num_hours() * 60; + let seconds = d.num_seconds() - d.num_minutes() * 60; + let formats = [ + (weeks, "week"), + (days, "day"), + (hours, "hour"), + (minutes, "minute"), + (seconds, "second"), + ]; + let mut first = true; + for (val, counter) in formats.into_iter() { + if *val > 0 { + write!( + f, + "{}{} {}{}", + (if first { "" } else { " " }), + val, + counter, + (if *val == 1 { "" } else { "s" }) + )?; + first = false; + } + } + Ok(()) + } + } + #[cfg(test)] mod tests { use super::*; diff --git a/youmubot/src/commands/fun/mod.rs b/youmubot/src/commands/fun/mod.rs new file mode 100644 index 0000000..2283ae4 --- /dev/null +++ b/youmubot/src/commands/fun/mod.rs @@ -0,0 +1,182 @@ +use rand::{ + distributions::{Distribution, Uniform}, + thread_rng, +}; +use serenity::prelude::*; +use serenity::{ + framework::standard::{ + macros::{command, group}, + Args, CommandResult, + }, + model::{channel::Message, id::UserId}, + utils::MessageBuilder, +}; + +mod names; +mod votes; + +use votes::VOTE_COMMAND; + +group!({ + name: "fun", + options: { + prefixes: ["fun", "f"], + description: "Random commands", + }, + commands: [roll, pick, name, vote], +}); + +#[command] +#[description = "๐ŸŽฒ Rolls a dice that gives you a random number."] +#[min_args(0)] +#[max_args(2)] +#[usage = "[max-dice-faces = 6] / [message]"] +#[example = "100 / What's my score?"] +fn roll(ctx: &mut Context, msg: &Message, mut args: Args) -> CommandResult { + let dice = if args.is_empty() { + 6 + } else { + args.single::()? + }; + + if dice == 0 { + msg.reply(&ctx, "Give me a dice with 0 faces, what do you expect ๐Ÿ˜’")?; + return Ok(()); + } + + let result = { + let dice_rng = Uniform::from(1..=dice); + let mut rng = thread_rng(); + dice_rng.sample(&mut rng) + }; + + match args.single_quoted::() { + Ok(s) => msg.reply( + &ctx, + MessageBuilder::new() + .push("you asked ") + .push_bold_safe(s) + .push(format!( + ", so I rolled a ๐ŸŽฒ of **{}** faces, and got **{}**!", + dice, result + )) + .build(), + ), + Err(_) if args.is_empty() => msg.reply( + &ctx, + format!( + "I rolled a ๐ŸŽฒ of **{}** faces, and got **{}**!", + dice, result + ), + ), + Err(e) => return Err(e.into()), + }?; + + Ok(()) +} + +#[command] +#[description = r#"๐Ÿ‘ˆ Pick a choice from the available list of choices. +You may prefix the first choice with `?` to make it a question! +If no choices are given, Youmu defaults to `Yes!` and `No!`"#] +#[usage = "[?question]/[choice #1]/[choice #2]/..."] +#[example = "?What for dinner/Pizza/Hamburger"] +fn pick(ctx: &mut Context, msg: &Message, mut args: Args) -> CommandResult { + let (question, choices) = { + // Get a list of options. + let mut choices = args + .quoted() + .trimmed() + .iter::() + .map(|v| v.unwrap()) + .peekable(); + // If we have the first argument as question, use it. + let question = match choices.peek() { + Some(ref q) if q.starts_with("?") => Some(q.replacen("?", "", 1) + "?"), + _ => None, + }; + // If we have a question, that's not a choice. + let mut choices = match question { + Some(_) => { + choices.next(); + choices + } + None => choices, + }; + // If there are no choices, default to Yes! and No! + let choices = match choices.peek() { + None => vec!["Yes!".to_owned(), "No!".to_owned()], + _ => choices.collect(), + }; + (question, choices) + }; + + let choice = { + let uniform = Uniform::from(0..choices.len()); + let mut rng = thread_rng(); + &choices[uniform.sample(&mut rng)] + }; + + match question { + None => msg.reply( + &ctx, + MessageBuilder::new() + .push("Youmu picks ๐Ÿ‘‰") + .push_bold_safe(choice) + .push("๐Ÿ‘ˆ!") + .build(), + ), + Some(s) => msg.reply( + &ctx, + MessageBuilder::new() + .push("you asked ") + .push_bold_safe(s) + .push(", and Youmu picks ๐Ÿ‘‰") + .push_bold_safe(choice) + .push("๐Ÿ‘ˆ!") + .build(), + ), + }?; + + Ok(()) +} + +#[command] +#[description = "Wanna know what your name is in Japanese๐Ÿ‡ฏ๐Ÿ‡ต?"] +#[usage = "[user_mention = yourself]"] +#[example = "@user#1234"] +#[max_args(1)] +fn name(ctx: &mut Context, msg: &Message, mut args: Args) -> CommandResult { + let user_id = if args.is_empty() { + msg.author.id + } else { + args.single::()? + }; + + let user_mention = if user_id == msg.author.id { + "your".to_owned() + } else { + MessageBuilder::new() + .push_bold_safe(user_id.to_user(&ctx)?.tag()) + .push("'s") + .build() + }; + + // Rule out a couple of cases + if user_id == ctx.http.get_current_application_info()?.id { + // This is my own user_id + msg.reply(&ctx, "๐Ÿ˜  My name is **Youmu Konpaku**!")?; + return Ok(()); + } + + let (first_name, last_name) = names::name_from_userid(user_id); + + msg.reply( + &ctx, + format!( + "{} Japanese๐Ÿ‡ฏ๐Ÿ‡ต name is **{} {}**!", + user_mention, first_name, last_name + ), + )?; + Ok(()) +} diff --git a/youmubot/src/commands/fun/names.rs b/youmubot/src/commands/fun/names.rs new file mode 100644 index 0000000..ede42dd --- /dev/null +++ b/youmubot/src/commands/fun/names.rs @@ -0,0 +1,1547 @@ +use serenity::model::id::UserId; + +const ALL_NAMES: usize = FIRST_NAMES.len() * LAST_NAMES.len(); +// Get a name from the user's id. +pub fn name_from_userid(u: UserId) -> (&'static str, &'static str) { + let u = u.0 as usize % ALL_NAMES; + ( + FIRST_NAMES[u / LAST_NAMES.len()], // Not your standard mod + LAST_NAMES[u % LAST_NAMES.len()], + ) +} + +const FIRST_NAMES: [&'static str; 440] = [ + // A Female names + "Ai", + "Aiko", + "Akane", + "Akemi", + "Aki", + "Akiko", + "Akina", + "Akuro", + "Amarante", + "Amaya", + "Ami", + "Anda", + "Aneko", + "Arisa", + "Asako", + "Asami", + "Atsuko", + "Aya", + "Ayaka", + "Ayako", + "Ayame", + "Ayano", + // B Female names + "Benten", + // C Female names + "Chiaki", + "Chie", + "Chieko", + "Chihiro", + "Chika", + "Chikako", + "Chiko", + "Chikuma", + "Chinatsu", + "Chisaki", + "Chisato", + "Chitose", + "Chiyeko", + "Chiyo", + "Cho", + // D Female names + "Dai", + // E Female names + "Echiko", + "Eiko", + "Ema", + "Emi", + "Emiko", + "Eri", + "Eriko", + "Etsuko", + "Euiko", + // F Female names + "Fujiko", + "Fumi", + "Fumie", + "Fumiki", + "Fumiko", + "Fusae", + "Fuyuko", + // G Female names + "Gemmei", + "Gen", + "Gin", + "Ginko", + // H Female names + "Hama", + "Hana", + "Hanae", + "Hanako", + "Haniko", + "Haru", + "Haru", + "Haruhi", + "Haruka", + "Harukichi", + "Haruko", + "Harumi", + "Haruna", + "Hatsue", + "Hatsuyo", + "Hide", + "Hideko", + "Hikaru", + "Hiroe", + "Hiroko", + "Hiromi", + "Hiroshi", + "Hisa", + "Hisae", + "Hisako", + "Hisano", + "Hitomi", + "Hitomo", + "Hitoshi", + "Honami", + "Hoshi", + "Hoshie", + "Hoshiko", + "Hoshiyo", + // I Female names + "Ichi", + "Iku", + "Ikue", + "Ikuko", + "Inari", + "Inoue", + "Isako", + "Ise", + "Itsuko", + "Izumi", + // J Female names + "Jin", + "Joruri", + "Jun", + "Junko", + "Juri", + // K Female names + "Kaede", + "Kagami", + "Kahori", + "Kaida", + "Kaiya", + "Kaiyo", + "Kameko", + "Kami", + "Kammi", + "Kammie", + "Kana", + "Kanami", + "Kaneko", + "Kaori", + "Kaoru", + "Kasuga", + "Kata", + "Katsue", + "Katsuko", + "Katsumi", + "Kaya", + "Kayoko", + "Kazue", + "Kazuko", + "Kazumi", + "Kei", + "Keiko", + "Kichi", + "Kiko", + "Kikuko", + "Kikyou", + "Kimi", + "Kimie", + "Kimiko", + "Kin", + "Kinuko", + "Kinuye", + "Kinuyo", + "Kioko", + "Kiriko", + "Kishi", + "Kita", + "Kiyo", + "Kiyoko", + "Kiyomi", + "Kochiyo", + "Kohana", + "Koi", + "Koiso", + "Koken", + "Koko", + "Komachi", + "Koto", + "Kotono", + "Kumi", + "Kumiko", + "Kuni", + "Kunie", + "Kuniko", + "Kura", + "Kuri", + "Kyoko", + // M Female names + "Machi", + "Machiko", + "Madoka", + "Mae", + "Maeko", + "Maemi", + "Mai", + "Maiko", + "Maiya", + "Maki", + "Makiko", + "Mako", + "Mami", + "Mamiko", + "Mana", + "Manami", + "Mari", + "Mariko", + "Marise", + "Maru", + "Masae", + "Masako", + "Masumi", + "Matsu", + "Matsuko", + "Maya", + "Mayako", + "Mayo", + "Mayoko", + "Mayu", + "Mayuko", + "Mayumi", + "Megu", + "Megumi", + "Michi", + "Michie", + "Michiko", + "Michiru", + "Michiyo", + "Midori", + "Mieko", + "Miho", + "Mihoko", + "Miiko", + "Miki", + "Miliko", + "Mina", + "Minako", + "Minami", + "Mineko", + "Mino", + "Mio", + "Misa", + "Misako", + "Misato", + "Mitsu", + "Mitsuko", + "Mitsuyo", + "Miwako", + "Miya", + "Miyako", + "Miyo", + "Miyoko", + "Miyoshi", + "Mizuki", + "Moeko", + "Momoko", + "Mura", + "Mutsuko", + "Mutsumi", + // N Female names + "Naho", + "Nahoko", + "Nami", + "Nami", + "Namie", + "Namika", + "Namiko", + "Namiyo", + "Nana", + "Nanako", + "Nanami", + "Nao", + "Naoko", + "Naora", + "Nari", + "Nariko", + "Naru", + "Narumi", + "Natsuko", + "Natsumi", + "Natsumi", + "Nayoko", + "Nene", + "Nishi", + "Nomi", + "Nori", + "Norie", + "Noriko", + "Nozomi", + "Nyoko", + // O Female names + "Ochiyo", + "Oharu", + "Oki", + "Okichi", + "Okiku", + "Omitsu", + "Orino", + "Otsu", + "Otsune", + // R Female names + "Raicho", + "Raku", + "Ran", + "Rei", + "Reiko", + "Remi", + "Rie", + "Rieko", + "Rika", + "Rikako", + "Riku", + "Rina", + "Rinako", + "Rini", + "Risa", + "Risako", + "Ritsuko", + "Romi", + "Rui", + "Rumiko", + "Ruri", + "Ruriko", + "Ryoko", + // S Female names + "Sachi", + "Sachiko", + "Sada", + "Sadako", + "Sae", + "Saeko", + "Saito", + "Sakamae", + "Saki", + "Sakiko", + "Sakue", + "Sakuko", + "Sakura", + "Sakurako", + "Sakuro", + "Sama", + "Sanako", + "Saori", + "Sata", + "Satoko", + "Satomi", + "Satu", + "Sawako", + "Saya", + "Sayo", + "Sayoko", + "Sayuri", + "Sei", + "Seiko", + "Seka", + "Seki", + "Sen", + "Setsuko", + "Shige", + "Shika", + "Shina", + "Shino", + "Shinobu", + "Shioko", + "Shiori", + "Shizu", + "Shizue", + "Shizuka", + "Shoken", + "Shoko", + "Sui", + "Suki", + "Suko", + "Sumi", + "Sumie", + "Sumiko", + "Suzu", + "Suzue", + "Suzume", + "Suzuko", + // T Female names + "Tadako", + "Tae", + "Tai", + "Taji", + "Taka", + "Takako", + "Takara", + "Tama", + "Tamae", + "Tamafune", + "Tamaki", + "Tamami", + "Tami", + "Tamika", + "Tamiko", + "Tamiyo", + "Tanak", + "Taniko", + "Tansho", + "Tara", + "Taree", + "Taura", + "Taya", + "Teruyo", + "Toki", + "Tokie", + "Tokiko", + "Tokiyo", + "Toku", + "Tomi", + "Tomiko", + "Tomoe", + "Tomoko", + "Tomomi", + "Toshi", + "Toshie", + "Toshiko", + "Toya", + "Toyoko", + "Tsuki", + "Tsukiyama", + "Tsuya", + // U Female names + "Ume", + "Umeka", + "Umeko", + "Urako", + "Usagi", + "Uta", + "Utako", + // W Female names + "Wattan", + "Wazuka", + // Y Female names + "Yachi", + "Yae", + "Yaeko", + "Yama", + "Yasu", + "Yasuko", + "Yayoi", + "Yodo", + "Yoko", + "Yori", + "Yoriko", + "Yoshe", + "Yoshi", + "Yoshike", + "Yoshiko", + "Yoshino", + "Yu", + "Yui", + "Yuka", + "Yukako", + "Yukari", + "Yuki", + "Yukiko", + "Yukiyo", + "Yuko", + "Yuma", + "Yumako", + "Yumi", + "Yumiko", + "Yuri", + "Yuriko", + "Yusuke", +]; + +const LAST_NAMES: [&'static str; 1051] = [ + // A Surnames + "Abe", + "Abukara", + "Adachi", + "Aibu", + "Aida", + "Aihara", + "Aizawa", + "Ajibana", + "Akaike", + "Akamatsu", + "Akatsuka", + "Akechi", + "Akera", + "Akimoto", + "Akita", + "Akiyama", + "Akutagawa", + "Amagawa", + "Amaya", + "Amori", + "Anami", + "Ando", + "Anzai", + "Aoki", + "Arai", + "Arakaki", + "Arakawa", + "Araki", + "Arakida", + "Arato", + "Arihyoshi", + "Arishima", + "Arita", + "Ariwa", + "Ariwara", + "Asahara", + "Asahi", + "Asai", + "Asano", + "Asanuma", + "Asari", + "Ashia", + "Ashida", + "Ashikaga", + "Asuhara", + "Atshushi", + "Ayabe", + "Ayabito", + "Ayugai", + "Azama", + // C Surnames + "Chiba", + "Chikamatsu", + "Chikanatsu", + "Chino", + "Chishu", + "Choshi", + // D Surnames + "Daishi", + "Dan", + "Date", + "Dazai", + "Deguchi", + "Deushi", + "Doi", + // E Surnames + "Ebina", + "Ebisawa", + "Eda", + "Egami", + "Eguchi", + "Ekiguchi", + "Endo", + "Endoso", + "Enoki", + "Enomoto", + "Erizawa", + "Eto", + "Etsuko", + "Ezakiya", + // F Surnames + "Fuchida", + "Fuchizaki", + "Fugunaga", + "Fujii", + "Fujikage", + "Fujimaki", + "Fujimoto", + "Fujioka", + "Fujishima", + "Fujita", + "Fujiwara", + "Fukao", + "Fukayama", + "Fukazawa", + "Fukuda", + "Fukumitsu", + "Fukumoto", + "Fukunaka", + "Fukuoka", + "Fukusaku", + "Fukushima", + "Fukuyama", + "Fukuzawa", + "Fumihiko", + "Funabashi", + "Funaki", + "Funakoshi", + "Furuhata", + "Furusawa", + "Fuschida", + "Fuse", + "Futabatei", + "Fuwa", + // G Surnames + "Gakusha", + "Genda", + "Genji", + "Gensai", + "Godo", + "Goto", + "Gushiken", + // H Surnames + "Haga", + "Hagino", + "Hagiwara", + "Hakamada", + "Hama", + "Hamacho", + "Hamada", + "Hamaguchi", + "Hamamoto", + "Han", + "Hanabusa", + "Hanari", + "Handa", + "Hara", + "Harada", + "Haruguchi", + "Hasegawa", + "Hasekura", + "Hashi", + "Hashimoto", + "Hasimoto", + "Hatakeda", + "Hatakeyama", + "Hatayama", + "Hatoyama", + "Hattori", + "Hayakawa", + "Hayami", + "Hayashi", + "Hayashida", + "Hayata", + "Hayuata", + "Hida", + "Hidaka", + "Hideaki", + "Hideki", + "Hideyoshi", + "Higa", + "Higashi", + "Higashikuni", + "Higashiyama", + "Higo", + "Higoshi", + "Higuchi", + "Hike", + "Hino", + "Hira", + "Hiraga", + "Hirai", + "Hiraki", + "Hirano", + "Hiranuma", + "Hiraoka", + "Hirase", + "Hirasi", + "Hirata", + "Hiratasuka", + "Hirayama", + "Hiro", + "Hirose", + "Hirota", + "Hiroyuki", + "Hisamatsu", + "Hishida", + "Hishikawa", + "Hitomi", + "Hiyama", + "Hohki", + "Hojo", + "Hokusai", + "Honami", + "Honda", + "Hori", + "Horigome", + "Horigoshi", + "Horiuchi", + "Horri", + "Hoshino", + "Hosokawa", + "Hosokaya", + "Hotate", + "Hotta", + "Hyata", + "Hyobanshi", + // I Surnames + "Ibi", + "Ibu", + "Ibuka", + "Ichigawa", + "Ichihara", + "Ichikawa", + "Ichimonji", + "Ichiro", + "Ichisada", + "Ichiyusai", + "Idane", + "Iemochi", + "Ienari", + "Iesada", + "Ieyasu", + "Ieyoshi", + "Igarashi", + "Ihara", + "Ii", + "Iida", + "Iijima", + "Iitaka", + "Ijichi", + "Ijiri", + "Ikeda", + "Ikina", + "Ikoma", + "Imada", + "Imagawa", + "Imai", + "Imaizumi", + "Imamura", + "Imoo", + "Ina", + "Inaba", + "Inao", + "Inihara", + "Ino", + "Inoguchi", + "Inokuma", + "Inomata", + "Inoue", + "Inouye", + "Inukai", + "Ippitsusai", + "Irie", + "Iriye", + "Isaka", + "Isayama", + "Ise", + "Iseki", + "Iseya", + "Ishibashi", + "Ishida", + "Ishiguro", + "Ishihara", + "Ishikawa", + "Ishimaru", + "Ishimura", + "Ishinomori", + "Ishio", + "Ishiyama", + "Isobe", + "Isoda", + "Isozaki", + "Itagaki", + "Itami", + "Ito", + "Itoh", + "Iwahara", + "Iwahashi", + "Iwakura", + "Iwasa", + "Iwasaki", + "Izawa", + "Izumi", + // J Surnames + "Jinnai", + "Jo", + "Joshuya", + "Joshuyo", + "Jukodo", + "Jumonji", + // K Surnames + "Kada", + "Kagabu", + "Kagawa", + "Kahae", + "Kahaya", + "Kai", + "Kaibara", + "Kaima", + "Kajahara", + "Kajitani", + "Kajiwara", + "Kajiyama", + "Kakinomoto", + "Kakutama", + "Kamachi", + "Kamata", + "Kamei", + "Kameyama", + "Kaminaga", + "Kamio", + "Kamioka", + "Kamisaka", + "Kamo", + "Kamon", + "Kan", + "Kanada", + "Kanagaki", + "Kanegawa", + "Kaneko", + "Kanesaka", + "Kano", + "Karamorita", + "Karube", + "Karubo", + "Kasahara", + "Kasai", + "Kasamatsu", + "Kasaya", + "Kase", + "Kashiwabara", + "Kashiwagi", + "Kasuse", + "Katabuchi", + "Kataoka", + "Katayama", + "Katayanagi", + "Kate", + "Kato", + "Katoaka", + "Katsu", + "Katsukawa", + "Katsumata", + "Katsura", + "Katsushika", + "Kawabata", + "Kawabe", + "Kawachi", + "Kawagichi", + "Kawagishi", + "Kawaguchi", + "Kawai", + "Kawaii", + "Kawakami", + "Kawamata", + "Kawamura", + "Kawano", + "Kawasaki", + "Kawasawa", + "Kawashima", + "Kawasie", + "Kawatake", + "Kawate", + "Kawayama", + "Kawazu", + "Kaza", + "Kazuyoshi", + "Kenkyusha", + "Kenmotsu", + "Kentaro", + "Ki", + "Kido", + "Kihara", + "Kijimuta", + "Kijmuta", + "Kikkawa", + "Kikuchi", + "Kikugawa", + "Kikui", + "Kikutake", + "Kimio", + "Kimiyama", + "Kimura", + "Kinashita", + "Kinjo", + "Kino", + "Kinoshita", + "Kinugasa", + "Kira", + "Kishi", + "Kiski", + "Kita", + "Kitabatake", + "Kitagawa", + "Kitamura", + "Kitano", + "Kitao", + "Kitoaji", + "Kiyoura", + "Ko", + "Kobayashi", + "Kobi", + "Kodama", + "Koga", + "Koganezawa", + "Kogara", + "Kogo", + "Koguchi", + "Koike", + "Koiso", + "Koizumi", + "Kojima", + "Kokan", + "Komagata", + "Komatsu", + "Komatsuzaki", + "Komine", + "Komiya", + "Komon", + "Komukai", + "Komura", + "Kon", + "Konae", + "Konda", + "Kondo", + "Konishi", + "Kono", + "Konoe", + "Kora", + "Koruba", + "Koshin", + "Kotabe", + "Kotara", + "Kotoku", + "Kouda", + "Koyama", + "Koyanagi", + "Kozu", + "Kubo", + "Kubodera", + "Kubota", + "Kudara", + "Kudo", + "Kuga", + "Kumagae", + "Kumagai", + "Kumasaka", + "Kunda", + "Kunikida", + "Kunisada", + "Kuno", + "Kunomasu", + "Kuramochi", + "Kuramoto", + "Kurata", + "Kurkawa", + "Kurmochi", + "Kuroda", + "Kurofuji", + "Kurogane", + "Kurohiko", + "Kuroki", + "Kurosawa", + "Kurotani", + "Kurusu", + "Kusaka", + "Kusatsu", + "Kusonoki", + "Kusuhara", + "Kusumoto", + "Kusunoki", + "Kutsuna", + "Kuwabara", + "Kyubei", + // M Surnames + "Maeda", + "Maeno", + "Maita", + "Makioka", + "Makuda", + "Marubeni", + "Marugo", + "Maruyama", + "Masanobu", + "Masaoka", + "Mashita", + "Masuda", + "Masuko", + "Masuno", + "Masuo", + "Masuzoe", + "Matano", + "Matsubara", + "Matsuda", + "Matsukata", + "Matsuki", + "Matsumara", + "Matsumiya", + "Matsumoto", + "Matsuo", + "Matsuoka", + "Matsura", + "Matsushima", + "Matsushina", + "Matsushita", + "Matsuzawa", + "Mayuzumi", + "Mazaki", + "Mazawa", + "Mihashi", + "Miki", + "Mimasuya", + "Minabuchi", + "Minatoya", + "Minobe", + "Misawa", + "Mishima", + "Mitsubishi", + "Mitsukuri", + "Mitsuwa", + "Mitsuya", + "Mitzusaka", + "Miura", + "Miyagi", + "Miyahara", + "Miyajima", + "Miyake", + "Miyamoto", + "Miyata", + "Miyazaki", + "Miyazawa", + "Miyoshi", + "Mizoguchi", + "Mizukawa", + "Mizukuro", + "Mizuno", + "Mizutani", + "Mochizuki", + "Modegi", + "Momotami", + "Momotani", + "Mori", + "Moriguchi", + "Morimoto", + "Morinaga", + "Morioka", + "Morita", + "Moriwaka", + "Morri", + "Moto", + "Motoori", + "Munkata", + "Muraguchi", + "Murakami", + "Muraoka", + "Murata", + "Murkami", + "Muro", + "Muruyama", + "Muso", + "Mutsu", + // N Surnames + "Nagahama", + "Nagai", + "Nagako", + "Nagano", + "Nagasawa", + "Nagase", + "Nagashima", + "Nagata", + "Nagatsuka", + "Nagumo", + "Naito", + "Nakada", + "Nakadai", + "Nakadan", + "Nakae", + "Nakagawa", + "Nakahara", + "Nakajima", + "Nakamoto", + "Nakamura", + "Nakane", + "Nakanishi", + "Nakano", + "Nakanoi", + "Nakao", + "Nakasato", + "Nakasawa", + "Nakasone", + "Nakata", + "Nakatoni", + "Nakatsuka", + "Nakayama", + "Nakazawa", + "Namiki", + "Nanami", + "Narahashi", + "Narato", + "Narita", + "Nataga", + "Natsume", + "Nawabe", + "Nemoto", + "Niijima", + "Nijo", + "Ninomiya", + "Nishi", + "Nishihara", + "Nishikawa", + "Nishimoto", + "Nishimura", + "Nishimuraya", + "Nishio", + "Nishiwaki", + "Nishiyama", + "Nitta", + "Nobunaga", + "Nobusawa", + "Noda", + "Nogi", + "Noguchi", + "Nogushi", + "Nomura", + "Nonomura", + "Noro", + "Nosaka", + "Nose", + "Noto", + "Nozaki", + "Nozara", + "Numajiri", + "Numata", + // O Surnames + "Obata", + "Obinata", + "Obuchi", + "Ochi", + "Ochiai", + "Ochida", + "Odaka", + "Ogata", + "Ogawa", + "Ogiwara", + "Ogura", + "Ogyu", + "Ohba", + "Ohira", + "Ohishi", + "Ohka", + "Ohmae", + "Ohmiya", + "Oichi", + "Oinuma", + "Oishi", + "Okabe", + "Okada", + "Okajima", + "Okakura", + "Okamoto", + "Okamura", + "Okanao", + "Okanaya", + "Okano", + "Okasawa", + "Okawa", + "Okazaki", + "Okazawaya", + "Okimasa", + "Okimoto", + "Okimura", + "Okita", + "Okubo", + "Okuda", + "Okui", + "Okuma", + "Okumura", + "Okura", + "Omori", + "Omura", + "Onishi", + "Ono", + "Onoda", + "Onoe", + "Onohara", + "Ooka", + "Oonishi", + "Osagawa", + "Osaka", + "Osaragi", + "Oshima", + "Oshin", + "Oshiro", + "Ota", + "Otaka", + "Otake", + "Otani", + "Otomo", + "Otsu", + "Otsuka", + "Ouchi", + "Oushima", + "Outakara", + "Outsuka", + "Oyama", + "Ozaki", + "Ozawa", + "Ozu", + // R Surnames + "Raikatuji", + "Royama", + "Ryusaki", + // S Surnames + "Sada", + "Saeki", + "Saga", + "Sahashi", + "Saigo", + "Saiki", + "Saionji", + "Saito", + "Saitoh", + "Saji", + "Sakagami", + "Sakai", + "Sakakibara", + "Sakamoto", + "Sakanoue", + "Sakata", + "Sakiyurai", + "Sako", + "Sakoda", + "Sakubara", + "Sakuma", + "Sakuraba", + "Sakurada", + "Sakurai", + "Sammiya", + "Sanda", + "Sanjo", + "Sano", + "Santo", + "Saromi", + "Sarumara", + "Sasada", + "Sasakawa", + "Sasaki", + "Sassa", + "Satake", + "Sato", + "Satoh", + "Satou", + "Satoya", + "Sawai", + "Sawamatsu", + "Sawamura", + "Sayuki", + "Segawa", + "Sekigawa", + "Sekine", + "Sekozawa", + "Sen", + "Senmatsu", + "Seo", + "Serizawa", + "Seyama", + "Shiba", + "Shibaguchi", + "Shibanuma", + "Shibasaki", + "Shibasawa", + "Shibata", + "Shibue", + "Shibukji", + "Shichirobei", + "Shidehara", + "Shiga", + "Shiganori", + "Shige", + "Shigeki", + "Shigemitsu", + "Shigi", + "Shikitei", + "Shikuk", + "Shima", + "Shimada", + "Shimakage", + "Shimamura", + "Shimanouchi", + "Shimaoka", + "Shimazaki", + "Shimazu", + "Shimedzu", + "Shimizu", + "Shimohira", + "Shimon", + "Shimura", + "Shimuzu", + "Shinko", + "Shinozaki", + "Shinozuka", + "Shintaro", + "Shiokawa", + "Shiomi", + "Shiomiya", + "Shionoya", + "Shiotani", + "Shioya", + "Shirahata", + "Shirai", + "Shiraishi", + "Shirakawa", + "Shirane", + "Shirasu", + "Shiratori", + "Shirokawa", + "Shiroyama", + "Shiskikura", + "Shizuma", + "Shobo", + "Shoda", + "Shunji", + "Shunsen", + "Siagyo", + "Soga", + "Sohda", + "Soho", + "Soma", + "Someya", + "Sone", + "Sonoda", + "Soseki", + "Sotomura", + "Suenami", + "Sugai", + "Sugase", + "Sugawara", + "Sugihara", + "Sugimoto", + "Sugimura", + "Sugino", + "Sugisata", + "Sugita", + "Sugitani", + "Sugiyama", + "Sumitimo", + "Sunada", + "Suzambo", + "Suzuki", + // T Surnames + "Tabuchi", + "Tadeshi", + "Tagawa", + "Taguchi", + "Taira", + "Taka", + "Takabe", + "Takagaki", + "Takagawa", + "Takagi", + "Takahama", + "Takahashi", + "Takahasi", + "Takaki", + "Takamura", + "Takano", + "Takaoka", + "Takara", + "Takashita", + "Takasu", + "Takasugi", + "Takayama", + "Takecare", + "Takei", + "Takekawa", + "Takemago", + "Takemitsu", + "Takemura", + "Takeshi", + "Takeshita", + "Taketomo", + "Takeuchi", + "Takeushi", + "Takewaki", + "Takimoto", + "Takishida", + "Takishita", + "Takita", + "Takizawa", + "Taku", + "Takudo", + "Takudome", + "Tamaasa", + "Tamazaki", + "Tamura", + "Tamuro", + "Tanaka", + "Tange", + "Tani", + "Taniguchi", + "Tanizaki", + "Tankoshitsu", + "Tansho", + "Tanuma", + "Tarumi", + "Tatenaka", + "Tateno", + "Tatsuko", + "Tatsuno", + "Tatsuya", + "Tawaraya", + "Tayama", + "Temko", + "Tenshin", + "Terada", + "Terajima", + "Terakado", + "Terauchi", + "Teshigahara", + "Teshima", + "Tezuka", + "Tochikura", + "Toda", + "Togo", + "Tojo", + "Tokaji", + "Tokuda", + "Tokudome", + "Tokuoka", + "Tomika", + "Tomimoto", + "Tomioka", + "Tommii", + "Tomonaga", + "Tomori", + "Tono", + "Torii", + "Torisawa", + "Torisei", + "Toru", + "Toshishai", + "Toshitala", + "Toshusai", + "Toyama", + "Toyoda", + "Toyoshima", + "Toyota", + "Toyotomi", + "Tsubouchi", + "Tsucgimoto", + "Tsuchie", + "Tsuchiyama", + "Tsuda", + "Tsuga", + "Tsuji", + "Tsujimoto", + "Tsujimura", + "Tsukada", + "Tsukade", + "Tsukahara", + "Tsukamoto", + "Tsukatani", + "Tsukawaki", + "Tsukehara", + "Tsukioka", + "Tsumemasa", + "Tsumura", + "Tsunoda", + "Tsurimi", + "Tsuruga", + "Tsuruya", + "Tsushima", + "Tsutaya", + "Tsutomu", + "Tsutsumi", + "Tsutsumida", + // U Surnames + "Uboshita", + "Uchida", + "Uchiyama", + "Ueda", + "Uehara", + "Uemura", + "Ueshima", + "Uesugi", + "Uetake", + "Ugaki", + "Ui", + "Ukiyo", + "Umari", + "Umehara", + "Umeki", + "Uno", + "Uoya", + "Urayama", + "Urogataya", + "Usami", + "Ushiba", + "Utagawa", + // W Surnames + "Wakai", + "Wakatsuki", + "Watabe", + "Watanabe", + "Watari", + "Watnabe", + "Watoga", + // Y Surnames + "Yakuta", + "Yamabe", + "Yamada", + "Yamadera", + "Yamagata", + "Yamaguchi", + "Yamaguchiya", + "Yamaha", + "Yamahata", + "Yamakage", + "Yamakawa", + "Yamakazi", + "Yamamoto", + "Yamamura", + "Yamana", + "Yamanaka", + "Yamane", + "Yamanouchi", + "Yamanoue", + "Yamaoka", + "Yamasaki", + "Yamashita", + "Yamato", + "Yamauchi", + "Yamawaki", + "Yamazaki", + "Yamhata", + "Yamura", + "Yanagawa", + "Yanagi", + "Yanagimoto", + "Yanagita", + "Yanasaki", + "Yano", + "Yasuda", + "Yasuhiro", + "Yasui", + "Yasujiro", + "Yasukawa", + "Yasutake", + "Yoemon", + "Yokokawa", + "Yokoyama", + "Yonai", + "Yone", + "Yosano", + "Yoshida", + "Yoshida", + "Yoshifumi", + "Yoshihara", + "Yoshikawa", + "Yoshimatsu", + "Yoshinobu", + "Yoshioka", + "Yoshitomi", + "Yoshizaki", + "Yoshizawa", + "Yuasa", + "Yuhara", + "Yunokawa", +]; diff --git a/youmubot/src/commands/fun/votes.rs b/youmubot/src/commands/fun/votes.rs new file mode 100644 index 0000000..7bc8c22 --- /dev/null +++ b/youmubot/src/commands/fun/votes.rs @@ -0,0 +1,235 @@ +use crate::commands::args::Duration as ParseDuration; +use chrono::Duration; +use serenity::framework::standard::CommandError as Error; +use serenity::prelude::*; +use serenity::{ + framework::standard::{macros::command, Args, CommandResult}, + model::{ + channel::{Message, MessageReaction, ReactionType}, + id::UserId, + }, + utils::MessageBuilder, +}; +use std::collections::HashMap as Map; +use std::thread; + +#[command] +#[description = "๐ŸŽŒ Cast a poll upon everyone and ask them for opinions!"] +#[usage = "[duration] / [question] / [answer #1 = Yes!] / [answer #2 = No!] ..."] +#[example = "2m/How early do you get up?/Before 6/Before 7/Before 8/Fuck time"] +#[bucket = "voting"] +#[only_in(guilds)] +#[min_args(2)] +pub fn vote(ctx: &mut Context, msg: &Message, mut args: Args) -> CommandResult { + // Parse stuff first + let args = args.quoted(); + let _duration = args.single::()?; + let duration = &_duration.0; + if *duration < Duration::minutes(2) || *duration > Duration::days(1) { + msg.reply(ctx, format!("๐Ÿ˜’ Invalid duration ({}). The voting time should be between **2 minutes** and **1 day**.", _duration))?; + return Ok(()); + } + let question = args.single::()?; + let (choices, reactions) = if args.is_empty() { + ( + vec!["Yes! ๐Ÿ˜".to_owned(), "No! ๐Ÿคข".to_owned()], + vec!["๐Ÿ˜", "๐Ÿคข"], + ) + } else { + let choices: Vec<_> = args.iter().map(|v| v.unwrap()).collect(); + if choices.len() > MAX_CHOICES { + if choices.len() < 2 { + // Where are the choices? + msg.reply( + ctx, + "๐Ÿ˜’ Can't have a nice voting session if you only have one choice.", + )?; + return Ok(()); + } + // Too many choices! + msg.reply( + ctx, + format!( + "๐Ÿ˜ต Too many choices... We only support {} choices at the moment!", + MAX_CHOICES + ), + )?; + return Ok(()); + } + + let reactions = pick_n_reactions(choices.len())?; + (choices, reactions) + }; + + let fields: Vec<_> = { + choices + .iter() + .zip(reactions.iter()) + .map(|(choice, reaction)| { + ( + MessageBuilder::new().push_bold_safe(choice).build(), + format!("React with {}", reaction), + true, + ) + }) + .collect() + }; + + // Ok... now we post up a nice voting panel. + let channel = msg.channel_id; + let author = &msg.author; + let panel = channel.send_message(&ctx, |c| { + c.content("@here").embed(|e| { + e.author(|au| { + au.icon_url(author.avatar_url().unwrap_or("".to_owned())) + .name(&author.name) + }) + .title(format!("You have {} to vote!", _duration)) + .thumbnail("https://images-ext-2.discordapp.net/external/BK7injOyt4XT8yNfbCDV4mAkwoRy49YPfq-3IwCc_9M/http/cdn.i.ntere.st/p/9197498/image") + .description(MessageBuilder::new().push_bold_line_safe(&question).push("\nThis question was asked by ").push(author.mention())) + .fields(fields.into_iter()) + }) + })?; + msg.delete(&ctx)?; + // React on all the choices + reactions.iter().try_for_each(|v| panel.react(&ctx, *v))?; + + // Start sleeping + thread::sleep(duration.to_std()?); + + let result = collect_reactions(ctx, panel, &reactions, &choices)?; + if result.len() == 0 { + msg.reply( + &ctx, + MessageBuilder::new() + .push("no one answer your question ") + .push_bold_safe(&question) + .push(", sorry ๐Ÿ˜ญ") + .build(), + )?; + } else { + channel.send_message(&ctx, |c| { + c.content({ + let mut content = MessageBuilder::new(); + content + .push("@here, ") + .push(author.mention()) + .push(" previously asked ") + .push_bold_safe(&question) + .push(", and here are the results!"); + result.iter().for_each(|(choice, votes)| { + content + .push("\n - ") + .push_bold(format!("{}", votes.len())) + .push(" voted for ") + .push_bold_safe(choice) + .push(": ") + .push( + votes + .iter() + .map(|v| v.mention()) + .collect::>() + .join(", "), + ); + }); + content.build() + }) + })?; + } + msg.delete(&ctx)?; + + Ok(()) + // unimplemented!(); +} + +// Collect reactions and store them as a map from choice to +fn collect_reactions<'a>( + ctx: &mut Context, + msg: Message, + reaction_emojis: &[&'static str], + choices: &'a [String], +) -> Result)>, Error> { + // Get a brand new version of the Message + let reactions = msg.channel_id.message(&ctx, msg.id)?.reactions; + let reaction_to_choice: Map<_, _> = reaction_emojis + .into_iter() + .zip(choices.into_iter()) + .collect(); + let result: Result, Error> = { + let mut vec: Vec<(&str, Vec)> = Vec::new(); + reactions + .into_iter() + .filter_map(|r| { + if let ReactionType::Unicode(ref v) = r.reaction_type { + reaction_to_choice + .get(&&v[..]) + .cloned() + .filter(|_| r.count > 1) + .map(|choice| (r.clone(), choice)) + } else { + None + } + }) + .try_for_each(|(r, choice)| -> Result<_, Error> { + let users = collect_reaction_users(ctx, &msg, &r)?; + vec.push((choice, users)); + Ok(()) + })?; + vec.sort_by(|(_, b): &(_, Vec<_>), (_, d)| d.len().cmp(&b.len())); + Ok(vec) + }; + let result = result?; + Ok(result) +} + +fn collect_reaction_users( + ctx: &mut Context, + msg: &Message, + reaction: &MessageReaction, +) -> Result, Error> { + let mut res = Vec::with_capacity(reaction.count as usize); + (0..reaction.count) + .step_by(100) + .try_for_each(|_| -> Result<_, Error> { + let user_ids = msg + .reaction_users( + &ctx, + reaction.reaction_type.clone(), + Some(100), + res.last().cloned(), + )? + .into_iter() + .map(|i| i.id); + res.extend(user_ids); + Ok(()) + })?; + Ok(res) +} +// Pick a set of random n reactions! +fn pick_n_reactions(n: usize) -> Result, Error> { + use rand::seq::SliceRandom; + if n > MAX_CHOICES { + Err(Error::from("Too many options")) + } else { + let mut rand = rand::thread_rng(); + Ok(REACTIONS + .choose_multiple(&mut rand, n) + .map(|v| *v) + .collect()) + } +} + +const MAX_CHOICES: usize = 15; + +// All the defined reactions. +const REACTIONS: [&'static str; 90] = [ + "๐Ÿ˜€", "๐Ÿ˜", "๐Ÿ˜‚", "๐Ÿคฃ", "๐Ÿ˜ƒ", "๐Ÿ˜„", "๐Ÿ˜…", "๐Ÿ˜†", "๐Ÿ˜‰", "๐Ÿ˜Š", "๐Ÿ˜‹", "๐Ÿ˜Ž", "๐Ÿ˜", "๐Ÿ˜˜", "๐Ÿฅฐ", "๐Ÿ˜—", + "๐Ÿ˜™", "๐Ÿ˜š", "โ˜บ๏ธ", "๐Ÿ™‚", "๐Ÿค—", "๐Ÿคฉ", "๐Ÿค”", "๐Ÿคจ", "๐Ÿ˜", "๐Ÿ˜‘", "๐Ÿ˜ถ", "๐Ÿ™„", "๐Ÿ˜", "๐Ÿ˜ฃ", "๐Ÿ˜ฅ", "๐Ÿ˜ฎ", + "๐Ÿค", "๐Ÿ˜ฏ", "๐Ÿ˜ช", "๐Ÿ˜ซ", "๐Ÿ˜ด", "๐Ÿ˜Œ", "๐Ÿ˜›", "๐Ÿ˜œ", "๐Ÿ˜", "๐Ÿคค", "๐Ÿ˜’", "๐Ÿ˜“", "๐Ÿ˜”", "๐Ÿ˜•", "๐Ÿ™ƒ", "๐Ÿค‘", + "๐Ÿ˜ฒ", "โ˜น๏ธ", "๐Ÿ™", "๐Ÿ˜–", "๐Ÿ˜ž", "๐Ÿ˜Ÿ", "๐Ÿ˜ค", "๐Ÿ˜ข", "๐Ÿ˜ญ", "๐Ÿ˜ฆ", "๐Ÿ˜ง", "๐Ÿ˜จ", "๐Ÿ˜ฉ", "๐Ÿคฏ", "๐Ÿ˜ฌ", "๐Ÿ˜ฐ", + "๐Ÿ˜ฑ", "๐Ÿฅต", "๐Ÿฅถ", "๐Ÿ˜ณ", "๐Ÿคช", "๐Ÿ˜ต", "๐Ÿ˜ก", "๐Ÿ˜ ", "๐Ÿคฌ", "๐Ÿ˜ท", "๐Ÿค’", "๐Ÿค•", "๐Ÿคข", "๐Ÿคฎ", "๐Ÿคง", "๐Ÿ˜‡", + "๐Ÿค ", "๐Ÿคก", "๐Ÿฅณ", "๐Ÿฅด", "๐Ÿฅบ", "๐Ÿคฅ", "๐Ÿคซ", "๐Ÿคญ", "๐Ÿง", "๐Ÿค“", +]; + +// Assertions +static_assertions::const_assert!(MAX_CHOICES <= REACTIONS.len()); diff --git a/youmubot/src/commands/mod.rs b/youmubot/src/commands/mod.rs index dfca885..e14bd5f 100644 --- a/youmubot/src/commands/mod.rs +++ b/youmubot/src/commands/mod.rs @@ -7,10 +7,13 @@ use serenity::{ }; use std::collections::HashSet; -pub mod admin; mod args; +pub mod admin; +pub mod fun; + pub use admin::ADMIN_GROUP; +pub use fun::FUN_GROUP; // A help command #[help] diff --git a/youmubot/src/main.rs b/youmubot/src/main.rs index 56eec78..8e1743a 100644 --- a/youmubot/src/main.rs +++ b/youmubot/src/main.rs @@ -96,8 +96,12 @@ fn setup_framework(mut client: Client) -> Client { .normal_message(|_, message| { println!("Message is not a command '{}'", message.content); }) + .bucket("voting", |c| { + c.delay(120 /* 2 minutes */).time_span(120).limit(1) + }) // groups here - .group(&commands::ADMIN_GROUP), + .group(&commands::ADMIN_GROUP) + .group(&commands::FUN_GROUP), ); client }