Fix example breakage due to Token changes

serenity-rs · Nov 22, 2024 · 414fdf7 · 414fdf7
1 parent 55c84be
commit 414fdf7
Show file tree

Hide file tree

Showing 9 changed files with 84 additions and 113 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/examples/advanced_cooldowns/main.rs b/examples/advanced_cooldowns/main.rs
@@ -38,7 +38,7 @@ async fn register_commands(ctx: Context<'_>) -> Result<(), Error> {
 
 #[tokio::main]
 async fn main() {
-    let token = std::env::var("DISCORD_TOKEN").expect("missing DISCORD_TOKEN");
+    let token = serenity::Token::from_env("DISCORD_TOKEN").unwrap();
 
     let options = poise::FrameworkOptions {
         commands: vec![register_commands(), dynamic_cooldowns()],
@@ -48,7 +48,7 @@ async fn main() {
         ..Default::default()
     };
 
-    let client = serenity::Client::builder(&token, serenity::GatewayIntents::non_privileged())
+    let client = serenity::Client::builder(token, serenity::GatewayIntents::non_privileged())
         .framework(poise::Framework::new(options))
         .await;
 

diff --git a/examples/basic_structure/main.rs b/examples/basic_structure/main.rs
@@ -5,7 +5,6 @@ mod commands;
 use poise::serenity_prelude as serenity;
 use std::{
     collections::HashMap,
-    env::var,
     sync::{Arc, Mutex},
     time::Duration,
 };
@@ -101,12 +100,11 @@ async fn main() {
         ..Default::default()
     };
 
-    let token = var("DISCORD_TOKEN")
-        .expect("Missing `DISCORD_TOKEN` env var, see README for more information.");
+    let token = serenity::Token::from_env("DISCORD_TOKEN").unwrap();
     let intents =
         serenity::GatewayIntents::non_privileged() | serenity::GatewayIntents::MESSAGE_CONTENT;
 
-    let client = serenity::ClientBuilder::new(&token, intents)
+    let client = serenity::ClientBuilder::new(token, intents)
         .framework(poise::Framework::new(options))
         .data(Arc::new(Data {
             votes: Mutex::new(HashMap::new()),

diff --git a/examples/event_handler/main.rs b/examples/event_handler/main.rs
@@ -1,4 +1,3 @@
-use std::env::var;
 use std::sync::atomic::{AtomicU32, Ordering};
 use std::sync::Arc;
 
@@ -18,8 +17,7 @@ pub struct Data {
 async fn main() {
     env_logger::init();
 
-    let token = var("DISCORD_TOKEN")
-        .expect("Missing `DISCORD_TOKEN` env var, see README for more information.");
+    let token = serenity::Token::from_env("DISCORD_TOKEN").unwrap();
     let intents =
         serenity::GatewayIntents::non_privileged() | serenity::GatewayIntents::MESSAGE_CONTENT;
 
@@ -28,7 +26,7 @@ async fn main() {
         ..Default::default()
     };
 
-    let client = serenity::ClientBuilder::new(&token, intents)
+    let client = serenity::ClientBuilder::new(token, intents)
         .framework(poise::Framework::new(options))
         .data(Arc::new(Data {
             poise_mentions: AtomicU32::new(0),

diff --git a/examples/feature_showcase/main.rs b/examples/feature_showcase/main.rs
@@ -112,11 +112,11 @@ async fn main() {
         ..Default::default()
     };
 
-    let token = std::env::var("DISCORD_TOKEN").unwrap();
+    let token = serenity::Token::from_env("DISCORD_TOKEN").unwrap();
     let intents =
         serenity::GatewayIntents::non_privileged() | serenity::GatewayIntents::MESSAGE_CONTENT;
 
-    let client = serenity::ClientBuilder::new(&token, intents)
+    let client = serenity::ClientBuilder::new(token, intents)
         .framework(poise::Framework::new(framework_options))
         .await;
 

diff --git a/examples/fluent_localization/main.rs b/examples/fluent_localization/main.rs
@@ -71,7 +71,7 @@ async fn main() {
 
     translation::apply_translations(translations, &mut commands);
 
-    let token = std::env::var("TOKEN").unwrap();
+    let token = serenity::Token::from_env("DISCORD_TOKEN").unwrap();
     let intents = serenity::GatewayIntents::non_privileged();
 
     let framework = poise::Framework::builder()
@@ -81,7 +81,7 @@ async fn main() {
         })
         .build();
 
-    let client = serenity::ClientBuilder::new(&token, intents)
+    let client = serenity::ClientBuilder::new(token, intents)
         .data(Arc::new(Data { translations }) as _)
         .framework(framework)
         .await;

diff --git a/examples/invocation_data/main.rs b/examples/invocation_data/main.rs
@@ -61,7 +61,7 @@ async fn register_commands(ctx: Context<'_>) -> Result<(), Error> {
 
 #[tokio::main]
 async fn main() {
-    let token = std::env::var("TOKEN").unwrap();
+    let token = serenity::Token::from_env("DISCORD_TOKEN").unwrap();
     let intents =
         serenity::GatewayIntents::non_privileged() | serenity::GatewayIntents::MESSAGE_CONTENT;
 
@@ -119,7 +119,7 @@ async fn main() {
         ..Default::default()
     };
 
-    let client = serenity::ClientBuilder::new(&token, intents)
+    let client = serenity::ClientBuilder::new(token, intents)
         .framework(poise::Framework::new(options))
         .await;
 

diff --git a/examples/manual_dispatch/main.rs b/examples/manual_dispatch/main.rs
@@ -51,7 +51,7 @@ impl serenity::EventHandler for Handler {
 
 #[tokio::main]
 async fn main() -> Result<(), Error> {
-    let token = std::env::var("DISCORD_TOKEN").expect("missing DISCORD_TOKEN");
+    let token = serenity::Token::from_env("DISCORD_TOKEN").unwrap();
     let intents = serenity::GatewayIntents::non_privileged();
     let mut handler = Handler {
         options: poise::FrameworkOptions {
@@ -63,7 +63,7 @@ async fn main() -> Result<(), Error> {
     poise::set_qualified_names(&mut handler.options.commands); // some setup
 
     let handler = std::sync::Arc::new(handler);
-    let mut client = serenity::Client::builder(&token, intents)
+    let mut client = serenity::Client::builder(token, intents)
         .event_handler::<Handler>(handler.clone())
         .await?;
 

diff --git a/examples/quickstart/main.rs b/examples/quickstart/main.rs
@@ -27,15 +27,15 @@ async fn register_commands(ctx: Context<'_>) -> Result<(), Error> {
 
 #[tokio::main]
 async fn main() {
-    let token = std::env::var("DISCORD_TOKEN").expect("missing DISCORD_TOKEN");
+    let token = serenity::Token::from_env("DISCORD_TOKEN").unwrap();
     let intents = serenity::GatewayIntents::non_privileged();
 
     let options = poise::FrameworkOptions {
         commands: vec![register_commands(), age()],
         ..Default::default()
     };
 
-    let client = serenity::ClientBuilder::new(&token, intents)
+    let client = serenity::ClientBuilder::new(token, intents)
         .framework(poise::Framework::new(options))
         .await;