From 3419bb382f3605f71005a8643d3761cbbc47fdd9 Mon Sep 17 00:00:00 2001 From: core Date: Mon, 8 Apr 2024 14:15:47 -0400 Subject: [PATCH] fmt --- starkingdoms-api/src/main.rs | 2 +- starkingdoms-api/src/models.rs | 2 +- starkingdoms-api/src/routes/mod.rs | 2 +- starkingdoms-api/src/routes/sign_save.rs | 36 +++++++++++++------ .../src/pages/ShipEditor.svelte | 12 +++---- starkingdoms-client/src/save.ts | 16 ++------- starkingdoms-common/src/lib.rs | 1 - 7 files changed, 38 insertions(+), 33 deletions(-) diff --git a/starkingdoms-api/src/main.rs b/starkingdoms-api/src/main.rs index 0ec5a1d5ee39f3b28db904e833b89c5215d00627..2c8815500f300be1e7fd4be61f217738e2dec79f 100644 --- a/starkingdoms-api/src/main.rs +++ b/starkingdoms-api/src/main.rs @@ -51,7 +51,7 @@ pub struct AppState { pub pool: bb8::Pool>, pub idgen: Arc>, pub key: Hmac, - pub key_raw: Vec + pub key_raw: Vec, } pub const MIGRATIONS: EmbeddedMigrations = embed_migrations!("migrations"); diff --git a/starkingdoms-api/src/models.rs b/starkingdoms-api/src/models.rs index 67831d912f59e3658a9c0e6063ad6d8b3068ff00..08b6b6778af6d59224a70bbf8fc866425d670653 100644 --- a/starkingdoms-api/src/models.rs +++ b/starkingdoms-api/src/models.rs @@ -22,5 +22,5 @@ use diesel::{Identifiable, Insertable, Queryable, Selectable}; pub struct Save { pub id: i64, pub user_id: i64, - pub pack: String + pub pack: String, } diff --git a/starkingdoms-api/src/routes/mod.rs b/starkingdoms-api/src/routes/mod.rs index e8190c6f0671ec371430cb9ed5f4662b4b117048..29b60ae115af0bbbab2574a75e7541eb79b62385 100644 --- a/starkingdoms-api/src/routes/mod.rs +++ b/starkingdoms-api/src/routes/mod.rs @@ -13,4 +13,4 @@ // // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -pub mod sign_save; \ No newline at end of file +pub mod sign_save; diff --git a/starkingdoms-api/src/routes/sign_save.rs b/starkingdoms-api/src/routes/sign_save.rs index ef88dca5645629514a6c653d1fffe9c11ea1dc92..16de2cdba8bd225794433525f98e268479874a01 100644 --- a/starkingdoms-api/src/routes/sign_save.rs +++ b/starkingdoms-api/src/routes/sign_save.rs @@ -14,8 +14,6 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -use std::collections::HashMap; -use std::hash::Hash; use crate::response::JsonAPIResponse; use crate::AppState; use actix_web::{ @@ -25,17 +23,21 @@ use actix_web::{ }; use log::error; use serde::{Deserialize, Serialize}; -use starkingdoms_common::{__noverify__unpack_savefile, pack_savefile, PartType, SaveModule, unpack_savefile}; +use starkingdoms_common::{ + __noverify__unpack_savefile, pack_savefile, unpack_savefile, PartType, SaveModule, +}; +use std::collections::HashMap; +use std::hash::Hash; #[derive(Deserialize)] pub struct SignSaveRequest { pub old_save: String, - pub new_partial: String + pub new_partial: String, } #[derive(Serialize, Debug)] pub struct SignSaveResponse { - pub signed_save: String + pub signed_save: String, } fn inc(a: &mut HashMap, t: &T, by: u64) { @@ -67,7 +69,11 @@ pub async fn sign_save_req( let mut part_counts_old: HashMap = HashMap::new(); for unused_modules in &old_save.unused_modules { - inc(&mut part_counts_old, &unused_modules.0, unused_modules.1 as u64); + inc( + &mut part_counts_old, + &unused_modules.0, + unused_modules.1 as u64, + ); } for child in &old_save.children { recursive_inc(&mut part_counts_old, child); @@ -76,24 +82,34 @@ pub async fn sign_save_req( let mut part_counts_new: HashMap = HashMap::new(); for unused_modules in &new_save.unused_modules { - inc(&mut part_counts_new, &unused_modules.0, unused_modules.1 as u64); + inc( + &mut part_counts_new, + &unused_modules.0, + unused_modules.1 as u64, + ); } for child in &new_save.children { recursive_inc(&mut part_counts_new, child); } if part_counts_old != part_counts_new { - error!("save validation failed: {:?} -> {:?}", part_counts_old, part_counts_new); + error!( + "save validation failed: {:?} -> {:?}", + part_counts_old, part_counts_new + ); error!("old file: {:?}", old_save); error!("new file: {:?}", new_save); err!( StatusCode::BAD_REQUEST, - make_err!("ERR_SAVE_VALIDATION_FAILED", "save validation failed: part counts do not match") + make_err!( + "ERR_SAVE_VALIDATION_FAILED", + "save validation failed: part counts do not match" + ) ) } // resign the savefile and return it to the user - + ok!(SignSaveResponse { signed_save: pack_savefile(&state.key_raw, new_save) }) diff --git a/starkingdoms-client/src/pages/ShipEditor.svelte b/starkingdoms-client/src/pages/ShipEditor.svelte index 4a4c9ae1f94289ebfa243039cc9480cadaa2aaa5..3f2ceecb778af1a03ea5d99bc2c98d53ac309206 100644 --- a/starkingdoms-client/src/pages/ShipEditor.svelte +++ b/starkingdoms-client/src/pages/ShipEditor.svelte @@ -5,7 +5,7 @@ import "../css/style.scss"; import HeartIcon from "../icons/HeartIcon.svelte"; import Popup from "../components/ui/Popup.svelte"; - import {__pack_save_for_api, unpack_save} from "../save.ts"; + import { __pack_save_for_api, unpack_save } from "../save.ts"; import { PartType } from "../protocol.ts"; import { onMount } from "svelte"; import { part_texture_url } from "../textures.ts"; @@ -363,15 +363,15 @@ let packed_savefile = __pack_save_for_api(save_data); - let r = await fetch(config.environments[3].apiBaseUrl + '/sign_save', { - method: 'POST', + let r = await fetch(config.environments[3].apiBaseUrl + "/sign_save", { + method: "POST", headers: { - "Content-Type": "application/json" + "Content-Type": "application/json", }, body: JSON.stringify({ old_save: window.localStorage.getItem("save")!, - new_partial: packed_savefile - }) + new_partial: packed_savefile, + }), }); if (r.ok) { diff --git a/starkingdoms-client/src/save.ts b/starkingdoms-client/src/save.ts index a74c69a20768e92ae911764280c5cfbedaa72460..ab539c4cddd3357b8660c9b7d4ad9fdf26c9669b 100644 --- a/starkingdoms-client/src/save.ts +++ b/starkingdoms-client/src/save.ts @@ -12,22 +12,12 @@ function bytesToBase64(bytes: any) { } export function unpack_save(data: string): any { - console.log(decode(base64ToBytes(data))); + console.log(decode(base64ToBytes(data))); // @ts-ignore return decode(decode(base64ToBytes(data))[0]); } export function __pack_save_for_api(data: any): string { - console.log([ - encode(data), - [] - ]); - return bytesToBase64( - encode( - [ - Array.from(encode(data)), - [] - ], - ) - ); + console.log([encode(data), []]); + return bytesToBase64(encode([Array.from(encode(data)), []])); } diff --git a/starkingdoms-common/src/lib.rs b/starkingdoms-common/src/lib.rs index 88d1e6ddad72fcaf434cfa018232a824f0e222b8..c30ea4c0d13ba3fe3a3c0c1192d76fe5eb89652c 100644 --- a/starkingdoms-common/src/lib.rs +++ b/starkingdoms-common/src/lib.rs @@ -101,7 +101,6 @@ pub fn __noverify__unpack_savefile(file: String) -> Result