|
|
|
@ -1,18 +1,32 @@
|
|
|
|
|
|
|
|
use std::collections::HashSet;
|
|
|
|
use std::{fs::File, io::Read, collections::HashMap, path::Path};
|
|
|
|
use std::{fs::File, io::Read, collections::HashMap, path::Path};
|
|
|
|
|
|
|
|
|
|
|
|
use poise::serenity_prelude::Http;
|
|
|
|
use poise::serenity_prelude::Http;
|
|
|
|
use rusqlite::{Connection, params};
|
|
|
|
use r2d2::{Pool, PooledConnection};
|
|
|
|
|
|
|
|
use r2d2_sqlite::SqliteConnectionManager;
|
|
|
|
|
|
|
|
use r2d2_sqlite::rusqlite::{self, params};
|
|
|
|
|
|
|
|
use derive_more::From;
|
|
|
|
|
|
|
|
|
|
|
|
use crate::{utils::get_challenge_number, models::User};
|
|
|
|
use crate::{utils::get_challenge_number, models::User};
|
|
|
|
|
|
|
|
|
|
|
|
use super::{LegacySubmission, Submission};
|
|
|
|
use super::{LegacySubmission, Submission};
|
|
|
|
|
|
|
|
|
|
|
|
pub struct Database {
|
|
|
|
pub struct Database {
|
|
|
|
conn: Connection,
|
|
|
|
// Must be Arc because Connection contains RefCell,
|
|
|
|
|
|
|
|
// which cannot be shared between threads safely
|
|
|
|
|
|
|
|
connection_pool: Pool<SqliteConnectionManager>,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
const DATABASE_FILENAME: &str = "database.db";
|
|
|
|
const DATABASE_FILENAME: &str = "database.db";
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#[derive(From, Debug)]
|
|
|
|
|
|
|
|
pub enum DatabaseError {
|
|
|
|
|
|
|
|
Rusqlite(rusqlite::Error),
|
|
|
|
|
|
|
|
Pool(r2d2::Error),
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
type Result<T> = std::result::Result<T, DatabaseError>;
|
|
|
|
|
|
|
|
|
|
|
|
impl Database {
|
|
|
|
impl Database {
|
|
|
|
pub fn file_exists() -> bool {
|
|
|
|
pub fn file_exists() -> bool {
|
|
|
|
Path::new(DATABASE_FILENAME).exists()
|
|
|
|
Path::new(DATABASE_FILENAME).exists()
|
|
|
|
@ -20,12 +34,14 @@ impl Database {
|
|
|
|
|
|
|
|
|
|
|
|
pub fn new(
|
|
|
|
pub fn new(
|
|
|
|
testing: bool,
|
|
|
|
testing: bool,
|
|
|
|
) -> rusqlite::Result<Self> {
|
|
|
|
) -> Result<Self> {
|
|
|
|
let conn = if testing {
|
|
|
|
let connection_manager = if testing {
|
|
|
|
Connection::open_in_memory()
|
|
|
|
SqliteConnectionManager::memory()
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
Connection::open(DATABASE_FILENAME)
|
|
|
|
SqliteConnectionManager::file(DATABASE_FILENAME)
|
|
|
|
}?;
|
|
|
|
};
|
|
|
|
|
|
|
|
let connection_pool = Pool::new(connection_manager)?;
|
|
|
|
|
|
|
|
let conn = connection_pool.get()?;
|
|
|
|
conn.execute(
|
|
|
|
conn.execute(
|
|
|
|
"CREATE TABLE IF NOT EXISTS Submission (
|
|
|
|
"CREATE TABLE IF NOT EXISTS Submission (
|
|
|
|
id INTEGER PRIMARY KEY,
|
|
|
|
id INTEGER PRIMARY KEY,
|
|
|
|
@ -46,21 +62,26 @@ impl Database {
|
|
|
|
)",
|
|
|
|
)",
|
|
|
|
params![],
|
|
|
|
params![],
|
|
|
|
)?;
|
|
|
|
)?;
|
|
|
|
Ok(Self { conn })
|
|
|
|
Ok(Self { connection_pool })
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
pub fn has_submitted(&self, user_id: u64) -> rusqlite::Result<bool> {
|
|
|
|
fn conn(&self) -> std::result::Result<PooledConnection<SqliteConnectionManager>, r2d2::Error> {
|
|
|
|
Ok(self.conn
|
|
|
|
self.connection_pool.get()
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
pub fn has_submitted(&self, user_id: u64) -> Result<bool> {
|
|
|
|
|
|
|
|
Ok(self.conn()?
|
|
|
|
.prepare("SELECT 1 FROM User WHERE id = ?1 LIMIT 1")?
|
|
|
|
.prepare("SELECT 1 FROM User WHERE id = ?1 LIMIT 1")?
|
|
|
|
.query_row(params![user_id], |_row| Ok(()))
|
|
|
|
.query_row(params![user_id], |_row| Ok(()))
|
|
|
|
.is_ok())
|
|
|
|
.is_ok())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
pub async fn load_legacy(&self, http: &Http) -> rusqlite::Result<()> {
|
|
|
|
pub async fn load_legacy(&self, http: &Http) -> Result<()> {
|
|
|
|
let latest_challenge = get_challenge_number();
|
|
|
|
let latest_challenge = get_challenge_number();
|
|
|
|
// HashMap of archived users that are no longer sharing a server with 字ちゃん
|
|
|
|
// HashMap of archived users that are no longer sharing a server with 字ちゃん
|
|
|
|
// Their historical usernames and discriminators will be used
|
|
|
|
// Their historical usernames and discriminators will be used
|
|
|
|
let mut archived_users = HashMap::new();
|
|
|
|
let mut archived_users = HashMap::new();
|
|
|
|
|
|
|
|
let conn = self.conn()?;
|
|
|
|
for n in 1..=latest_challenge {
|
|
|
|
for n in 1..=latest_challenge {
|
|
|
|
println!("Loading legacy challenge {n}/{latest_challenge}...");
|
|
|
|
println!("Loading legacy challenge {n}/{latest_challenge}...");
|
|
|
|
let mut file = File::open(format!("data/challenges/{n}.json")).unwrap();
|
|
|
|
let mut file = File::open(format!("data/challenges/{n}.json")).unwrap();
|
|
|
|
@ -72,7 +93,7 @@ impl Database {
|
|
|
|
.map(|legacy| (legacy, legacy.parse().unwrap())) {
|
|
|
|
.map(|legacy| (legacy, legacy.parse().unwrap())) {
|
|
|
|
let mut already_updated = false;
|
|
|
|
let mut already_updated = false;
|
|
|
|
for submission in submissions {
|
|
|
|
for submission in submissions {
|
|
|
|
self.conn.execute(
|
|
|
|
conn.execute(
|
|
|
|
"INSERT INTO Submission(author_id, timestamp, image, challenge) VALUES (?1, ?2, ?3, ?4)",
|
|
|
|
"INSERT INTO Submission(author_id, timestamp, image, challenge) VALUES (?1, ?2, ?3, ?4)",
|
|
|
|
params![
|
|
|
|
params![
|
|
|
|
&submission.author_id,
|
|
|
|
&submission.author_id,
|
|
|
|
@ -120,7 +141,7 @@ impl Database {
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
match User::fetch(http, submission.author_id).await {
|
|
|
|
match User::fetch(http, submission.author_id).await {
|
|
|
|
Ok(user) => {
|
|
|
|
Ok(user) => {
|
|
|
|
self.conn.execute(
|
|
|
|
conn.execute(
|
|
|
|
"INSERT INTO User(id, name, discriminator, avatar) VALUES (?1, ?2, ?3, ?4)",
|
|
|
|
"INSERT INTO User(id, name, discriminator, avatar) VALUES (?1, ?2, ?3, ?4)",
|
|
|
|
params![user.id, user.name, user.discriminator, user.avatar]
|
|
|
|
params![user.id, user.name, user.discriminator, user.avatar]
|
|
|
|
)?;
|
|
|
|
)?;
|
|
|
|
@ -138,6 +159,51 @@ impl Database {
|
|
|
|
Ok(())
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
pub fn get_challenge_user_data(&self, challenge: u32) -> Result<(Vec<Submission>, HashMap<String, User>)> {
|
|
|
|
|
|
|
|
let submissions = self.get_submissions(challenge)?;
|
|
|
|
|
|
|
|
let users = self.get_users({
|
|
|
|
|
|
|
|
let mut user_ids = HashSet::new();
|
|
|
|
|
|
|
|
for submission in &submissions {
|
|
|
|
|
|
|
|
user_ids.insert(submission.author_id);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
user_ids
|
|
|
|
|
|
|
|
})?;
|
|
|
|
|
|
|
|
Ok((submissions, users))
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
pub fn get_submissions(&self, challenge: u32) -> Result<Vec<Submission>> {
|
|
|
|
|
|
|
|
Ok(self.conn()?
|
|
|
|
|
|
|
|
.prepare("SELECT author_id, timestamp, image FROM Submission WHERE challenge = ?1")?
|
|
|
|
|
|
|
|
.query_map(params![challenge], |row| {
|
|
|
|
|
|
|
|
Ok(Submission {
|
|
|
|
|
|
|
|
author_id: row.get(0)?,
|
|
|
|
|
|
|
|
timestamp: row.get(1)?,
|
|
|
|
|
|
|
|
image: row.get(2)?,
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
})?
|
|
|
|
|
|
|
|
.collect::<std::result::Result<Vec<Submission>, rusqlite::Error>>()?)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
fn get_users(&self, users: HashSet<u64>) -> Result<HashMap<String, User>> {
|
|
|
|
|
|
|
|
let conn = self.conn()?;
|
|
|
|
|
|
|
|
// Not sure why derive_more::From is unable to convert these errors
|
|
|
|
|
|
|
|
users
|
|
|
|
|
|
|
|
.iter()
|
|
|
|
|
|
|
|
// u64 must be converted to String for templates
|
|
|
|
|
|
|
|
.filter_map(|id| -> Option<Result<(String, User)>> {
|
|
|
|
|
|
|
|
match conn.prepare("SELECT name, discriminator, avatar FROM User WHERE id = ?1") {
|
|
|
|
|
|
|
|
Ok(mut statement) => Some(statement.query_row(params![id], |row| Ok((id.to_string(), User {
|
|
|
|
|
|
|
|
id: *id,
|
|
|
|
|
|
|
|
name: row.get(0)?,
|
|
|
|
|
|
|
|
discriminator: row.get(1)?,
|
|
|
|
|
|
|
|
avatar: row.get(2)?,
|
|
|
|
|
|
|
|
}))).map_err(|error| DatabaseError::Rusqlite(error))),
|
|
|
|
|
|
|
|
Err(error) => Some(Err(DatabaseError::Rusqlite(error))),
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
.collect()
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#[allow(dead_code)]
|
|
|
|
#[allow(dead_code)]
|
|
|
|
pub fn refresh_users(&self) -> rusqlite::Result<()> {
|
|
|
|
pub fn refresh_users(&self) -> rusqlite::Result<()> {
|
|
|
|
// Periodically refresh all changable user data (name, discriminator, avatar)
|
|
|
|
// Periodically refresh all changable user data (name, discriminator, avatar)
|
|
|
|
|
