Chellaris/chellaris-rust-api
Chellaris/chellaris-rust-api
Archived
1
0
Fork 0
Code Issues Pull requests Releases16 Packages1 Activity Actions

Swap dotenv for dotenvy, added uptime kuma url config

Browse source
This commit is contained in:
Neshura 2023-09-12 20:31:46 +02:00
parent 719cbbaf3a
commit 2ac5931c79
Signed by: Neshura
GPG key ID: B6983AAA6B9A7A6C
5 changed files with 325 additions and 51 deletions
src/v3
mod.rs

10
src/v3/mod.rs
View file

@ -7,6 +7,8 @@ use actix_web::{
};
use sqlx::QueryBuilder;
use dotenvy;
use crate::{db, AppState};
pub(crate) mod schemas;
@ -179,7 +181,7 @@ pub(crate) async fn full_view_data(data: web::Data<AppState>) -> impl Responder
let new_data = schemas::ChellarisEmpireLegacy {
id: empire.id,
gestalt: empire.gestalt,
machine: empire.portrait_group_id.to_string() == dotenv!("MACHINE_GROUP_ID"),
machine: empire.portrait_group_id.to_string() == dotenvy::var("MACHINE_GROUP_ID").unwrap_or("12".to_string()),
group: empire.group_id,
portrait_id: empire.portrait_id,
portrait_group_id: empire.portrait_group_id,
@ -806,7 +808,7 @@ pub(crate) async fn get_empire(
game: db_empire.game_id,
name: db_empire.name,
discord_user: db_empire.discord_user,
machine: db_empire.portrait_group_id.to_string() == dotenv!("MACHINE_GROUP_ID"),
machine: db_empire.portrait_group_id.to_string() == dotenvy::var("MACHINE_GROUP_ID").unwrap_or("12".to_string()),
gestalt: db_empire.gestalt,
portrait_id: db_empire.portrait_id,
portrait_group_id: db_empire.portrait_group_id,
@ -940,7 +942,7 @@ pub(crate) async fn create_empire(
game: db_empire.game_id,
name: db_empire.name,
discord_user: db_empire.discord_user,
machine: db_empire.portrait_group_id.to_string() == dotenv!("MACHINE_GROUP_ID"),
machine: db_empire.portrait_group_id.to_string() == dotenvy::var("MACHINE_GROUP_ID").unwrap_or("12".to_string()),
gestalt: db_empire.gestalt,
portrait_id: db_empire.portrait_id,
portrait_group_id: db_empire.portrait_group_id,
@ -1173,7 +1175,7 @@ pub(crate) async fn edit_empire(
game: db_empire.game_id,
name: db_empire.name,
discord_user: db_empire.discord_user,
machine: db_empire.portrait_group_id.to_string() == dotenv!("MACHINE_GROUP_ID"),
machine: db_empire.portrait_group_id.to_string() == dotenvy::var("MACHINE_GROUP_ID").unwrap_or("12".to_string()),
gestalt: db_empire.gestalt,
portrait_id: db_empire.portrait_id,
portrait_group_id: db_empire.portrait_group_id,