feat(shuttle-serenity): make serenity 0.12 default, support poise 0.6, deprecate shuttle-poise

.circleci/config.yml

@@ -759,7 +759,7 @@ workflows:
                 - services/shuttle-serenity
               features:
                 - "-F serenity"
-                - "-F serenity-0-12-rustls_backend --no-default-features"
+                - "-F serenity-0-11-rustls_backend --no-default-features"
       - test-workspace-member:
           name: << matrix.crate >>
           matrix:

services/shuttle-poise/Cargo.toml

@@ -9,9 +9,5 @@ keywords = ["shuttle-service", "poise", "discord-bot", "serenity"]
 [workspace]
 
 [dependencies]
-poise = { version = "0.5.2" }
-shuttle-runtime = { path = "../../runtime", version = "0.36.0", default-features = false }
-
-[dev-dependencies]
-shuttle-secrets = { path = "../../resources/secrets" }
-tokio = { version = "1.26.0", features = ["macros", "rt-multi-thread"] }
+poise = "0.5.2"
+shuttle-runtime = { path = "../../runtime", version = "<=0.40.0", default-features = false }

services/shuttle-poise/README.md

@@ -1,47 +1,5 @@
-## Shuttle service integration for the Poise discord bot framework.
+## Shuttle service integration for the Poise Discord bot framework
 
-### Example
+**This plugin is deprecated.**
 
-```rust,no_run
-use poise::serenity_prelude as serenity;
-use shuttle_secrets::SecretStore;
-use shuttle_poise::ShuttlePoise;
-
-struct Data {} // User data, which is stored and accessible in all command invocations
-type Error = Box<dyn std::error::Error + Send + Sync>;
-type Context<'a> = poise::Context<'a, Data, Error>;
-
-/// Responds with "world!"
-#[poise::command(slash_command)]
-async fn hello(ctx: Context<'_>) -> Result<(), Error> {
-    ctx.say("world!").await?;
-    Ok(())
-}
-
-#[shuttle_runtime::main]
-async fn poise(#[shuttle_secrets::Secrets] secret_store: SecretStore) -> ShuttlePoise<Data, Error> {
-    // Get the discord token set in `Secrets.toml`
-    let discord_token = secret_store
-        .get("DISCORD_TOKEN")
-        .expect("'DISCORD_TOKEN' was not found");
-
-    let framework = poise::Framework::builder()
-        .options(poise::FrameworkOptions {
-            commands: vec![hello()],
-            ..Default::default()
-        })
-        .token(discord_token)
-        .intents(serenity::GatewayIntents::non_privileged())
-        .setup(|ctx, _ready, framework| {
-            Box::pin(async move {
-                poise::builtins::register_globally(ctx, &framework.options().commands).await?;
-                Ok(Data {})
-            })
-        })
-        .build()
-        .await
-        .map_err(shuttle_runtime::CustomError::new)?;
-
-    Ok(framework.into())
-}
-```
+Poise >=0.6 can now be used together with [shuttle-serenity](https://docs.rs/shuttle-serenity/latest/shuttle_serenity/).

services/shuttle-poise/src/lib.rs

@@ -3,6 +3,7 @@ use std::net::SocketAddr;
 use std::sync::Arc;
 
 /// A wrapper type for [poise::Framework] so we can implement [shuttle_runtime::Service] for it.
+#[deprecated = "shuttle-poise for poise 0.5 is deprecated. To use poise 0.6 and Shuttle, check https://docs.rs/shuttle-serenity/latest/shuttle_serenity/"]
 pub struct PoiseService<T, E>(pub Arc<poise::Framework<T, E>>);
 
 #[shuttle_runtime::async_trait]

services/shuttle-serenity/Cargo.toml

@@ -9,8 +9,8 @@ keywords = ["shuttle-service", "serenity"]
 [workspace]
 
 [dependencies]
-serenity = { version = "0.11.5", default-features = false, features = ["client", "gateway", "model"], optional = true }
-serenity-0-12 = { package = "serenity", version = "0.12", default-features = false, features = ["client", "gateway", "model"], optional = true }
+serenity = { version = "0.12", default-features = false, features = ["client", "gateway", "model"], optional = true }
+serenity-0-11 = { package = "serenity", version = "0.11.7", default-features = false, features = ["client", "gateway", "model"], optional = true }
 shuttle-runtime = { path = "../../runtime", version = "0.36.0", default-features = false }
 
 [dev-dependencies]
@@ -24,5 +24,5 @@ default = ["rustls_backend"]
 
 rustls_backend = ["serenity/rustls_backend"]
 native_tls_backend = ["serenity/native_tls_backend"]
-serenity-0-12-rustls_backend = ["serenity-0-12/rustls_backend"]
-serenity-0-12-native_tls_backend = ["serenity-0-12/native_tls_backend"]
+serenity-0-11-rustls_backend = ["serenity-0-11/rustls_backend"]
+serenity-0-11-native_tls_backend = ["serenity-0-11/native_tls_backend"]

services/shuttle-serenity/README.md

@@ -1,9 +1,12 @@
-## Shuttle service integration for the Serenity discord bot framework.
+## Shuttle service integration for the Serenity Discord bot framework
+
+Serenity 0.12 is used by default. Poise 0.6 is also supported.
+
+Serenity 0.11 is supported by using these feature flags (native TLS also available):
 
-Serenity 0.12 is now supported by using these feature flags (native TLS also available):
 ```toml,ignore
-serenity = { version = "0.12.0", features = ["..."] }
-shuttle-serenity = { version = "0.36.0", default-features = false, features = ["serenity-0-12-rustls_backend"] }
+serenity = { version = "0.11.7", features = ["..."] }
+shuttle-serenity = { version = "0.36.0", default-features = false, features = ["serenity-0-11-rustls_backend"] }
 ```
 
 ### Example

services/shuttle-serenity/src/lib.rs

@@ -4,8 +4,8 @@ use std::net::SocketAddr;
 
 #[cfg(feature = "serenity")]
 use serenity::Client;
-#[cfg(feature = "serenity-0-12")]
-use serenity_0_12::Client;
+#[cfg(feature = "serenity-0-11")]
+use serenity_0_11::Client;
 
 /// A wrapper type for [serenity::Client] so we can implement [shuttle_runtime::Service] for it.
 pub struct SerenityService(pub Client);