diff --git a/Cargo.lock b/Cargo.lock index be4d84c..9fe9032 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -321,11 +321,12 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.4" +version = "0.23.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" dependencies = [ "log", + "once_cell", "ring", "rustls-pki-types", "rustls-webpki", @@ -341,9 +342,9 @@ checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-webpki" -version = "0.102.4" +version = "0.102.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" dependencies = [ "ring", "rustls-pki-types", @@ -528,9 +529,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.9.7" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd" +checksum = "72139d247e5f97a3eff96229a7ae85ead5328a39efe76f8bf5a06313d505b6ea" dependencies = [ "base64", "flate2", @@ -538,7 +539,6 @@ dependencies = [ "once_cell", "rustls", "rustls-pki-types", - "rustls-webpki", "serde", "serde_json", "url", @@ -718,7 +718,7 @@ checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "wishing-star" -version = "2.2.1" +version = "2.2.2" dependencies = [ "log", "maud", diff --git a/Cargo.toml b/Cargo.toml index 285877e..b3a2b74 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wishing-star" -version = "2.2.1" +version = "2.2.3" edition = "2021" [dependencies] diff --git a/src/config.rs b/src/config.rs index 0665f15..bd90a94 100644 --- a/src/config.rs +++ b/src/config.rs @@ -97,8 +97,7 @@ impl SortedSteamWishlist { ) -> ListConfig { for (_, (id, data)) in self.0 { let first_sub = &data.subs[0]; - let price_float = first_sub.price.parse::().unwrap_or(-100.0); - let price_int = (price_float * 10.0) as i32; + let price_int = first_sub.price.parse::().unwrap_or(-100); let item = ItemConfig { _id: Some(id), diff --git a/src/html/items/link.rs b/src/html/items/link.rs index c67f9a9..51fa9e4 100644 --- a/src/html/items/link.rs +++ b/src/html/items/link.rs @@ -28,7 +28,7 @@ pub fn link(inner: Markup, list: &ListConfig, item: &ItemConfig, price: i32, id: } { (inner) } - } else { + } @else { div data-recommend=(list.recommend) data-list=(list.title) id={ "item-" (list.title) "-" (id) } data-score="0" data-price=(price) diff --git a/src/html/modules/faq.rs b/src/html/modules/faq.rs index 2a59171..91129d5 100644 --- a/src/html/modules/faq.rs +++ b/src/html/modules/faq.rs @@ -56,7 +56,7 @@ pub fn faq() -> Markup { #"faq-4".accordion-collapse.collapse data-bs-parent="#faq" { .accordion-body { p { - r#"For items that are available on Steam, Amazon, Google Play, Apple stores and other + r#"For items that are available on Steam, Amazon, Google Play and other compatible platforms, a gift card would be preferred to prevent issues with delivery. Steam games must be purchased with gift cards due to regional restrictions. For items that cannot be bought with a gift card, you will have to order them yourself and enter diff --git a/src/main.rs b/src/main.rs index 193fba5..fcf843a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -53,6 +53,14 @@ fn start() -> Result<(), WishingStarError> { if config.vercel { info!("Deploying to Vercel"); + + #[cfg(windows)] + Command::new("vercel.cmd") + .current_dir("./app") + .arg("--prod") + .status()?; + + #[cfg(not(windows))] Command::new("vercel") .current_dir("./app") .arg("--prod")