diff --git a/Cargo.lock b/Cargo.lock index 6e08214..1ae51d3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -55,18 +55,18 @@ dependencies = [ [[package]] name = "async-tungstenite" -version = "0.13.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07b30ef0ea5c20caaa54baea49514a206308989c68be7ecd86c7f956e4da6378" +checksum = "f7cc5408453d37e2b1c6f01d8078af1da58b6cfa6a80fa2ede3bd2b9a6ada9c4" dependencies = [ "futures-io", "futures-util", "log", - "pin-project-lite", + "pin-project", "tokio", "tokio-rustls", "tungstenite", - "webpki-roots", + "webpki-roots 0.20.0", ] [[package]] @@ -101,6 +101,12 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +[[package]] +name = "base64" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" + [[package]] name = "base64" version = "0.13.0" @@ -153,9 +159,9 @@ checksum = "b4ae4235e6dac0694637c763029ecea1a2ec9e4e06ec2729bd21ba4d9c863eb7" [[package]] name = "bumpalo" -version = "3.6.1" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe" +checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" [[package]] name = "byteorder" @@ -163,6 +169,12 @@ version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +[[package]] +name = "bytes" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" + [[package]] name = "bytes" version = "1.0.1" @@ -207,8 +219,7 @@ dependencies = [ [[package]] name = "command_attr" -version = "0.3.6" -source = "git+https://github.com/serenity-rs/serenity?branch=next#a24132fc66bea5fe7772d9f694ab3517d24d286b" +version = "0.3.7" dependencies = [ "proc-macro2", "quote", @@ -233,9 +244,9 @@ checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" [[package]] name = "cpufeatures" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed00c67cb5d0a7d64a44f6ad2668db7e7530311dd53ea79bcd4fb022c64911c8" +checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef" dependencies = [ "libc", ] @@ -270,9 +281,9 @@ dependencies = [ [[package]] name = "crossbeam-queue" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f6cb3c7f5b8e51bc3ebb73a2327ad4abdbd119dc13223f14f961d2f38486756" +checksum = "9b10ddc024425c88c2ad148c1b0fd53f4c6d38db9697c9f1588381212fa657c9" dependencies = [ "cfg-if", "crossbeam-utils", @@ -280,11 +291,10 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4feb231f0d4d6af81aed15928e58ecf5816aa62a2393e2c82f46973e92a9a278" +checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" dependencies = [ - "autocfg 1.0.1", "cfg-if", "lazy_static", ] @@ -331,9 +341,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f" +checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" dependencies = [ "atty", "humantime", @@ -523,7 +533,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "825343c4eef0b63f541f8903f395dc5beb362a979b5799a84062527ef1e37726" dependencies = [ - "bytes", + "bytes 1.0.1", "fnv", "futures-core", "futures-sink", @@ -562,18 +572,18 @@ dependencies = [ [[package]] name = "heck" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" dependencies = [ "unicode-segmentation", ] [[package]] name = "hermit-abi" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" dependencies = [ "libc", ] @@ -590,7 +600,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11" dependencies = [ - "bytes", + "bytes 1.0.1", "fnv", "itoa", ] @@ -601,7 +611,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60daa14be0e0786db0f03a9e57cb404c9d756eed2b6c62b9ea98ec5743ec75a9" dependencies = [ - "bytes", + "bytes 1.0.1", "http", "pin-project-lite", ] @@ -626,11 +636,11 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.8" +version = "0.14.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3f71a7eea53a3f8257a7b4795373ff886397178cd634430ea94e12d7fe4fe34" +checksum = "07d6baa1b441335f3ce5098ac421fb6547c46dda735ca1bc6d0153c838f9dd83" dependencies = [ - "bytes", + "bytes 1.0.1", "futures-channel", "futures-core", "futures-util", @@ -640,7 +650,7 @@ dependencies = [ "httparse", "httpdate", "itoa", - "pin-project", + "pin-project-lite", "socket2", "tokio", "tower-service", @@ -669,7 +679,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bytes", + "bytes 1.0.1", "hyper", "native-tls", "tokio", @@ -699,11 +709,11 @@ dependencies = [ [[package]] name = "input_buffer" -version = "0.4.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f97967975f448f1a7ddb12b0bc41069d09ed6a1c161a92687e057325db35d413" +checksum = "19a8a95243d5a0398cae618ec29477c6e3cb631152be5c19481f80bc71559754" dependencies = [ - "bytes", + "bytes 0.5.6", ] [[package]] @@ -717,9 +727,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135" +checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" [[package]] name = "itoa" @@ -766,9 +776,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.95" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36" +checksum = "12b8adadd720df158f4d70dfe7ccc6adb0472d7c55ca83445f6a5ab3e36f8fb6" [[package]] name = "libm" @@ -840,9 +850,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.11" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf80d3e903b34e0bd7282b218398aec54e082c840d9baf8339e0080a0c542956" +checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16" dependencies = [ "libc", "log", @@ -935,7 +945,7 @@ dependencies = [ "num-integer", "num-iter", "num-traits", - "rand 0.8.3", + "rand 0.8.4", "smallvec", "zeroize", ] @@ -983,9 +993,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" +checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" [[package]] name = "opaque-debug" @@ -995,9 +1005,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.34" +version = "0.10.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7830286ad6a3973c0f1d9b73738f69c76b739301d0229c4b96501695cbe4c8" +checksum = "549430950c79ae24e6d02e0b7404534ecf311d94cc9f861e9e4020187d13d885" dependencies = [ "bitflags", "cfg-if", @@ -1015,9 +1025,9 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" [[package]] name = "openssl-sys" -version = "0.9.63" +version = "0.9.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6b0d6fb7d80f877617dfcb014e605e2b5ab2fb0afdf27935219bb6bd984cb98" +checksum = "7a7907e3bfa08bb85105209cdfcb6c63d109f8f6c1ed6ca318fff5c1853fbc1d" dependencies = [ "autocfg 1.0.1", "cc", @@ -1066,7 +1076,7 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb" dependencies = [ - "base64", + "base64 0.13.0", "once_cell", "regex", ] @@ -1099,9 +1109,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905" +checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" [[package]] name = "pin-utils" @@ -1172,14 +1182,14 @@ dependencies = [ [[package]] name = "rand" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" +checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" dependencies = [ "libc", - "rand_chacha 0.3.0", - "rand_core 0.6.2", - "rand_hc 0.3.0", + "rand_chacha 0.3.1", + "rand_core 0.6.3", + "rand_hc 0.3.1", ] [[package]] @@ -1194,12 +1204,12 @@ dependencies = [ [[package]] name = "rand_chacha" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.2", + "rand_core 0.6.3", ] [[package]] @@ -1213,9 +1223,9 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ "getrandom 0.2.3", ] @@ -1231,18 +1241,18 @@ dependencies = [ [[package]] name = "rand_hc" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" +checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" dependencies = [ - "rand_core 0.6.2", + "rand_core 0.6.3", ] [[package]] name = "redox_syscall" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc" +checksum = "5ab49abadf3f9e1c4bc499e8845e152ad87d2ad2d30371841171169e9d75feee" dependencies = [ "bitflags", ] @@ -1275,7 +1285,7 @@ dependencies = [ [[package]] name = "reminder_rs" -version = "1.5.0" +version = "1.5.0-1" dependencies = [ "Inflector", "chrono", @@ -1310,12 +1320,12 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2296f2fac53979e8ccbc4a1136b25dcefd37be9ed7e4a1f6b05a6029c84ff124" +checksum = "246e9f61b9bb77df069a947682be06e31ac43ea37862e244a69f177694ea6d22" dependencies = [ - "base64", - "bytes", + "base64 0.13.0", + "bytes 1.0.1", "encoding_rs", "futures-core", "futures-util", @@ -1344,7 +1354,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots", + "webpki-roots 0.21.1", "winreg", ] @@ -1377,7 +1387,7 @@ dependencies = [ "num-iter", "num-traits", "pem", - "rand 0.8.3", + "rand 0.8.4", "simple_asn1", "subtle", "zeroize", @@ -1389,7 +1399,7 @@ version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" dependencies = [ - "base64", + "base64 0.13.0", "log", "ring", "sct", @@ -1430,9 +1440,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3670b1d2fdf6084d192bc71ead7aabe6c06aa2ea3fbd9cc3ac111fa5c2b1bd84" +checksum = "23a2ac85147a3a11d77ecf1bc7166ec0b92febfa4461c37944e180f319ece467" dependencies = [ "bitflags", "core-foundation", @@ -1443,9 +1453,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3676258fd3cfe2c9a0ec99ce3038798d847ce3e4bb17746373eb9f0f1ac16339" +checksum = "7e4effb91b4b8b6fb7732e670b6cee160278ff8e6bf485c7805d9e319d76e284" dependencies = [ "core-foundation-sys", "libc", @@ -1496,14 +1506,13 @@ dependencies = [ [[package]] name = "serenity" -version = "0.10.7" -source = "git+https://github.com/serenity-rs/serenity?branch=next#a24132fc66bea5fe7772d9f694ab3517d24d286b" +version = "0.10.8" dependencies = [ "async-trait", "async-tungstenite", - "base64", + "base64 0.13.0", "bitflags", - "bytes", + "bytes 1.0.1", "chrono", "command_attr", "flate2", @@ -1548,18 +1557,18 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6" +checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" dependencies = [ "libc", ] [[package]] name = "simple_asn1" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc31e6cf34ad4321d3a2b8f934949b429e314519f753a77962f16c664dca8e13" +checksum = "8eb4ea60fb301dc81dfc113df680571045d375ab7345d171c5dc7d7e13107a80" dependencies = [ "chrono", "num-bigint 0.4.0", @@ -1626,11 +1635,11 @@ checksum = "7f23af36748ec8ea8d49ef8499839907be41b0b1178a4e82b8cb45d29f531dc9" dependencies = [ "ahash", "atoi", - "base64", + "base64 0.13.0", "bigdecimal", "bitflags", "byteorder", - "bytes", + "bytes 1.0.1", "chrono", "crc", "crossbeam-channel", @@ -1652,7 +1661,7 @@ dependencies = [ "once_cell", "parking_lot", "percent-encoding", - "rand 0.8.3", + "rand 0.8.4", "rsa", "rustls", "sha-1", @@ -1665,7 +1674,7 @@ dependencies = [ "tokio-stream", "url", "webpki", - "webpki-roots", + "webpki-roots 0.21.1", "whoami", ] @@ -1724,9 +1733,9 @@ checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2" [[package]] name = "syn" -version = "1.0.72" +version = "1.0.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82" +checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7" dependencies = [ "proc-macro2", "quote", @@ -1759,7 +1768,7 @@ checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" dependencies = [ "cfg-if", "libc", - "rand 0.8.3", + "rand 0.8.4", "redox_syscall", "remove_dir_all", "winapi", @@ -1821,12 +1830,12 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd3076b5c8cc18138b8f8814895c11eb4de37114a5d127bafdc5e55798ceef37" +checksum = "5fb2ed024293bb19f7a5dc54fe83bf86532a44c12a2bb8ba40d64a4509395ca2" dependencies = [ "autocfg 1.0.1", - "bytes", + "bytes 1.0.1", "libc", "memchr", "mio", @@ -1888,7 +1897,7 @@ version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592" dependencies = [ - "bytes", + "bytes 1.0.1", "futures-core", "futures-sink", "log", @@ -1943,25 +1952,21 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "tungstenite" -version = "0.13.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe8dada8c1a3aeca77d6b51a4f1314e0f4b8e438b7b1b71e3ddaca8080e4093" +checksum = "f0308d80d86700c5878b9ef6321f020f29b1bb9d5ff3cab25e75e23f3a492a23" dependencies = [ - "base64", + "base64 0.12.3", "byteorder", - "bytes", + "bytes 0.5.6", "http", "httparse", "input_buffer", "log", - "rand 0.8.3", - "rustls", + "rand 0.7.3", "sha-1", - "thiserror", "url", "utf-8", - "webpki", - "webpki-roots", ] [[package]] @@ -1996,9 +2001,9 @@ dependencies = [ [[package]] name = "unicode-normalization" -version = "0.1.17" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef" +checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" dependencies = [ "tinyvec", ] @@ -2053,9 +2058,9 @@ checksum = "f4bf03e0ca70d626ecc4ba6b0763b934b6f2976e8c744088bb3c1d646fbb1ad0" [[package]] name = "vcpkg" -version = "0.2.13" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "025ce40a007e1907e58d5bc1a594def78e5573bb0b1160bc389634e8f12e4faa" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" @@ -2173,6 +2178,15 @@ dependencies = [ "untrusted", ] +[[package]] +name = "webpki-roots" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f20dea7535251981a9670857150d571846545088359b28e4951d350bdaf179f" +dependencies = [ + "webpki", +] + [[package]] name = "webpki-roots" version = "0.21.1" diff --git a/Cargo.toml b/Cargo.toml index 99bb731..61ebd5a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "reminder_rs" -version = "1.5.0" +version = "1.5.0-1" authors = ["jellywx "] edition = "2018" @@ -23,7 +23,7 @@ rand = "0.7" Inflector = "0.11" levenshtein = "1.0" # serenity = { version = "0.10", features = ["collector"] } -serenity = { git = "https://github.com/serenity-rs/serenity", branch = "next", features = ["collector"] } +serenity = { path = "/home/jude/serenity", features = ["collector", "unstable_discord_api"] } sqlx = { version = "0.5", features = ["runtime-tokio-rustls", "macros", "mysql", "bigdecimal", "chrono"]} [dependencies.regex_command_attr] diff --git a/src/commands/moderation_cmds.rs b/src/commands/moderation_cmds.rs index 88c9725..6022162 100644 --- a/src/commands/moderation_cmds.rs +++ b/src/commands/moderation_cmds.rs @@ -1,13 +1,14 @@ use regex_command_attr::command; use serenity::{ + builder::CreateActionRow, client::Context, framework::Framework, model::{ channel::ReactionType, channel::{Channel, Message}, - id::ChannelId, - id::RoleId, + id::{ChannelId, MessageId, RoleId}, + interactions::ButtonStyle, }, }; @@ -29,7 +30,6 @@ use crate::{ }; use crate::models::CtxGuildData; -use serenity::model::id::MessageId; use std::{collections::HashMap, iter, time::Duration}; #[command] @@ -141,22 +141,28 @@ async fn timezone(ctx: &Context, msg: &Message, args: String) { Err(_) => { let filtered_tz = TZ_VARIANTS .iter() - .map(|tz| (tz, tz.to_string(), levenshtein(&tz.to_string(), &args))) - .filter(|(_, tz, dist)| args.contains(tz) || tz.contains(&args) || dist < &4) + .filter(|tz| { + args.contains(&tz.to_string()) + || tz.to_string().contains(&args) + || levenshtein(&tz.to_string(), &args) < 4 + }) .take(25) - .map(|(tz, tz_s, _)| { - ( - tz_s, - format!( - "🕗 `{}`", - Utc::now() - .with_timezone(tz) - .format(user_data.meridian().fmt_str_short()) - .to_string() - ), - true, - ) - }); + .map(|t| t.to_owned()) + .collect::>(); + + let fields = filtered_tz.iter().map(|tz| { + ( + tz.to_string(), + format!( + "🕗 `{}`", + Utc::now() + .with_timezone(tz) + .format(user_data.meridian().fmt_str_short()) + .to_string() + ), + true, + ) + }); let _ = msg .channel_id @@ -165,9 +171,24 @@ async fn timezone(ctx: &Context, msg: &Message, args: String) { e.title(lm.get(&user_data.language, "timezone/no_timezone_title")) .description(lm.get(&user_data.language, "timezone/no_timezone")) .color(*THEME_COLOR) - .fields(filtered_tz) + .fields(fields) .footer(|f| f.text(footer_text)) .url("https://gist.github.com/JellyWX/913dfc8b63d45192ad6cb54c829324ee") + }).components(|c| { + for row in filtered_tz.as_slice().chunks(5) { + let mut action_row = CreateActionRow::default(); + for timezone in row { + action_row.create_button(|b| { + b.style(ButtonStyle::Secondary) + .label(timezone.to_string()) + .custom_id(format!("timezone:{}", timezone.to_string())) + }); + } + + c.add_action_row(action_row); + } + + c }) }) .await; @@ -211,6 +232,22 @@ async fn timezone(ctx: &Context, msg: &Message, args: String) { .footer(|f| f.text(footer_text)) .url("https://gist.github.com/JellyWX/913dfc8b63d45192ad6cb54c829324ee") }) + .components(|c| { + for row in popular_timezones.as_slice().chunks(5) { + let mut action_row = CreateActionRow::default(); + for timezone in row { + action_row.create_button(|b| { + b.style(ButtonStyle::Secondary) + .label(timezone.to_string()) + .custom_id(format!("timezone:{}", timezone.to_string())) + }); + } + + c.add_action_row(action_row); + } + + c + }) }) .await; } diff --git a/src/main.rs b/src/main.rs index 202c53e..40c9531 100644 --- a/src/main.rs +++ b/src/main.rs @@ -12,12 +12,14 @@ use serenity::{ async_trait, cache::Cache, client::{bridge::gateway::GatewayIntents, Client}, + futures::TryFutureExt, http::{client::Http, CacheHttp}, model::{ channel::GuildChannel, channel::Message, guild::{Guild, GuildUnavailable}, id::{GuildId, UserId}, + interactions::{Interaction, InteractionData, InteractionType}, }, prelude::{Context, EventHandler, TypeMapKey}, utils::shard_id, @@ -27,7 +29,7 @@ use sqlx::mysql::MySqlPool; use dotenv::dotenv; -use std::{collections::HashMap, env, sync::Arc}; +use std::{collections::HashMap, env, sync::Arc, time::Instant}; use crate::{ commands::{info_cmds, moderation_cmds, reminder_cmds, todo_cmds}, @@ -37,8 +39,6 @@ use crate::{ models::GuildData, }; -use serenity::futures::TryFutureExt; - use inflector::Inflector; use log::info; @@ -46,8 +46,12 @@ use dashmap::DashMap; use tokio::sync::RwLock; +use crate::models::UserData; +use chrono::Utc; use chrono_tz::Tz; -use std::time::Instant; +use serenity::model::prelude::{ + InteractionApplicationCommandCallbackDataFlags, InteractionResponseType, +}; struct GuildDataCache; @@ -254,6 +258,62 @@ DELETE FROM guilds WHERE guild = ? .await .unwrap(); } + + async fn interaction_create(&self, ctx: Context, interaction: Interaction) { + let (pool, lm) = get_ctx_data(&&ctx).await; + + match interaction.kind { + InteractionType::ApplicationCommand => {} + InteractionType::MessageComponent => { + if let (Some(InteractionData::MessageComponent(data)), Some(member)) = + (interaction.clone().data, interaction.clone().member) + { + if data.custom_id.starts_with("timezone:") { + let mut user_data = UserData::from_user(&member.user, &ctx, &pool) + .await + .unwrap(); + let new_timezone = data.custom_id.replace("timezone:", "").parse::(); + + if let Ok(timezone) = new_timezone { + user_data.timezone = timezone.to_string(); + user_data.commit_changes(&pool).await; + + let _ = interaction.create_interaction_response(&ctx, |r| { + r.kind(InteractionResponseType::ChannelMessageWithSource) + .interaction_response_data(|d| { + let footer_text = lm.get(&user_data.language, "timezone/footer").replacen( + "{timezone}", + &user_data.timezone, + 1, + ); + + let now = Utc::now().with_timezone(&user_data.timezone()); + + let content = lm + .get(&user_data.language, "timezone/set_p") + .replacen("{timezone}", &user_data.timezone, 1) + .replacen( + "{time}", + &now.format(user_data.meridian().fmt_str_short()).to_string(), + 1, + ); + + d.create_embed(|e| e.title(lm.get(&user_data.language, "timezone/set_p_title")) + .color(*THEME_COLOR) + .description(content) + .footer(|f| f.text(footer_text))) + .flags(InteractionApplicationCommandCallbackDataFlags::EPHEMERAL); + + d + }) + }).await; + } + } + } + } + _ => {} + } + } } #[tokio::main] @@ -270,6 +330,7 @@ async fn main() -> Result<(), Box> { .get_current_user() .map_ok(|user| user.id.as_u64().to_owned()) .await?; + let application_id = http.get_current_application_info().await?.id; let dm_enabled = env::var("DM_ENABLED").map_or(true, |var| var == "1"); @@ -335,6 +396,7 @@ async fn main() -> Result<(), Box> { | GatewayIntents::GUILDS | GatewayIntents::GUILD_MESSAGE_REACTIONS }) + .application_id(application_id.0) .event_handler(Handler) .framework_arc(framework_arc.clone()) .await