diff --git a/Cargo.lock b/Cargo.lock index bbeec18..19d01c0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2005,9 +2005,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.119" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8eddb61f0697cc3989c5d64b452f5488e2b8a60fd7d5076a3045076ffef8cb0" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -2842,15 +2842,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" -[[package]] -name = "uuid" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" -dependencies = [ - "getrandom", -] - [[package]] name = "vcpkg" version = "0.2.15" @@ -3187,18 +3178,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", @@ -3226,5 +3217,4 @@ dependencies = [ "sqlx", "tokio", "tracing", - "uuid", ] diff --git a/Cargo.toml b/Cargo.toml index 147dadf..891ae74 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,5 +16,4 @@ regex = "1.10.4" sqlx = { version = "0.7.4" , features = ["sqlite", "sqlx-sqlite", "runtime-tokio"]} reqwest = { version = "0.12.5" } serde = { version = "1.0.203", features = ["derive"] } -serde_json = { version = "1.0.119" } -uuid = { version = "1.9.1", features = ["v4"] } +serde_json = { version = "1.0.119" } \ No newline at end of file diff --git a/src/commands/account.rs b/src/commands/account.rs index 94ab3bc..f6d6fd3 100644 --- a/src/commands/account.rs +++ b/src/commands/account.rs @@ -2,7 +2,7 @@ use poise::CreateReply; use serde::{Deserialize, Serialize}; use serenity::all::{ChannelId, CreateMessage, User}; use serenity::builder::CreateAllowedMentions; -use sqlx::{query_as, Executor, Pool, Sqlite}; +use sqlx::{query_as, Pool, Sqlite}; use crate::{Context, Error}; #[poise::command(slash_command, subcommands("add", "list"))] diff --git a/src/commands/lfg.rs b/src/commands/lfg.rs index 05e44d1..2922fe4 100644 --- a/src/commands/lfg.rs +++ b/src/commands/lfg.rs @@ -1,5 +1,5 @@ use poise::{ChoiceParameter, CreateReply}; -use serenity::all::{CreateAllowedMentions, GuildId, RoleId}; +use serenity::all::{CreateAllowedMentions, RoleId}; //from main.rs use crate::commands::command_helper::cooldown; diff --git a/src/main.rs b/src/main.rs index 525b6f1..dec0086 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,15 +2,14 @@ use std::collections::HashSet; use std::convert::Into; -use std::future::Future; use std::sync::Arc; use std::time::Duration; use poise::serenity_prelude as serenity; -use serenity::{client::EventHandler, FullEvent, model::id::UserId}; +use serenity::{FullEvent, model::id::UserId}; use serenity::all::{ActivityData, RoleId}; use serenity::prelude::GatewayIntents; -use sqlx::{Acquire, ConnectOptions, Executor, Sqlite}; +use sqlx::{Sqlite}; use tokio::sync::RwLock; mod commands; @@ -22,8 +21,6 @@ struct Data { } // User data, which is stored and accessible in all command invocations type Error = Box; type Context<'a> = poise::Context<'a, Data, Error>; -struct ReadyHandler; - #[tokio::main] async fn main() { let sqlite_pool = sqlx::sqlite::SqlitePoolOptions::new() @@ -89,12 +86,11 @@ async fn main() { let token = std::env::var("DISCORD_TOKEN").unwrap(); let intents = GatewayIntents::non_privileged() | GatewayIntents::MESSAGE_CONTENT | GatewayIntents::GUILD_MEMBERS; - let client = serenity::ClientBuilder::new(token, intents) .framework(framework) .activity(ActivityData::playing("arcade_zombies_prison")) .await; - client.unwrap().start().await.unwrap() + client.unwrap().start_autosharded().await.unwrap() } async fn event_handler( ctx: &serenity::Context,