diff --git a/.gitignore b/.gitignore index ac95708..a7e99c9 100644 --- a/.gitignore +++ b/.gitignore @@ -24,4 +24,4 @@ rust-project.json # End of https://www.toptal.com/developers/gitignore/api/rust,rust-analyzer -*.db* +*.db diff --git a/Cargo.lock b/Cargo.lock index b8388a2..c88ad20 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -36,7 +36,6 @@ dependencies = [ "async-minecraft-ping", "chrono", "diesel", - "diesel_migrations", "poise", "tokio", "uuid", @@ -423,7 +422,6 @@ checksum = "72eb77396836a4505da85bae0712fa324b74acfe1876d7c2f7e694ef3d0ee373" dependencies = [ "diesel_derives", "libsqlite3-sys", - "r2d2", ] [[package]] @@ -438,17 +436,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "diesel_migrations" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9ae22beef5e9d6fab9225ddb073c1c6c1a7a6ded5019d5da11d1e5c5adc34e2" -dependencies = [ - "diesel", - "migrations_internals", - "migrations_macros", -] - [[package]] name = "digest" version = "0.10.6" @@ -879,27 +866,6 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" -[[package]] -name = "migrations_internals" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c493c09323068c01e54c685f7da41a9ccf9219735c3766fbfd6099806ea08fbc" -dependencies = [ - "serde", - "toml", -] - -[[package]] -name = "migrations_macros" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a8ff27a350511de30cdabb77147501c36ef02e0451d957abea2f30caffb2b58" -dependencies = [ - "migrations_internals", - "proc-macro2", - "quote", -] - [[package]] name = "mime" version = "0.3.17" @@ -1107,17 +1073,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "r2d2" -version = "0.8.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93" -dependencies = [ - "log", - "parking_lot", - "scheduled-thread-pool", -] - [[package]] name = "rand" version = "0.8.5" @@ -1276,15 +1231,6 @@ version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" -[[package]] -name = "scheduled-thread-pool" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19" -dependencies = [ - "parking_lot", -] - [[package]] name = "scopeguard" version = "1.1.0" @@ -1608,15 +1554,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - [[package]] name = "tower-service" version = "0.3.2" diff --git a/Cargo.toml b/Cargo.toml index cde15dc..a4d6e6f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,5 +22,4 @@ chrono = "*" uuid = "*" poise = "0.5.5" async-minecraft-ping = "0.8.0" -diesel = { version = "2.0.4", features = ["sqlite", "returning_clauses_for_sqlite_3_35", "r2d2"] } -diesel_migrations = { version = "2.0.0", features = [ "sqlite" ] } +diesel = { version = "2.0.4", features = ["sqlite", "returning_clauses_for_sqlite_3_35"] } diff --git a/migrations/.keep b/migrations/.keep new file mode 100644 index 0000000..e69de29 diff --git a/migrations/2023-05-15-142901_create_users/up.sql b/migrations/2023-05-15-142901_create_users/up.sql index b1ec088..e5148b3 100644 --- a/migrations/2023-05-15-142901_create_users/up.sql +++ b/migrations/2023-05-15-142901_create_users/up.sql @@ -1,11 +1,7 @@ -- Your SQL goes here CREATE TABLE users ( - id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, - discord_id UNSIGNED BIG INT NOT NULL, - guild_id UNSIGNED BIG INT NOT NULL, + discord_id UNSIGNED BIG INT PRIMARY KEY NOT NULL, email TEXT UNIQUE NOT NULL, first_name TEXT NOT NULL, - last_name TEXT NOT NULL, - - UNIQUE(discord_id, guild_id) + last_name TEXT NOT NULL ); diff --git a/src/build.rs b/src/build.rs deleted file mode 100644 index 508b53c..0000000 --- a/src/build.rs +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - println!("cargo:rerun-if-changed=migrations"); -} diff --git a/src/commands/users.rs b/src/commands/users.rs index f552787..df0e7e6 100644 --- a/src/commands/users.rs +++ b/src/commands/users.rs @@ -1,6 +1,5 @@ -use crate::db::users::{NewUser, User}; +use crate::db::users::{user_all, user_insert, User}; use crate::{Context, Error}; -use diesel::RunQueryDsl; #[poise::command(prefix_command, slash_command)] pub async fn register( @@ -9,33 +8,16 @@ pub async fn register( last_name: String, email: String, ) -> Result<(), Error> { - if let Some(guild_id) = ctx.guild_id() { - let discord_id = ctx.author().id.0 as i64; + let user = User { + discord_id: ctx.author().id.0 as i64, + first_name, + last_name, + email, + }; - { - let mut conn = ctx.data().pool.get()?; - - if User::get(&mut conn, guild_id.into(), discord_id)?.is_some() { - ctx.say("You've already been registered.").await?; - - return Ok(()); - } - - let new_user = NewUser { - discord_id, - guild_id: guild_id.into(), - first_name, - last_name, - email, - }; - - new_user.insert(&mut conn)?; - } - - ctx.say("You have been registered.").await?; - } else { - ctx.say("You have to send this message from a guild.") - .await?; + { + let mut conn = ctx.data().conn.lock().unwrap(); + user_insert(&mut conn, &user); } Ok(()) @@ -43,25 +25,21 @@ pub async fn register( #[poise::command(prefix_command, slash_command)] pub async fn registered(ctx: Context<'_>) -> Result<(), Error> { - if let Some(guild_id) = ctx.guild_id() { - let users = { - let mut conn = ctx.data().pool.get()?; - User::by_guild_id(guild_id.into()).load(&mut conn)? - }; + let users = { + let mut conn = ctx.data().conn.lock().unwrap(); + user_all(&mut conn) + }; - ctx.send(|f| { - f.embed(|e| { - e.description("Registered users").fields( - users - .into_iter() - .map(|u| (format!("{} {}", u.first_name, u.last_name), u.email, false)), - ) - }) + ctx.send(|f| { + f.embed(|e| { + e.description("Registered users").fields( + users + .into_iter() + .map(|u| (format!("{} {}", u.first_name, u.last_name), u.email, false)), + ) }) - .await?; - } else { - ctx.say("You are not in a guild.").await?; - } + }) + .await?; Ok(()) } diff --git a/src/db/mod.rs b/src/db/mod.rs index 578506e..aa8f28e 100644 --- a/src/db/mod.rs +++ b/src/db/mod.rs @@ -1,43 +1,2 @@ mod schema; pub mod users; - -use diesel::connection::SimpleConnection; -use diesel::r2d2::{ConnectionManager, Pool}; -use diesel::sqlite::{Sqlite, SqliteConnection}; -use std::error::Error; - -use diesel_migrations::{embed_migrations, EmbeddedMigrations, MigrationHarness}; -pub const MIGRATIONS: EmbeddedMigrations = embed_migrations!("migrations"); - -type DbError = Box; - -fn run_migrations(connection: &mut impl MigrationHarness) -> Result<(), DbError> { - // This will run the necessary migrations. - // - // See the documentation for `MigrationHarness` for - // all available methods. - connection.run_pending_migrations(MIGRATIONS)?; - - Ok(()) -} - -fn initialize_db(conn: &mut SqliteConnection) -> Result<(), DbError> { - // Enable WAL mode and enforce foreign keys - conn.batch_execute( - "PRAGMA journal_mode = WAL; PRAGMA synchronous = NORMAL; PRAGMA foreign_keys = ON;", - )?; - run_migrations(conn)?; - - Ok(()) -} - -pub fn initialize_pool(url: &str) -> Result>, DbError> { - let manager = ConnectionManager::new(url); - - let pool = Pool::builder().test_on_check_out(true).build(manager)?; - - let mut conn = pool.get()?; - initialize_db(&mut conn)?; - - Ok(pool) -} diff --git a/src/db/schema.rs b/src/db/schema.rs index e43eb3e..f50726b 100644 --- a/src/db/schema.rs +++ b/src/db/schema.rs @@ -1,10 +1,8 @@ // @generated automatically by Diesel CLI. diesel::table! { - users (id) { - id -> Integer, + users (discord_id) { discord_id -> BigInt, - guild_id -> BigInt, email -> Text, first_name -> Text, last_name -> Text, diff --git a/src/db/users.rs b/src/db/users.rs index e87f0b9..17040b0 100644 --- a/src/db/users.rs +++ b/src/db/users.rs @@ -1,79 +1,22 @@ -use super::schema::users::{self, dsl::*}; -use diesel::dsl::Eq; -use diesel::dsl::{AsSelect, Select}; -use diesel::helper_types::Filter; +use super::schema::users; use diesel::prelude::*; -use diesel::sqlite::Sqlite; use diesel::sqlite::SqliteConnection; -#[derive(Queryable, Selectable, AsChangeset)] -#[diesel(table_name = users)] +#[derive(Queryable, Insertable)] pub struct User { - pub id: i32, pub discord_id: i64, - pub guild_id: i64, pub email: String, pub first_name: String, pub last_name: String, } -#[derive(Insertable)] -#[diesel(table_name = users)] -pub struct NewUser { - pub discord_id: i64, - pub guild_id: i64, - pub email: String, - pub first_name: String, - pub last_name: String, +pub fn user_insert(conn: &mut SqliteConnection, user: &User) -> User { + diesel::insert_into(users::table) + .values(user) + .get_result(conn) + .expect("fuck") } -type All = Select>; -type WithGuild = Eq; -type ByGuild = Filter>; - -impl User { - pub fn all() -> All { - users::table.select(User::as_select()) - } - - // pub fn by_guild(guild_id_: T) -> ByGuild - // where T: AsExpression - // { - // Self::all().filter(guild_id.eq(guild_id_)) - // } - - pub fn by_guild_id(guild_id_: i64) -> ByGuild { - Self::all().filter(guild_id.eq(guild_id_)) - } - - pub fn get( - conn: &mut SqliteConnection, - guild_id_: i64, - discord_id_: i64, - ) -> Result, diesel::result::Error> { - Self::all() - .filter(guild_id.eq(guild_id_)) - .filter(discord_id.eq(discord_id_)) - .first(conn) - .optional() - } - - pub fn get_by_id( - conn: &mut SqliteConnection, - id_: i32, - ) -> Result, diesel::result::Error> { - Self::all().find(id_).first(conn).optional() - } - - pub fn update(&self, conn: &mut SqliteConnection) -> Result { - diesel::update(users::table).set(self).execute(conn) - } -} - -impl NewUser { - pub fn insert(&self, conn: &mut SqliteConnection) -> Result { - diesel::insert_into(users::table) - .values(self) - .get_result(conn) - } +pub fn user_all(conn: &mut SqliteConnection) -> Vec { + users::table.load::(conn).expect("nou") } diff --git a/src/main.rs b/src/main.rs index 6328584..e4364d8 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,9 +2,9 @@ mod commands; mod db; use affluences_api::AffluencesClient; -use diesel::r2d2::{ConnectionManager, Pool}; -use diesel::sqlite::SqliteConnection; +use diesel::Connection; use poise::serenity_prelude as serenity; +use std::sync::Mutex; use std::{env::var, time::Duration}; // Types used by all command functions @@ -14,7 +14,7 @@ type Context<'a> = poise::Context<'a, Data, Error>; // Custom user data passed to all command functions pub struct Data { client: AffluencesClient, - pool: Pool>, + conn: Mutex, } async fn on_error(error: poise::FrameworkError<'_, Data, Error>) { @@ -84,8 +84,6 @@ async fn main() { ..Default::default() }; - let pool = db::initialize_pool("affy.db").expect("Failed to initialize database."); - poise::Framework::builder() .token( var("DISCORD_TOKEN") @@ -97,7 +95,9 @@ async fn main() { poise::builtins::register_globally(ctx, &framework.options().commands).await?; Ok(Data { client: AffluencesClient::new(), - pool, + conn: Mutex::new( + diesel::sqlite::SqliteConnection::establish("affy.db").unwrap(), + ), }) }) })