make github happy

Author: Astavie

Cargo.lock

@@ -9,13 +9,13 @@ edition = "2021"
 serde = { version = "1.0.126", features = ["derive"] }
 serde_json = "1.0.96"
 tokio = { version = "1.27.0", features = ["full"] }
-dotenv_codegen = "0.15.0"
 async-trait = "0.1.68"
 discord = { path = "discord" }
 futures-util = "0.3.28"
 monostate = "0.1.6"
 ini = "1.3.0"
 rand = "0.8.5"
+dotenv = "0.15.0"
 
 [patch.crates-io]
 serde = { git = "https://github.com/Astavie/serde.git", branch = "integer-tags-for-enums-noprecompile" }

Cargo.toml

@@ -185,8 +185,8 @@ struct ConnectionProperties {
 
 #[derive(Deserialize, Debug)]
 pub struct Ready {
-    resume_gateway_url: String,
-    session_id: String,
+    _resume_gateway_url: String,
+    _session_id: String,
 }
 
 #[derive(Serialize, Debug)]

discord/src/gateway.rs

@@ -3,14 +3,14 @@
 #![feature(exhaustive_patterns)]
 #![feature(adt_const_params)]
 
-use std::println;
+use std::{env, println};
 
 use async_trait::async_trait;
 use discord::command::{Param, StringOption};
 use discord::interaction::{AnyInteraction, InteractionResource, MessageComponent, Webhook};
 use discord::request::Discord;
 use discord::user::{self, User};
-use dotenv_codegen::dotenv;
+use dotenv::dotenv;
 use futures_util::StreamExt;
 use game::{Flow, Game, GameMessage, GameUI, InteractionDispatcher, Logic};
 
@@ -28,9 +28,6 @@ use crate::cah::CAH;
 mod cah;
 mod game;
 
-const RUSTMASTER: &str = dotenv!("RUSTMASTER");
-const CARDMASTER: &str = dotenv!("CARDMASTER");
-
 async fn purge(commands: Commands, client: &Discord) -> Result<()> {
     if let Ok(commands) = commands.get(client).await {
         for command in commands {
@@ -105,8 +102,12 @@ impl Game for TestGame {
 }
 
 async fn run() -> Result<()> {
+    // load dotenv
+    dotenv().unwrap();
+    let token = env::var("CARDMASTER").expect("Bot token CARDMASTER must be set");
+
     // connect
-    let client = Discord::new(CARDMASTER);
+    let client = Discord::new(token);
     let application = application::Me.get(&client).await?;
 
     // list guilds