leon/knifer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some formatting and improve structure

Browse Source
This commit is contained in:
Lol3rrr
2024-09-16 23:20:55 +02:00
parent a1faa1a815
commit 1e6c3da58b
12 changed files with 423 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
backend/src/api.rs
View File

@@ -2,14 +2,14 @@ pub mod demos;
pub mod steam {
use axum::extract::State;
use serde::Deserialize;
use std::{sync::Arc, collections::HashMap};
use diesel::prelude::*;
use diesel_async::RunQueryDsl;
use serde::Deserialize;
use std::{collections::HashMap, sync::Arc};
#[derive(Debug, Deserialize)]
struct ProfileInfoResponse {
players: Vec<ProfileInfo>
players: Vec<ProfileInfo>,
}
#[derive(Debug, Deserialize)]
struct ProfileInfo {
@@ -23,11 +23,15 @@ pub mod steam {
axum::Router::new()
.route("/login", axum::routing::get(steam_login))
.route("/callback", axum::routing::get(steam_callback))
.with_state(Arc::new(steam_openid::SteamOpenId::new(url, callback_path).unwrap()))
.with_state(Arc::new(
steam_openid::SteamOpenId::new(url, callback_path).unwrap(),
))
}
#[tracing::instrument(skip(openid))]
async fn steam_login(State(openid): State<Arc<steam_openid::SteamOpenId>>) -> Result<axum::response::Redirect, axum::http::StatusCode> {
async fn steam_login(
State(openid): State<Arc<steam_openid::SteamOpenId>>,
) -> Result<axum::response::Redirect, axum::http::StatusCode> {
let url = openid.get_redirect_url();
Ok(axum::response::Redirect::to(url))
@@ -52,7 +56,13 @@ pub mod steam {
})?;
let steam_client = crate::steam_api::Client::new(std::env::var("STEAM_API_KEY").unwrap());
let profile_response_data: ProfileInfoResponse = match steam_client.get("http://api.steampowered.com/ISteamUser/GetPlayerSummaries/v2/", &[("steamids", &format!("{}", id))]).await {
let profile_response_data: ProfileInfoResponse = match steam_client
.get(
"http://api.steampowered.com/ISteamUser/GetPlayerSummaries/v2/",
&[("steamids", &format!("{}", id))],
)
.await
{
Ok(r) => r,
Err(e) => {
tracing::error!("Getting Steam Profile Info: {:?}", e);
@@ -62,10 +72,14 @@ pub mod steam {
let mut db_con = crate::db_connection().await;
for player in profile_response_data.players {
let query = diesel::dsl::insert_into(crate::schema::users::dsl::users).values(crate::models::User {
steamid: player.steamid,
name: player.personaname.clone(),
}).on_conflict(crate::schema::users::dsl::steamid).do_update().set((crate::schema::users::dsl::name.eq(player.personaname)));
let query = diesel::dsl::insert_into(crate::schema::users::dsl::users)
.values(crate::models::User {
steamid: player.steamid,
name: player.personaname.clone(),
})
.on_conflict(crate::schema::users::dsl::steamid)
.do_update()
.set((crate::schema::users::dsl::name.eq(player.personaname)));
tracing::debug!("Running Query: {:?}", query);
if let Err(e) = query.execute(&mut db_con).await {
@@ -88,12 +102,13 @@ pub mod user {
use diesel_async::RunQueryDsl;
pub fn router() -> axum::Router {
axum::Router::new()
.route("/status", axum::routing::get(status))
axum::Router::new().route("/status", axum::routing::get(status))
}
#[tracing::instrument(skip(session))]
async fn status(session: crate::UserSession) -> Result<axum::response::Json<common::UserStatus>, reqwest::StatusCode> {
async fn status(
session: crate::UserSession,
) -> Result<axum::response::Json<common::UserStatus>, reqwest::StatusCode> {
let steam_id = match session.data().steam_id {
Some(s) => s,
None => {
@@ -105,16 +120,20 @@ pub mod user {
let mut db_con = crate::db_connection().await;
let query = crate::schema::users::dsl::users.filter(crate::schema::users::dsl::steamid.eq(format!("{}", steam_id)));
let query = crate::schema::users::dsl::users
.filter(crate::schema::users::dsl::steamid.eq(format!("{}", steam_id)));
let mut result = query.load::<crate::models::User>(&mut db_con).await.unwrap();
let mut result = query
.load::<crate::models::User>(&mut db_con)
.await
.unwrap();
if result.len() != 1 {
tracing::error!("Unexpected query result: {:?}", result);
return Err(axum::http::StatusCode::INTERNAL_SERVER_ERROR);
}
let user_entry = result.pop().unwrap();
Ok(axum::Json(common::UserStatus {
name: user_entry.name,
steamid: user_entry.steamid,
@@ -122,9 +141,14 @@ pub mod user {
}
}
pub fn router(base_analysis: tokio::sync::mpsc::UnboundedSender<crate::analysis::AnalysisInput>) -> axum::Router {
pub fn router(
base_analysis: tokio::sync::mpsc::UnboundedSender<crate::analysis::AnalysisInput>,
) -> axum::Router {
axum::Router::new()
.nest("/steam/", steam::router("http://192.168.0.156:3000", "/api/steam/callback"))
.nest(
"/steam/",
steam::router("http://192.168.0.156:3000", "/api/steam/callback"),
)
.nest("/demos/", demos::router("uploads/", base_analysis))
.nest("/user/", user::router())
}