Update dependencies

This commit is contained in:
Ethan O'Brien 2025-05-01 12:14:17 -05:00
parent e27a020cfb
commit 1a736155e3
No known key found for this signature in database
GPG key ID: 7A6E7CCD3BD93AB1
8 changed files with 598 additions and 376 deletions

930
Cargo.lock generated

File diff suppressed because it is too large Load diff

View file

@ -1,30 +1,30 @@
[package] [package]
name = "ew" name = "ew"
version = "1.0.0" version = "1.0.0"
edition = "2021" edition = "2024"
[dependencies] [dependencies]
actix-web = { version = "4.9.0" } actix-web = { version = "4.10.2" }
rusqlite = { version = "0.32.1", features = ["bundled"] } rusqlite = { version = "0.35.0", features = ["bundled"] }
openssl = { version = "0.10", features = ["vendored"] } openssl = { version = "0.10", features = ["vendored"] }
reqwest = { version = "0.12", features = ["blocking"] } reqwest = { version = "0.12", features = ["blocking"] }
clap = { version = "4.5.21", features = ["derive"]} clap = { version = "4.5.37", features = ["derive"]}
base64 = "0.22.1" base64 = "0.22.1"
json = "0.12.4" json = "0.12.4"
rand = "0.8.5" rand = "0.9.1"
lazy_static = "1.5.0" lazy_static = "1.5.0"
chrono = "0.4.38" chrono = "0.4.41"
hex = "0.4.3" hex = "0.4.3"
hmac = "0.12.1" hmac = "0.12.1"
md5 = "0.7.0" md5 = "0.7.0"
urlencoding = "2.1.3" urlencoding = "2.1.3"
sha1 = "0.10.6" sha1 = "0.10.6"
substring = "1.4.5" substring = "1.4.5"
uuid = { version = "1.11.0", features = ["v7"] } uuid = { version = "1.16.0", features = ["v7"] }
rsa = "0.9.6" rsa = "0.9.8"
mime = "0.3.17" mime = "0.3.17"
sha2 = "0.10.8" sha2 = "0.10.9"
include-flate-codegen = "0.3.0" include-flate-codegen = "0.3.0"
libflate = "2.1.0" libflate = "2.1.0"
serde_json = "1.0.133" serde_json = "1.0.140"
serde = { version = "1.0.215", features = ["derive"] } serde = { version = "1.0.219", features = ["derive"] }

View file

@ -47,7 +47,7 @@ pub fn encrypt_packet(input: &str) -> Result<String, ErrorStack> {
} }
fn generate_random_iv() -> Vec<u8> { fn generate_random_iv() -> Vec<u8> {
let mut rng = rand::thread_rng(); let mut rng = rand::rng();
let mut bytes = vec![0u8; IV_LENGTH]; let mut bytes = vec![0u8; IV_LENGTH];
rng.fill(&mut bytes[..]); rng.fill(&mut bytes[..]);
bytes bytes

View file

@ -51,8 +51,8 @@ fn save_event_data(key: &str, event_id: u32, data: JsonValue) {
} }
fn get_random_song() -> JsonValue { fn get_random_song() -> JsonValue {
let mut rng = rand::thread_rng(); let mut rng = rand::rng();
let random_number = rng.gen_range(0..=databases::LIVES.len()); let random_number = rng.random_range(0..=databases::LIVES.len());
object!{ object!{
song: databases::LIVES[random_number]["masterMusicId"].clone(), song: databases::LIVES[random_number]["masterMusicId"].clone(),
score: (databases::LIVES[random_number]["scoreC"].as_f64().unwrap() * 1.75).round() as i64 score: (databases::LIVES[random_number]["scoreC"].as_f64().unwrap() * 1.75).round() as i64

View file

@ -244,7 +244,7 @@ fn random_number(lowest: usize, highest: usize) -> usize {
} }
assert!(lowest < highest); assert!(lowest < highest);
rand::thread_rng().gen_range(lowest..highest + 1) rand::rng().random_range(lowest..highest + 1)
} }
pub fn gift_item_basic(id: i32, value: i64, ty_pe: i32, reason: &str, user: &mut JsonValue) -> JsonValue { pub fn gift_item_basic(id: i32, value: i64, ty_pe: i32, reason: &str, user: &mut JsonValue) -> JsonValue {

View file

@ -34,7 +34,7 @@ fn random_number(lowest: usize, highest: usize) -> usize {
} }
assert!(lowest < highest); assert!(lowest < highest);
rand::thread_rng().gen_range(lowest..highest + 1) rand::rng().random_range(lowest..highest + 1)
} }
pub fn guest(req: HttpRequest, body: String) -> Option<JsonValue> { pub fn guest(req: HttpRequest, body: String) -> Option<JsonValue> {

View file

@ -46,7 +46,7 @@ fn get_random_card(item: &JsonValue, rv: &mut JsonValue, rng: &mut rand::rngs::T
let mut random_id = 0; let mut random_id = 0;
while random_id == 0 { while random_id == 0 {
let card = rng.gen_range(1..databases::POOL[lottery_id.to_string()][databases::POOL[lottery_id.to_string()].len() - 1].as_i64().unwrap() + 1); let card = rng.random_range(1..databases::POOL[lottery_id.to_string()][databases::POOL[lottery_id.to_string()].len() - 1].as_i64().unwrap() + 1);
if get_card_master_id(lottery_id.to_string(), card.to_string()).is_some() { if get_card_master_id(lottery_id.to_string(), card.to_string()).is_some() {
random_id = card; random_id = card;
break; break;
@ -63,7 +63,7 @@ fn get_random_card(item: &JsonValue, rv: &mut JsonValue, rng: &mut rand::rngs::T
fn get_random_cards(id: i64, mut count: usize) -> JsonValue { fn get_random_cards(id: i64, mut count: usize) -> JsonValue {
let total_ratio: i64 = databases::RARITY[id.to_string()].members().map(|item| if item["ensured"].as_i32().unwrap() == 1 { 0 } else { item["ratio"].as_i64().unwrap() }).sum(); let total_ratio: i64 = databases::RARITY[id.to_string()].members().map(|item| if item["ensured"].as_i32().unwrap() == 1 { 0 } else { item["ratio"].as_i64().unwrap() }).sum();
let mut rng = rand::thread_rng(); let mut rng = rand::rng();
let mut rv = array![]; let mut rv = array![];
let mut promised = false; let mut promised = false;
@ -80,7 +80,7 @@ fn get_random_cards(id: i64, mut count: usize) -> JsonValue {
count -= 1; count -= 1;
} }
for _i in 0..count { for _i in 0..count {
let random_number: i64 = rng.gen_range(1..total_ratio + 1); let random_number: i64 = rng.random_range(1..total_ratio + 1);
let mut cumulative_ratio = 0; let mut cumulative_ratio = 0;
for item in databases::RARITY[id.to_string()].members() { for item in databases::RARITY[id.to_string()].members() {
cumulative_ratio += item["ratio"].as_i64().unwrap(); cumulative_ratio += item["ratio"].as_i64().unwrap();

View file

@ -94,8 +94,8 @@ fn get_key(auth_key: &str) -> i64 {
} }
fn generate_uid() -> i64 { fn generate_uid() -> i64 {
let mut rng = rand::thread_rng(); let mut rng = rand::rng();
let random_number = rng.gen_range(100_000_000_000_000..=999_999_999_999_999); let random_number = rng.random_range(100_000_000_000_000..=999_999_999_999_999);
//the chances of this...? //the chances of this...?
if acc_exists(random_number) { if acc_exists(random_number) {
return generate_uid(); return generate_uid();
@ -301,7 +301,7 @@ pub fn save_acc_sif(auth_key: &str, data: JsonValue) {
} }
fn generate_salt() -> Vec<u8> { fn generate_salt() -> Vec<u8> {
let mut rng = rand::thread_rng(); let mut rng = rand::rng();
let mut bytes = vec![0u8; 16]; let mut bytes = vec![0u8; 16];
rng.fill(&mut bytes[..]); rng.fill(&mut bytes[..]);
bytes bytes