Added special skin category to include all skins except knives and gloves

Cargo.lock

@@ -15,6 +15,7 @@ dependencies = [
  "axum",
  "axum-extra",
  "dotenvy",
+ "http",
  "reqwest",
  "serde",
  "serde_json",
@@ -757,9 +758,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.4.2"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6970f50e31d6fc17d3fa27329444bfa74e196cf62e95052a3f6fee181dba6425"
+checksum = "918d3568bebf352712bc2ef3d46a8bcf1a75b373be6539de198e9105cbbf9ce0"
 dependencies = [
  "bytes",
  "itoa",

Cargo.toml

@@ -18,3 +18,4 @@ serde_urlencoded = "0.7.1"
 serde_json = "1.0.150"
 tower-sessions = "0.14.0"
 tower-sessions-sqlx-store = {version = "0.15.0", features = ["postgres"]}
+http = "1.5.0"

migrations/20260831172036_create_table_skins.sql

@@ -0,0 +1,37 @@
+CREATE TABLE IF NOT EXISTS weapons (
+    id uuid DEFAULT gen_random_uuid() PRIMARY KEY,
+    name varchar NOT NULL,
+    display varchar NOT NULL,
+    def_index integer NOT NULL,
+    category varchar NOT NULL,
+    team integer NOT NULL -- 0 = CT, 1 = T, 2 = BOTH
+);
+
+CREATE TABLE IF NOT EXISTS rarity (
+    id uuid DEFAULT gen_random_uuid() PRIMARY KEY,
+    display varchar NOT NULL,
+    color varchar NOT NULL
+);
+
+CREATE TABLE IF NOT EXISTS skins (
+    id uuid DEFAULT gen_random_uuid() PRIMARY KEY,
+    weapon uuid REFERENCES weapons(id) NOT NULL,
+    rarity uuid REFERENCES rarity(id) NOT NULL,
+    paint_index integer NOT NULL,
+    display varchar NOT NULL,
+    min_float float NOT NULL,
+    max_float float NOT NULL,
+    legacy boolean NOT NULL,
+    "default" boolean DEFAULT false NOT NULL
+);
+
+CREATE TABLE IF NOT EXISTS agents (
+    id uuid DEFAULT gen_random_uuid() PRIMARY KEY,
+    rarity uuid REFERENCES rarity(id) NOT NULL,
+    name varchar NOT NULL,
+    display varchar NOT NULL,
+    def_index integer NOT NULL,
+    team integer NOT NULL, -- 0 = CT, 1 = T, 2 = BOTH
+    model_player varchar NOT NULL,
+    "default" boolean DEFAULT false NOT NULL
+);

migrations/20260901220106_create_table_user-skins.sql

@@ -0,0 +1,9 @@
+CREATE TABLE IF NOT EXISTS user_skins (
+    id uuid DEFAULT gen_random_uuid() PRIMARY KEY,
+    user_id uuid REFERENCES users(id) NOT NULL,
+    skin_id uuid REFERENCES skins(id),
+    agent_id uuid REFERENCES agents(id),
+    float float DEFAULT 0 NOT NULL,
+    pattern integer DEFAULT 0 NOT NULL,
+    team integer NOT NULL -- 0 = CT, 1 = T, 2 = BOTH
+);

src/error.rs

@@ -5,12 +5,19 @@ use reqwest::StatusCode;
 
 pub enum AppError {
     InternalError(String),
+    OpenIdError(String),
+    Unauthorised,
 }
 
 impl IntoResponse for AppError {
     fn into_response(self) -> axum::response::Response {
         let (status, message) = match self {
             AppError::InternalError(msg) => (StatusCode::INTERNAL_SERVER_ERROR, msg),
+            AppError::OpenIdError(msg) => (StatusCode::UNPROCESSABLE_ENTITY, msg),
+            AppError::Unauthorised => (
+                StatusCode::UNAUTHORIZED,
+                "Unauthorised (did you login?)".into(),
+            ),
         };
         (status, message).into_response()
     }
@@ -27,3 +34,9 @@ impl From<tower_sessions::session::Error> for AppError {
         AppError::InternalError(value.to_string())
     }
 }
+
+impl From<sqlx::Error> for AppError {
+    fn from(value: sqlx::Error) -> Self {
+        AppError::InternalError(value.to_string())
+    }
+}

src/main.rs

@@ -2,20 +2,23 @@ use std::env::var;
 use std::error::Error;
 
 use axum::http::{HeaderValue, Method};
-use axum::routing::get;
+use axum::routing::{get, post};
 use axum::{Router, serve};
 use dotenvy::dotenv;
+use http::header::CONTENT_TYPE;
 use sqlx::postgres::PgPool;
 use tokio::net::TcpListener;
 use tower_http::cors::CorsLayer;
+use tower_sessions::SessionManagerLayer;
 use tower_sessions::cookie::SameSite;
-use tower_sessions::{SessionManagerLayer};
 use tower_sessions_sqlx_store::PostgresStore;
 use tower_sessions_sqlx_store::sqlx::PgPool as SessionPgPool;
 
 mod error;
+mod skins;
 mod users;
-use users::{login, me, logout};
+use skins::{agent_info, list_paint_index, skin_info, weapons};
+use users::{login, logout, me, reload, update};
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error>> {
@@ -33,18 +36,25 @@ async fn main() -> Result<(), Box<dyn Error>> {
         .route("/me", get(me))
         .route("/login", get(login))
         .route("/logout", get(logout))
+        .route("/update", post(update))
+        .route("/reload", get(reload))
+        .route("/weapons", get(weapons))
+        .route("/skin", get(skin_info))
+        .route("/agent", get(agent_info))
+        .route("/index", get(list_paint_index))
         .layer(
             CorsLayer::new()
                 .allow_origin("http://localhost:5173".parse::<HeaderValue>().unwrap())
-                .allow_methods([Method::GET])
+                .allow_methods([Method::GET, Method::POST])
-                .allow_credentials(true),
+                .allow_credentials(true)
+                .allow_headers([CONTENT_TYPE]),
         )
         .layer(session)
         .with_state(pool);
-    let listener = TcpListener::bind("0.0.0.0:8080").await?;
+    let listener = TcpListener::bind(var("BIND_ADDRESS")?).await?;
     Ok(serve(listener, app).await?)
 }
 
 async fn status() -> &'static str {
-    "api online"
+    "API online"
 }

src/skins.rs

@@ -0,0 +1,311 @@
+use axum::{
+    Json, debug_handler,
+    extract::{Query, State},
+};
+use serde::{Deserialize, Serialize};
+use sqlx::{PgPool, query, query_as, types::Uuid};
+use tower_sessions::Session;
+
+use crate::error::AppError;
+
+#[derive(Deserialize, Serialize)]
+pub struct Weapon {
+    id: Uuid,
+    name: String,
+    display: String,
+    def_index: i32,
+    category: String,
+    team: i32,
+}
+
+#[derive(Deserialize, Serialize)]
+pub struct SkinInfo {
+    id: Uuid,
+    weapon_id: Uuid,
+    name: String,
+    display: String,
+    paint_index: i32,
+    color: String,
+    float: f64,
+    min_float: f64,
+    max_float: f64,
+    pattern: i32,
+}
+
+#[axum::debug_handler]
+pub async fn weapons(State(pool): State<PgPool>) -> Result<Json<Vec<Weapon>>, AppError> {
+    let weapons = query_as!(Weapon, "SELECT * FROM weapons")
+        .fetch_all(&pool)
+        .await?;
+    Ok(Json(weapons))
+}
+
+#[derive(Deserialize, Serialize, Copy, Clone, Debug)]
+enum Teams {
+    CT,
+    T,
+    BOTH,
+}
+
+impl Teams {
+    fn as_i32(self) -> i32 {
+        match self {
+            Teams::CT => 0,
+            Teams::T => 1,
+            Teams::BOTH => 2,
+        }
+    }
+}
+
+#[derive(Deserialize, Serialize, Copy, Clone, Debug)]
+enum Categories {
+    Knives,
+    Gloves,
+    Rifles,
+    SMGs,
+    Pistols,
+    Heavy,
+    Equipment,
+    Weapons, // Special category to get all weapons except gloves and knives
+}
+
+impl Categories {
+    fn as_str(self) -> &'static str {
+        match self {
+            Categories::Knives => "Knives",
+            Categories::Gloves => "Gloves",
+            Categories::Rifles => "Rifles",
+            Categories::SMGs => "SMGs",
+            Categories::Pistols => "Pistols",
+            Categories::Heavy => "Heavy",
+            Categories::Equipment => "Equipment",
+            Categories::Weapons => "",
+        }
+    }
+}
+
+#[derive(Deserialize, Serialize)]
+pub struct SkinInfoQuery {
+    category: Option<Categories>,
+    team: Option<Teams>,
+}
+
+pub async fn skin_info(
+    State(pool): State<PgPool>,
+    session: Session,
+    Query(info_query): Query<SkinInfoQuery>,
+) -> Result<Json<Vec<SkinInfo>>, AppError> {
+    if let Some(uuid) = session.get::<Uuid>("uuid").await? {
+        // Fetch all default skins
+        let mut default_skins = query!("SELECT w.id, w.name, w.display, w.team, w.category, w.display as wd, s.display as sd, r.color FROM skins s JOIN weapons w ON w.id = s.weapon JOIN rarity r ON r.id = s.rarity WHERE s.default = true").fetch_all(&pool).await?;
+        // Filter those skins by team if present in query
+        if let Some(team) = info_query.team {
+            default_skins = default_skins
+                .into_iter()
+                .filter(|x| team.as_i32() == x.team || Teams::BOTH.as_i32() == x.team)
+                .collect();
+        }
+        // Same with category
+        if let Some(category) = info_query.category {
+            default_skins = match category {
+                Categories::Weapons => default_skins
+                    .into_iter()
+                    .filter(|x| {
+                        ![Categories::Gloves.as_str(), Categories::Knives.as_str()]
+                            .contains(&x.category.as_str())
+                    })
+                    .collect(),
+                _ => default_skins
+                    .into_iter()
+                    .filter(|x| category.as_str() == x.category)
+                    .collect(),
+            }
+        }
+        // For each remaining default weapon, see if the user has set a skin
+        // Secific cases for Knives and Gloves
+        let mut skin_infos = vec![];
+        for default in default_skins {
+            struct Info {
+                id: Uuid,
+                weapon_id: Uuid,
+                float: f64,
+                min_float: f64,
+                max_float: f64,
+                pattern: i32,
+                team: i32,
+                name: String,
+                wd: String,
+                sd: String,
+                paint_index: i32,
+                color: String,
+            }
+            let user_skin = match default.category.as_str() {
+                "Gloves" | "Knives" => {
+                    query_as!(Info, "SELECT us.id, w.id as weapon_id, us.float, us.pattern, us.team, w.name, w.display as wd, s.display as sd, s.paint_index, s.min_float, s.max_float, r.color FROM user_skins us JOIN skins s ON us.skin_id = s.id JOIN weapons w ON s.weapon = w.id JOIN rarity r ON r.id = s.rarity WHERE us.user_id = $1 AND w.category = $2", uuid, default.category).fetch_all(&pool).await?
+                },
+                _ =>  {
+                    query_as!(Info, "SELECT us.id, w.id as weapon_id, us.float, us.pattern, us.team, w.name, w.display as wd, s.display as sd, s.paint_index, s.min_float, s.max_float, r.color FROM user_skins us JOIN skins s ON us.skin_id = s.id JOIN weapons w ON s.weapon = w.id JOIN rarity r ON r.id = s.rarity WHERE us.user_id = $1 AND w.id = $2", uuid, default.id).fetch_all(&pool).await?
+                }
+            };
+            let user_skin = if let Some(team) = info_query.team {
+                user_skin
+                    .into_iter()
+                    .filter(|x| x.team == team.as_i32() || x.team == Teams::BOTH.as_i32())
+                    .min_by(|x, y| x.team.cmp(&y.team))
+                    .unwrap_or(Info {
+                        id: Uuid::nil(),
+                        weapon_id: default.id,
+                        float: 0.0,
+                        min_float: 0.0,
+                        max_float: 1.0,
+                        pattern: 0,
+                        team: 2,
+                        name: default.name,
+                        wd: default.wd,
+                        sd: default.sd,
+                        paint_index: 0,
+                        color: default.color,
+                    })
+            } else {
+                user_skin
+                    .into_iter()
+                    .max_by(|x, y| x.team.cmp(&y.team))
+                    .unwrap_or(Info {
+                        id: Uuid::nil(),
+                        weapon_id: default.id,
+                        float: 0.0,
+                        min_float: 0.0,
+                        max_float: 1.0,
+                        pattern: 0,
+                        team: 2,
+                        name: default.name,
+                        wd: default.wd,
+                        sd: default.sd,
+                        paint_index: 0,
+                        color: default.color,
+                    })
+            };
+            let display = if user_skin.sd.is_empty() {
+                user_skin.wd
+            } else {
+                format!("{} | {}", user_skin.wd, user_skin.sd)
+            };
+            let info = SkinInfo {
+                display,
+                id: user_skin.id,
+                weapon_id: user_skin.weapon_id,
+                name: user_skin.name,
+                paint_index: user_skin.paint_index,
+                color: user_skin.color,
+                float: user_skin.float,
+                min_float: user_skin.min_float,
+                max_float: user_skin.max_float,
+                pattern: user_skin.pattern,
+            };
+            skin_infos.push(info);
+        }
+        Ok(Json(skin_infos))
+    } else {
+        Err(AppError::Unauthorised)
+    }
+}
+
+#[derive(Deserialize, Serialize)]
+pub struct AgentInfoQuery {
+    team: Teams,
+}
+
+#[debug_handler]
+pub async fn agent_info(
+    State(pool): State<PgPool>,
+    session: Session,
+    Query(info_query): Query<AgentInfoQuery>,
+) -> Result<Json<SkinInfo>, AppError> {
+    if let Some(uuid) = session.get::<Uuid>("uuid").await? {
+        let agent = query!("SELECT us.id, a.id as weapon_id, a.name, a.display, r.color FROM user_skins us JOIN agents a ON a.id = us.agent_id JOIN rarity r ON r.id = a.rarity WHERE us.user_id=$1 AND us.team=$2", uuid, info_query.team.as_i32()).fetch_optional(&pool).await?;
+        match agent {
+            Some(agent) => Ok(Json(SkinInfo {
+                id: agent.id,
+                weapon_id: agent.weapon_id,
+                name: agent.name,
+                display: agent.display,
+                paint_index: 0,
+                color: agent.color,
+                float: 0.0,
+                min_float: 0.0,
+                max_float: 0.0,
+                pattern: 0,
+            })),
+            None => {
+                let default = query!("SELECT a.name, a.id as weapon_id, a.display, r.color FROM agents a JOIN rarity r ON r.id = a.rarity WHERE a.team = $1 AND a.default = true", info_query.team.as_i32()).fetch_one(&pool).await?;
+                Ok(Json(SkinInfo {
+                    id: Uuid::nil(),
+                    weapon_id: default.weapon_id,
+                    name: default.name,
+                    display: default.display,
+                    paint_index: 0,
+                    color: default.color,
+                    float: 0.0,
+                    min_float: 0.0,
+                    max_float: 0.0,
+                    pattern: 0,
+                }))
+            }
+        }
+    } else {
+        Err(AppError::Unauthorised)
+    }
+}
+
+#[derive(Serialize, Default, Debug)]
+pub struct PaintIndexInfo {
+    name: String,
+    paint_index: i32,
+    display: String,
+    color: String,
+    min_float: f64,
+    max_float: f64,
+}
+
+#[derive(Deserialize)]
+pub struct PaintQuery {
+    weapon: Uuid,
+    team: Teams,
+    agent: Option<bool>,
+}
+
+pub async fn list_paint_index(
+    State(pool): State<PgPool>,
+    Query(paint_query): Query<PaintQuery>,
+) -> Result<Json<Vec<PaintIndexInfo>>, AppError> {
+    let agent = match paint_query.agent {
+        Some(agent) => agent,
+        None => false,
+    };
+    let paints = if agent {
+        let values = query!("SELECT a.name, a.def_index, a.display, r.color FROM agents a JOIN rarity r ON r.id = a.rarity WHERE a.team=$1", paint_query.team.as_i32()).fetch_all(&pool).await?;
+        values
+            .into_iter()
+            .map(|x| PaintIndexInfo {
+                name: x.name,
+                paint_index: x.def_index,
+                display: x.display,
+                color: x.color,
+                min_float: 0.0,
+                max_float: 0.0,
+            })
+            .collect()
+    } else {
+        let category = query!(
+            "SELECT w.category FROM weapons w WHERE w.id=$1",
+            paint_query.weapon
+        )
+        .fetch_one(&pool)
+        .await?;
+        match category.category.as_str() {
+            "Knives" | "Gloves" => query_as!(PaintIndexInfo, "SELECT w.name, s.paint_index, s.display, r.color, s.min_float, s.max_float FROM skins s JOIN rarity r ON r.id = s.rarity JOIN weapons w ON w.id = s.weapon WHERE w.category=$1", category.category).fetch_all(&pool).await?,
+            _ => query_as!(PaintIndexInfo, "SELECT w.name, s.paint_index, s.display, r.color, s.min_float, s.max_float FROM skins s JOIN rarity r ON r.id = s.rarity JOIN weapons w ON w.id = s.weapon WHERE w.id=$1", paint_query.weapon).fetch_all(&pool).await?
+        }
+    };
+    Ok(Json(paints))
+}

src/users.rs

@@ -5,6 +5,7 @@ use axum::{
     extract::{Query, State},
 };
 use serde::{Deserialize, Serialize};
+use serde_json::Value;
 use sqlx::{PgPool, query, query_as, query_scalar, types::Uuid};
 use tower_sessions::Session;
 
@@ -88,10 +89,7 @@ impl User {
             return Ok(user);
         }
 
-        let response = reqwest::get(format!("https://api.steampowered.com/ISteamUser/GetPlayerSummaries/v0002/?key=ABBFE30D7BDC1FD582DB1A2CEBD563B4&steamids={steamid}"))
+        let raw_user = Self::fetch_steam(&steamid).await?;
-        .await?.bytes().await?;
-        let json: serde_json::Value = serde_json::from_slice(&response)?;
-        let raw_user = &json["response"]["players"][0];
         let mut user = User::new(
             raw_user["steamid"].to_string().trim_matches('"'),
             raw_user["personaname"].to_string().trim_matches('"'),
@@ -100,6 +98,20 @@ impl User {
         user.create(pool).await?;
         Ok(user)
     }
+
+    async fn fetch_steam(steamid: &String) -> Result<Value, Box<dyn Error>> {
+        let response = reqwest::get(format!("https://api.steampowered.com/ISteamUser/GetPlayerSummaries/v0002/?key=ABBFE30D7BDC1FD582DB1A2CEBD563B4&steamids={steamid}"))
+        .await?.bytes().await?;
+        let mut json: serde_json::Value = serde_json::from_slice(&response)?;
+        Ok(json["response"]["players"][0].take())
+    }
+
+    async fn update_from_steam(&mut self, pool: &PgPool) -> Result<(), Box<dyn Error>> {
+        let raw_user = Self::fetch_steam(&self.steamid).await?;
+        self.name = raw_user["personaname"].to_string().trim_matches('"').into();
+        self.avatar = raw_user["avatarfull"].to_string().trim_matches('"').into();
+        self.update(pool).await
+    }
 }
 
 #[derive(Deserialize, Serialize)]
@@ -156,16 +168,18 @@ pub async fn login(
     State(pool): State<PgPool>,
     Query(mut info): Query<OpenId>,
     session: Session,
-) -> Result<&'static str, AppError> {
+) -> Result<(), AppError> {
     if !info.is_valid().await? {
-        return Ok("nok");
+        return Err(AppError::OpenIdError(
+            "Some query parameters are erronous or lacking.".into(),
+        ));
     }
     let steamid = info
         .identity
         .replace("https://steamcommunity.com/openid/id/", "");
     let user = User::from_steamid(&pool, steamid).await?;
     session.insert("uuid", user.id).await?;
-    Ok("ok")
+    Ok(())
 }
 
 pub async fn logout(session: Session) -> Result<(), AppError> {
@@ -174,14 +188,51 @@ pub async fn logout(session: Session) -> Result<(), AppError> {
 }
 
 #[axum::debug_handler]
-pub async fn me(
+pub async fn me(State(pool): State<PgPool>, session: Session) -> Result<Json<User>, AppError> {
-    State(pool): State<PgPool>,
-    session: Session,
-) -> Result<Json<Option<User>>, AppError> {
     if let Some(uuid) = session.get("uuid").await? {
         let user = User::fetch_id(&pool, uuid).await?;
-        Ok(Json(Some(user)))
+        Ok(Json(user))
     } else {
-        Ok(Json(None))
+        Err(AppError::Unauthorised)
+    }
+}
+
+#[derive(Deserialize)]
+pub struct Settings {
+    username: String,
+    avatar: String,
+}
+
+#[axum::debug_handler]
+pub async fn update(
+    State(pool): State<PgPool>,
+    session: Session,
+    data: Json<Settings>,
+) -> Result<(), AppError> {
+    if let Some(uuid) = session.get("uuid").await? {
+        let mut user = User::fetch_id(&pool, uuid).await?;
+
+        if !data.username.is_empty() {
+            user.name = data.username.clone();
+        }
+        if !data.avatar.is_empty() {
+            user.avatar = data.avatar.clone();
+        }
+
+        user.update(&pool).await?;
+
+        Ok(())
+    } else {
+        Err(AppError::Unauthorised)
+    }
+}
+
+pub async fn reload(State(pool): State<PgPool>, session: Session) -> Result<(), AppError> {
+    if let Some(uuid) = session.get("uuid").await? {
+        let mut user = User::fetch_id(&pool, uuid).await?;
+        user.update_from_steam(&pool).await?;
+        Ok(())
+    } else {
+        Err(AppError::Unauthorised)
     }
 }