From 6e6b0f6da73aa2a5922cf76d9de01d69ce187ab8 Mon Sep 17 00:00:00 2001 From: jude Date: Sun, 20 Sep 2020 23:25:54 +0100 Subject: [PATCH] changed serenity version down --- Cargo.lock | 258 ++++++++++++++++------------------------------------ Cargo.toml | 2 +- src/main.rs | 2 +- 3 files changed, 81 insertions(+), 181 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1f7e741..40bea70 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6,15 +6,6 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" -[[package]] -name = "aead" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" -dependencies = [ - "generic-array 0.14.3", -] - [[package]] name = "aho-corasick" version = "0.7.10" @@ -65,14 +56,14 @@ dependencies = [ [[package]] name = "async-tls" -version = "0.9.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7e7fbc0843fc5ad3d5ca889c5b2bea9130984d34cd0e62db57ab70c2529a8e3" +checksum = "6ce6977f57fa68da77ffe5542950d47e9c23d65f5bc7cb0a9f8700996913eec7" dependencies = [ "futures", - "rustls 0.18.1", + "rustls 0.16.0", "webpki", - "webpki-roots 0.20.0", + "webpki-roots 0.17.0", ] [[package]] @@ -88,9 +79,9 @@ dependencies = [ [[package]] name = "async-tungstenite" -version = "0.8.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5c45a0dd44b7e6533ac4e7acc38ead1a3b39885f5bbb738140d30ea528abc7c" +checksum = "4187bb446c8ecb8849f17cef7553db8bdb09e482e806257130189958fb42dca7" dependencies = [ "async-tls", "futures-io", @@ -126,6 +117,15 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" +[[package]] +name = "base64" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" +dependencies = [ + "byteorder", +] + [[package]] name = "base64" version = "0.11.0" @@ -164,16 +164,7 @@ dependencies = [ "block-padding", "byte-tools", "byteorder", - "generic-array 0.12.3", -] - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array 0.14.3", + "generic-array", ] [[package]] @@ -235,10 +226,10 @@ dependencies = [ [[package]] name = "command_attr" -version = "0.3.0-rc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c538daab2daaf13de61cea91648a62bb11d267ef629f707d5fe3dd080043ab4d" +version = "0.2.0" +source = "git+https://github.com/Lakelezz/serenity?branch=await#a2e8cdedd0a42e31f83c668a80aa3a39ae0a37f3" dependencies = [ + "futures", "proc-macro2", "quote", "syn", @@ -260,12 +251,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" -[[package]] -name = "cpuid-bool" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" - [[package]] name = "crc32fast" version = "1.2.0" @@ -302,16 +287,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" dependencies = [ - "generic-array 0.12.3", -] - -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array 0.14.3", + "generic-array", ] [[package]] @@ -490,16 +466,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "generic-array" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60fb4bb6bba52f78a471264d9a3b7d026cc0af47b22cd2cffbc0b787ca003e63" -dependencies = [ - "typenum", - "version_check", -] - [[package]] name = "getrandom" version = "0.1.14" @@ -709,6 +675,17 @@ version = "0.2.68" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0" +[[package]] +name = "libsodium-sys" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a685b64f837b339074115f2e7f7b431ac73681d08d75b389db7498b8892b8a58" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + [[package]] name = "log" version = "0.4.8" @@ -900,12 +877,6 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - [[package]] name = "openssl" version = "0.10.29" @@ -983,15 +954,6 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" -[[package]] -name = "poly1305" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b42192ab143ed7619bf888a7f9c6733a9a2153b218e2cd557cfdb52fbf9bb1" -dependencies = [ - "universal-hash", -] - [[package]] name = "ppv-lite86" version = "0.2.6" @@ -1156,6 +1118,19 @@ dependencies = [ "winapi 0.3.8", ] +[[package]] +name = "rustls" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b25a18b1bf7387f0145e7f8324e700805aade3842dd3db2e74e4cdeb4677c09e" +dependencies = [ + "base64 0.10.1", + "log", + "ring", + "sct", + "webpki", +] + [[package]] name = "rustls" version = "0.17.0" @@ -1169,35 +1144,12 @@ dependencies = [ "webpki", ] -[[package]] -name = "rustls" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81" -dependencies = [ - "base64 0.12.3", - "log", - "ring", - "sct", - "webpki", -] - [[package]] name = "ryu" version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "535622e6be132bccd223f4bb2b8ac8d53cda3c7a6394944d3b2b33fb974f9d76" -[[package]] -name = "salsa20" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fc17dc5eee5d3040d9f95a2d3ac42fb2c1829a80f417045da6cfd2befa66769" -dependencies = [ - "stream-cipher", - "zeroize", -] - [[package]] name = "schannel" version = "0.1.18" @@ -1286,14 +1238,14 @@ dependencies = [ [[package]] name = "serenity" -version = "0.9.0-rc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e935a7f3f4752257183ee1f3553b10ea5b514a55de0e536dca7f3742b97d18" +version = "0.8.6" +source = "git+https://github.com/Lakelezz/serenity?branch=await#a2e8cdedd0a42e31f83c668a80aa3a39ae0a37f3" dependencies = [ + "async-tls", "async-trait", "async-tungstenite", "audiopus", - "base64 0.12.3", + "base64 0.11.0", "bitflags", "byteorder", "bytes", @@ -1304,14 +1256,16 @@ dependencies = [ "log", "rand", "reqwest", + "rustls 0.16.0", "serde", "serde_json", + "sodiumoxide", "static_assertions", "tokio", - "typemap_rev", "url", "uwl", - "xsalsa20poly1305", + "webpki", + "webpki-roots 0.19.0", ] [[package]] @@ -1320,23 +1274,10 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" dependencies = [ - "block-buffer 0.7.3", - "digest 0.8.1", + "block-buffer", + "digest", "fake-simd", - "opaque-debug 0.2.3", -] - -[[package]] -name = "sha-1" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "170a36ea86c864a3f16dd2687712dd6646f7019f301e57537c7f4dc9f5916770" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if", - "cpuid-bool", - "digest 0.9.0", - "opaque-debug 0.3.0", + "opaque-debug", ] [[package]] @@ -1345,10 +1286,10 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27044adfd2e1f077f649f59deb9490d3941d674002f7d062870a60ebe9bd47a0" dependencies = [ - "block-buffer 0.7.3", - "digest 0.8.1", + "block-buffer", + "digest", "fake-simd", - "opaque-debug 0.2.3", + "opaque-debug", ] [[package]] @@ -1385,6 +1326,16 @@ dependencies = [ "winapi 0.3.8", ] +[[package]] +name = "sodiumoxide" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7038b67c941e23501573cb7242ffb08709abe9b11eb74bceff875bbda024a6a8" +dependencies = [ + "libc", + "libsodium-sys", +] + [[package]] name = "soundfx-rs" version = "0.1.0" @@ -1438,11 +1389,11 @@ dependencies = [ "byteorder", "crossbeam-queue", "crossbeam-utils", - "digest 0.8.1", + "digest", "futures-channel", "futures-core", "futures-util", - "generic-array 0.12.3", + "generic-array", "hex", "libc", "log", @@ -1450,7 +1401,7 @@ dependencies = [ "num-bigint", "percent-encoding", "rand", - "sha-1 0.8.2", + "sha-1", "sha2", "sqlformat", "tokio", @@ -1481,21 +1432,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "stream-cipher" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09f8ed9974042b8c3672ff3030a69fcc03b74c47c3d1ecb7755e8a3626011e88" -dependencies = [ - "generic-array 0.14.3", -] - -[[package]] -name = "subtle" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "502d53007c02d7605a05df1c1a73ee436952781653da5d0bf57ad608f66932c1" - [[package]] name = "syn" version = "1.0.17" @@ -1646,11 +1582,11 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" [[package]] name = "tungstenite" -version = "0.11.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0308d80d86700c5878b9ef6321f020f29b1bb9d5ff3cab25e75e23f3a492a23" +checksum = "cfea31758bf674f990918962e8e5f07071a3161bd7c4138ed23e416e1ac4264e" dependencies = [ - "base64 0.12.3", + "base64 0.11.0", "byteorder", "bytes", "http", @@ -1658,17 +1594,11 @@ dependencies = [ "input_buffer", "log", "rand", - "sha-1 0.9.1", + "sha-1", "url", "utf-8", ] -[[package]] -name = "typemap_rev" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "078d41124321488746becfa144977b9b54667af408ff933cbbce9d83e7796ac9" - [[package]] name = "typenum" version = "1.11.2" @@ -1714,16 +1644,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" -[[package]] -name = "universal-hash" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b2c654932e3e4f9196e69d08fdf7cfd718e1dc6f66b347e6024a0c961402" -dependencies = [ - "generic-array 0.14.3", - "subtle", -] - [[package]] name = "untrusted" version = "0.7.0" @@ -1871,18 +1791,18 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.19.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8eff4b7516a57307f9349c64bf34caa34b940b66fed4b2fb3136cb7386e5739" +checksum = "a262ae37dd9d60f60dd473d1158f9fbebf110ba7b6a5051c8160460f6043718b" dependencies = [ "webpki", ] [[package]] name = "webpki-roots" -version = "0.20.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f20dea7535251981a9670857150d571846545088359b28e4951d350bdaf179f" +checksum = "f8eff4b7516a57307f9349c64bf34caa34b940b66fed4b2fb3136cb7386e5739" dependencies = [ "webpki", ] @@ -1939,23 +1859,3 @@ dependencies = [ "winapi 0.2.8", "winapi-build", ] - -[[package]] -name = "xsalsa20poly1305" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a4120d688bcca2a2226223c83a8ca3dbf349c6a3c7bef0f4a1ca8404326dba" -dependencies = [ - "aead", - "poly1305", - "rand_core", - "salsa20", - "subtle", - "zeroize", -] - -[[package]] -name = "zeroize" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cbac2ed2ba24cc90f5e06485ac8c7c1e5449fe8911aef4d8877218af021a5b8" diff --git a/Cargo.toml b/Cargo.toml index b533bd1..00a8521 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ authors = ["jude-lafitteIII "] edition = "2018" [dependencies] -serenity = {version = "0.9.0-rc.1", features = ["voice", "collector"]} +serenity = {git = "https://github.com/Lakelezz/serenity", branch = "await", features = ["voice", "collector"]} sqlx = {version = "0.3.5", default-features = false, features = ["runtime-tokio", "macros", "mysql", "bigdecimal"]} dotenv = "0.15" tokio = {version = "0.2.19", features = ["fs", "sync", "process", "io-util"]} diff --git a/src/main.rs b/src/main.rs index fc801b5..bcaae9a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -239,7 +239,7 @@ async fn permission_check(ctx: &Context, msg: &Message, _args: &mut Args) -> Che async fn perform_permission_check(ctx: &Context, msg: &&Message) -> CheckResult { if let Some(guild) = msg.guild(&ctx).await { - if guild.member_permissions(&msg.author).manage_guild() { + if guild.member_permissions(&msg.author).await.manage_guild() { CheckResult::Success } else {