From b9b83c8682e3ab53214bf18452f10fe0bf088181 Mon Sep 17 00:00:00 2001 From: David Thomas Date: Fri, 10 Nov 2023 09:16:15 +0000 Subject: [PATCH] Replace Gnome!6669 with GnomedDev --- Cargo.lock | 63 +++++++++++++------------------------------- src/commands/main.rs | 2 +- src/main.rs | 2 +- 3 files changed, 20 insertions(+), 47 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 96c4c52c..1118160f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -854,9 +854,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "js-sys", @@ -1249,9 +1249,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" [[package]] name = "lock_api" @@ -1988,9 +1988,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ "base64 0.21.5", ] @@ -2190,7 +2190,7 @@ dependencies = [ [[package]] name = "serenity" version = "0.11.7" -source = "git+https://github.com/serenity-rs/serenity?branch=next#4361c1c9eaf4c31eda9410f3defd61ac34383a2b" +source = "git+https://github.com/serenity-rs/serenity?branch=next#f0453f8ea2753d9f566f3eaa2487e78a87025a1a" dependencies = [ "arrayvec", "async-trait", @@ -2209,7 +2209,7 @@ dependencies = [ "secrecy", "serde", "serde_json", - "simd-json 0.12.0", + "simd-json", "time", "tokio", "tokio-tungstenite 0.20.1", @@ -2221,7 +2221,7 @@ dependencies = [ [[package]] name = "serenity-voice-model" version = "0.1.1" -source = "git+https://github.com/serenity-rs/serenity?branch=next#4361c1c9eaf4c31eda9410f3defd61ac34383a2b" +source = "git+https://github.com/serenity-rs/serenity?branch=next#f0453f8ea2753d9f566f3eaa2487e78a87025a1a" dependencies = [ "bitflags 2.4.1", "enum_primitive", @@ -2270,21 +2270,6 @@ dependencies = [ "libc", ] -[[package]] -name = "simd-json" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f07a84c7456b901b8dd2c1d44caca8b0fd2c2616206ee5acc9d9da61e8d9ec" -dependencies = [ - "getrandom", - "halfbrown", - "lexical-core", - "serde", - "serde_json", - "simdutf8", - "value-trait 0.6.1", -] - [[package]] name = "simd-json" version = "0.13.4" @@ -2298,7 +2283,7 @@ dependencies = [ "serde", "serde_json", "simdutf8", - "value-trait 0.8.0", + "value-trait", ] [[package]] @@ -2318,9 +2303,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.1" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "socket2" @@ -2345,7 +2330,7 @@ dependencies = [ [[package]] name = "songbird" version = "0.3.2" -source = "git+https://github.com/serenity-rs/songbird?branch=next#1c51d7d26d9ac7d3346e2085db509ae5791d72e3" +source = "git+https://github.com/serenity-rs/songbird?branch=next#3ac17b62a66d22089d822962a53970bd4731ac09" dependencies = [ "async-trait", "audiopus", @@ -2370,7 +2355,7 @@ dependencies = [ "serde_json", "serenity", "serenity-voice-model", - "simd-json 0.13.4", + "simd-json", "socket2 0.5.5", "streamcatcher", "symphonia", @@ -2844,9 +2829,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.33.0" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" dependencies = [ "backtrace", "bytes", @@ -2863,9 +2848,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", @@ -3276,18 +3261,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" -[[package]] -name = "value-trait" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a5b6c8ceb01263b969cac48d4a6705134d490ded13d889e52c0cfc80c6945e" -dependencies = [ - "float-cmp", - "halfbrown", - "itoa", - "ryu", -] - [[package]] name = "value-trait" version = "0.8.0" diff --git a/src/commands/main.rs b/src/commands/main.rs index fdb9498f..846fd3b6 100644 --- a/src/commands/main.rs +++ b/src/commands/main.rs @@ -300,7 +300,7 @@ pub async fn premium_activate(ctx: Context<'_>) -> CommandResult { .colour(crate::constants::PREMIUM_NEUTRAL_COLOUR) .footer(CreateEmbedFooter::new({ let line1 = ctx.gettext("If you have just subscribed, please wait for up to an hour for the member list to update!\n"); - let line2 = ctx.gettext("If this is incorrect, and you have waited an hour, please contact Gnome!#6669."); + let line2 = ctx.gettext("If this is incorrect, and you have waited an hour, please contact GnomedDev."); let mut concat = String::with_capacity(line1.len() + line2.len()); concat.push_str(line1); diff --git a/src/main.rs b/src/main.rs index 19a3b0e5..0ca1d6a6 100644 --- a/src/main.rs +++ b/src/main.rs @@ -522,7 +522,7 @@ async fn premium_command_check(ctx: Context<'_>) -> Result { if permissions.send_messages() { let builder = poise::CreateReply::default(); ctx.send({ - const FOOTER_MSG: &str = "If this is an error, please contact Gnome!#6669."; + const FOOTER_MSG: &str = "If this is an error, please contact GnomedDev."; if permissions.embed_links() { let embed = CreateEmbed::default() .title("TTS Bot Premium - Premium Only Command!")