reidlab/gdps-server
reidlab/gdps-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rework some imports

Browse source
This commit is contained in:
Reid 2023-10-17 17:25:56 -07:00
parent 7024a1fa28
commit a5cac129dd
Signed by: reidlab
GPG key ID: 6C9EAA3364F962C8
13 changed files with 41 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/endpoints/accounts/login_account.rs
View file

@ -40,7 +40,7 @@ pub fn login_account(input: Form<FromLoginAccount>) -> status::Custom<&'static s
// account verification // account verification
{ {
use crate::schema::accounts::dsl::*; use db::schema::accounts::dsl::*;
let query_result = accounts let query_result = accounts
.select(id) .select(id)

10
src/endpoints/accounts/register_account.rs
View file

@ -47,12 +47,12 @@ pub fn register_account(input: Form<FormRegisterAccount>) -> status::Custom<&'st
} }
// account management // account management
use crate::models::{Account, NewAccount}; use db::models::{Account, NewAccount};
let inserted_account: Account; let inserted_account: Account;
{ {
use crate::schema::accounts::dsl::*; use db::schema::accounts::dsl::*;
let account_name_usage = accounts.filter(username.eq(input.userName.clone())).count().get_result::<i64>(connection) as Result<i64, Error>; let account_name_usage = accounts.filter(username.eq(input.userName.clone())).count().get_result::<i64>(connection) as Result<i64, Error>;
let account_name_used = account_name_usage.expect("database name query error") != 0; let account_name_used = account_name_usage.expect("database name query error") != 0;
@ -74,10 +74,10 @@ pub fn register_account(input: Form<FormRegisterAccount>) -> status::Custom<&'st
} }
// user management // user management
use crate::models::{User, NewUser};
{ {
use crate::schema::users::dsl::*; use db::models::{User, NewUser};
use db::schema::users::dsl::*;
let new_user = NewUser { let new_user = NewUser {
account_id: inserted_account.id, account_id: inserted_account.id,

6
src/endpoints/accounts/update_account_settings.rs
View file

@ -39,10 +39,10 @@ pub fn update_account_settings(input: Form<FormUpdateAccountSettings>) -> status
Err(_) => return status::Custom(Status::Ok, "-1") Err(_) => return status::Custom(Status::Ok, "-1")
}; };
use crate::models::Account;
{ {
use crate::schema::accounts::dsl::*; use db::models::Account;
use db::schema::accounts::dsl::*;
diesel::update(accounts) diesel::update(accounts)
.filter(id.eq(account_id_val)) .filter(id.eq(account_id_val))

5
src/endpoints/levels/download_level.rs
View file

@ -27,9 +27,8 @@ pub struct FormDownloadLevel {
pub fn download_level(input: Form<FormDownloadLevel>) -> status::Custom<&'static str> { pub fn download_level(input: Form<FormDownloadLevel>) -> status::Custom<&'static str> {
let connection = &mut db::establish_connection_pg(); let connection = &mut db::establish_connection_pg();
use crate::schema::{levels, users}; use db::schema::{levels, users};
use db::models::{Level, User};
use crate::models::{Level, User};
let mut response: Vec<String> = Vec::new(); let mut response: Vec<String> = Vec::new();

32
src/endpoints/levels/get_levels.rs
View file

@ -44,8 +44,8 @@ pub struct FormGetLevels {
pub fn get_levels(input: Form<FormGetLevels>) -> status::Custom<&'static str> { pub fn get_levels(input: Form<FormGetLevels>) -> status::Custom<&'static str> {
let connection = &mut db::establish_connection_pg(); let connection = &mut db::establish_connection_pg();
use crate::schema::{levels, users}; use db::schema::{levels, users};
use crate::models::{Level, User}; use db::models::{Level, User};
let mut can_see_unlisted = false; let mut can_see_unlisted = false;
@ -145,35 +145,35 @@ pub fn get_levels(input: Form<FormGetLevels>) -> status::Custom<&'static str> {
Some(demon_filter) => { Some(demon_filter) => {
match demon_filter { match demon_filter {
1 => { 1 => {
query = query.filter(levels::demon_difficulty.eq::<i32>(crate::difficulty::DemonDifficulty::Easy.to_demon_difficulty())); query = query.filter(levels::demon_difficulty.eq::<i32>(helpers::difficulty::DemonDifficulty::Easy.to_demon_difficulty()));
count_query = count_query.filter(levels::demon_difficulty.eq::<i32>(crate::difficulty::DemonDifficulty::Easy.to_demon_difficulty())) count_query = count_query.filter(levels::demon_difficulty.eq::<i32>(helpers::difficulty::DemonDifficulty::Easy.to_demon_difficulty()))
}, },
2 => { 2 => {
query = query.filter(levels::demon_difficulty.eq::<i32>(crate::difficulty::DemonDifficulty::Medium.to_demon_difficulty())); query = query.filter(levels::demon_difficulty.eq::<i32>(helpers::difficulty::DemonDifficulty::Medium.to_demon_difficulty()));
count_query = count_query.filter(levels::demon_difficulty.eq::<i32>(crate::difficulty::DemonDifficulty::Medium.to_demon_difficulty())) count_query = count_query.filter(levels::demon_difficulty.eq::<i32>(helpers::difficulty::DemonDifficulty::Medium.to_demon_difficulty()))
}, },
3 => { 3 => {
query = query.filter(levels::demon_difficulty.eq::<i32>(crate::difficulty::DemonDifficulty::Hard.to_demon_difficulty())); query = query.filter(levels::demon_difficulty.eq::<i32>(helpers::difficulty::DemonDifficulty::Hard.to_demon_difficulty()));
count_query = count_query.filter(levels::demon_difficulty.eq::<i32>(crate::difficulty::DemonDifficulty::Hard.to_demon_difficulty())) count_query = count_query.filter(levels::demon_difficulty.eq::<i32>(helpers::difficulty::DemonDifficulty::Hard.to_demon_difficulty()))
}, },
4 => { 4 => {
query = query.filter(levels::demon_difficulty.eq::<i32>(crate::difficulty::DemonDifficulty::Insane.to_demon_difficulty())); query = query.filter(levels::demon_difficulty.eq::<i32>(helpers::difficulty::DemonDifficulty::Insane.to_demon_difficulty()));
count_query = count_query.filter(levels::demon_difficulty.eq::<i32>(crate::difficulty::DemonDifficulty::Insane.to_demon_difficulty())) count_query = count_query.filter(levels::demon_difficulty.eq::<i32>(helpers::difficulty::DemonDifficulty::Insane.to_demon_difficulty()))
}, },
5 => { 5 => {
query = query.filter(levels::demon_difficulty.eq::<i32>(crate::difficulty::DemonDifficulty::Extreme.to_demon_difficulty())); query = query.filter(levels::demon_difficulty.eq::<i32>(helpers::difficulty::DemonDifficulty::Extreme.to_demon_difficulty()));
count_query = count_query.filter(levels::demon_difficulty.eq::<i32>(crate::difficulty::DemonDifficulty::Extreme.to_demon_difficulty())) count_query = count_query.filter(levels::demon_difficulty.eq::<i32>(helpers::difficulty::DemonDifficulty::Extreme.to_demon_difficulty()))
}, },
_ => panic!("invalid demon filter!") _ => panic!("invalid demon filter!")
} }
query = query.filter(diesel::BoolExpressionMethods::or(levels::difficulty.eq::<i32>(crate::difficulty::LevelDifficulty::Demon.to_star_difficulty()), levels::difficulty.is_null().and(levels::community_difficulty.eq::<i32>(crate::difficulty::LevelDifficulty::Demon.to_star_difficulty())))); query = query.filter(diesel::BoolExpressionMethods::or(levels::difficulty.eq::<i32>(helpers::difficulty::LevelDifficulty::Demon.to_star_difficulty()), levels::difficulty.is_null().and(levels::community_difficulty.eq::<i32>(helpers::difficulty::LevelDifficulty::Demon.to_star_difficulty()))));
count_query = count_query.filter(diesel::BoolExpressionMethods::or(levels::difficulty.eq::<i32>(crate::difficulty::LevelDifficulty::Demon.to_star_difficulty()), levels::difficulty.is_null().and(levels::community_difficulty.eq::<i32>(crate::difficulty::LevelDifficulty::Demon.to_star_difficulty())))) count_query = count_query.filter(diesel::BoolExpressionMethods::or(levels::difficulty.eq::<i32>(helpers::difficulty::LevelDifficulty::Demon.to_star_difficulty()), levels::difficulty.is_null().and(levels::community_difficulty.eq::<i32>(helpers::difficulty::LevelDifficulty::Demon.to_star_difficulty()))))
}, },
None => panic!("demon filter option with no demon filter argument") None => panic!("demon filter option with no demon filter argument")
}, },
"-3" => { "-3" => {
query = query.filter(diesel::BoolExpressionMethods::or(levels::difficulty.eq::<i32>(crate::difficulty::LevelDifficulty::Auto.to_star_difficulty()), levels::difficulty.is_null().and(levels::community_difficulty.eq::<i32>(crate::difficulty::LevelDifficulty::Auto.to_star_difficulty())))); query = query.filter(diesel::BoolExpressionMethods::or(levels::difficulty.eq::<i32>(helpers::difficulty::LevelDifficulty::Auto.to_star_difficulty()), levels::difficulty.is_null().and(levels::community_difficulty.eq::<i32>(helpers::difficulty::LevelDifficulty::Auto.to_star_difficulty()))));
count_query = count_query.filter(diesel::BoolExpressionMethods::or(levels::difficulty.eq::<i32>(crate::difficulty::LevelDifficulty::Auto.to_star_difficulty()), levels::difficulty.is_null().and(levels::community_difficulty.eq::<i32>(crate::difficulty::LevelDifficulty::Auto.to_star_difficulty())))) count_query = count_query.filter(diesel::BoolExpressionMethods::or(levels::difficulty.eq::<i32>(helpers::difficulty::LevelDifficulty::Auto.to_star_difficulty()), levels::difficulty.is_null().and(levels::community_difficulty.eq::<i32>(helpers::difficulty::LevelDifficulty::Auto.to_star_difficulty()))))
}, },
// easy, normal, hard, harder, insane // easy, normal, hard, harder, insane
_ => { _ => {

6
src/endpoints/levels/upload_level.rs
View file

@ -113,10 +113,10 @@ pub fn upload_level(input: Form<FormUploadLevel>) -> status::Custom<&'static str
} }
// data base 🤣😁 // data base 🤣😁
use crate::models::{Level, NewLevel};
{ {
use crate::schema::levels::dsl::*; use db::models::{Level, NewLevel};
use db::schema::levels::dsl::*;
if levels if levels
.filter(id.eq(input.levelID)) .filter(id.eq(input.levelID))

4
src/endpoints/users/get_users.rs
View file

@ -18,8 +18,8 @@ pub fn get_users(input: Form<FormGetUsers>) -> status::Custom<&'static str> {
let connection = &mut db::establish_connection_pg(); let connection = &mut db::establish_connection_pg();
// query users // query users
use crate::schema::users::dsl::*; use db::schema::users::dsl::*;
use crate::models::User; use db::models::User;
let mut query_users = users.into_boxed(); let mut query_users = users.into_boxed();

4
src/helpers/accounts.rs
View file

@ -10,7 +10,7 @@ pub enum AuthError {
} }
pub fn auth(account_id: i32, password_val: Option<String>, gjp_val: Option<String>, gjp2_val: Option<String>) -> Result<(i32, i32), AuthError> { pub fn auth(account_id: i32, password_val: Option<String>, gjp_val: Option<String>, gjp2_val: Option<String>) -> Result<(i32, i32), AuthError> {
use crate::schema::accounts::dsl::*; use db::schema::accounts::dsl::*;
let connection = &mut db::establish_connection_pg(); let connection = &mut db::establish_connection_pg();
@ -57,7 +57,7 @@ pub fn auth(account_id: i32, password_val: Option<String>, gjp_val: Option<Strin
} }
pub fn get_user_id_from_account_id(ext_id: i32) -> i32 { pub fn get_user_id_from_account_id(ext_id: i32) -> i32 {
use crate::schema::users::dsl::*; use db::schema::users::dsl::*;
let connection = &mut db::establish_connection_pg(); let connection = &mut db::establish_connection_pg();

4
src/helpers/reupload.rs
View file

@ -11,8 +11,8 @@ pub static REUPLOAD_ACCOUNT_ID: RwLock<i32> = RwLock::new(0);
pub fn init() { pub fn init() {
let connection = &mut db::establish_connection_pg(); let connection = &mut db::establish_connection_pg();
use crate::schema::{accounts, users}; use db::schema::{accounts, users};
use crate::models::{Account, NewAccount, User, NewUser}; use db::models::{Account, NewAccount, User, NewUser};
match accounts::table match accounts::table
.filter(accounts::username.eq(REUPLOAD_USER_NAME)) .filter(accounts::username.eq(REUPLOAD_USER_NAME))

9
src/main.rs
View file

@ -13,19 +13,10 @@ use rocket::data::{Limits, ToByteUnit};
use rocket_dyn_templates::Template; use rocket_dyn_templates::Template;
mod db; mod db;
use db::*;
mod helpers; mod helpers;
use helpers::*;
mod endpoints; mod endpoints;
use endpoints::*;
mod template_endpoints; mod template_endpoints;
use template_endpoints::*;
mod config; mod config;
use config::*;
#[get("/<file..>")] #[get("/<file..>")]
async fn files(file: PathBuf) -> Option<NamedFile> { async fn files(file: PathBuf) -> Option<NamedFile> {

4
src/template_endpoints/account_management.rs
View file

@ -16,8 +16,8 @@ pub fn account_management(cookies: &CookieJar<'_>) -> Result<Template, Redirect>
match logged_in { match logged_in {
Ok((username_val, _account_id_val, user_id_val)) => { Ok((username_val, _account_id_val, user_id_val)) => {
use crate::schema::users::dsl::*; use db::schema::users::dsl::*;
use crate::models::User; use db::models::User;
let result = users let result = users
.filter(id.eq(user_id_val)) .filter(id.eq(user_id_val))

2
src/template_endpoints/login.rs
View file

@ -23,7 +23,7 @@ pub struct FormLogin {
pub fn post_login(cookies: &CookieJar<'_>, input: Form<FormLogin>) -> Template { pub fn post_login(cookies: &CookieJar<'_>, input: Form<FormLogin>) -> Template {
let connection = &mut db::establish_connection_pg(); let connection = &mut db::establish_connection_pg();
use crate::schema::accounts::dsl::*; use db::schema::accounts::dsl::*;
let result = accounts let result = accounts
.select((id, username)) .select((id, username))

4
src/template_endpoints/reupload.rs
View file

@ -71,8 +71,8 @@ pub async fn post_reupload(input: Form<FormReupload>) -> Template {
let gmd_file = reqwest::get(format!("https://history.geometrydash.eu/level/{}/{}/download/", remote_level_id, level.id)).await.expect("failed to fetch gmd file from remote server"); let gmd_file = reqwest::get(format!("https://history.geometrydash.eu/level/{}/{}/download/", remote_level_id, level.id)).await.expect("failed to fetch gmd file from remote server");
let level_data = helpers::levels::gmd_parse(&gmd_file.text().await.expect("failed to parse gmd file as text")); let level_data = helpers::levels::gmd_parse(&gmd_file.text().await.expect("failed to parse gmd file as text"));
use crate::schema::levels::dsl::*; use db::schema::levels::dsl::*;
use crate::models::{Level, NewLevel}; use db::models::{Level, NewLevel};
let new_level = NewLevel { let new_level = NewLevel {
name: level_data.get("k2").expect("level name not found").to_string(), name: level_data.get("k2").expect("level name not found").to_string(),