zhushenwudi/ew_author
1
0
Fork 0
mirror of https://git.ethanthesleepy.one/ethanaobrien/ew synced 2025-11-26 19:25:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update dependencies

Browse Source
This commit is contained in:
Ethan O'Brien
2025-05-01 12:14:17 -05:00
parent e27a020cfb
commit 1a736155e3
8 changed files with 598 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/encryption.rs
View File

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

4
src/router/event.rs
View File

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

2
src/router/items.rs
View File

@@ -244,7 +244,7 @@ fn random_number(lowest: usize, highest: usize) -> usize {
}
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 {

2
src/router/live.rs
View File

@@ -34,7 +34,7 @@ fn random_number(lowest: usize, highest: usize) -> usize {
}
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> {

6
src/router/lottery.rs
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;
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() {
random_id = card;
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 {
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 promised = false;
@@ -80,7 +80,7 @@ fn get_random_cards(id: i64, mut count: usize) -> JsonValue {
count -= 1;
}
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;
for item in databases::RARITY[id.to_string()].members() {
cumulative_ratio += item["ratio"].as_i64().unwrap();

6
src/router/userdata/mod.rs
View File

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