You've already forked AstralRinth
forked from didirus/AstralRinth
Some small Labrinth refactors and fixes (#3698)
* chore(labrinth): fix typos, simplify out `remove_duplicates` func * fix(labrinth): implement `capitalize_first` so that it can't panic on wide chars * chore(labrinth): refactor out unneeded clone highlighted by nightly Clippy lints * chore(labrinth): simplify `capitalize_first` implementation * fix(labrinth): preserve ordering when deduplicating project field values This addresses an unintended behavior change on 157647faf2778c74096e624aeef9cdb79539489c. * fix(labrinth/tests): make `index_swaps` test run successfully I wonder why we don't run these more often... * refactor: rename `.env.example` files to `.env.local`, make local envs more consistent between frontend and backend * chore(labrinth/.env.local): proper email verif. and password reset paths
This commit is contained in:
committed by
GitHub
parent
be37f077d3
commit
a9cfc37aac
@@ -264,11 +264,11 @@ pub fn convert_side_types_v2_bools(
|
||||
}
|
||||
|
||||
pub fn capitalize_first(input: &str) -> String {
|
||||
let mut result = input.to_owned();
|
||||
if let Some(first_char) = result.get_mut(0..1) {
|
||||
first_char.make_ascii_uppercase();
|
||||
}
|
||||
result
|
||||
input
|
||||
.chars()
|
||||
.enumerate()
|
||||
.map(|(i, c)| if i == 0 { c.to_ascii_uppercase() } else { c })
|
||||
.collect()
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
|
||||
@@ -52,10 +52,9 @@ pub async fn get_version_from_hash(
|
||||
.map(|x| x.1)
|
||||
.ok();
|
||||
let hash = info.into_inner().0.to_lowercase();
|
||||
let algorithm = hash_query
|
||||
.algorithm
|
||||
.clone()
|
||||
.unwrap_or_else(|| default_algorithm_from_hashes(&[hash.clone()]));
|
||||
let algorithm = hash_query.algorithm.clone().unwrap_or_else(|| {
|
||||
default_algorithm_from_hashes(std::slice::from_ref(&hash))
|
||||
});
|
||||
let file = database::models::DBVersion::get_file_from_hash(
|
||||
algorithm,
|
||||
hash,
|
||||
@@ -140,10 +139,9 @@ pub async fn get_update_from_hash(
|
||||
.ok();
|
||||
let hash = info.into_inner().0.to_lowercase();
|
||||
if let Some(file) = database::models::DBVersion::get_file_from_hash(
|
||||
hash_query
|
||||
.algorithm
|
||||
.clone()
|
||||
.unwrap_or_else(|| default_algorithm_from_hashes(&[hash.clone()])),
|
||||
hash_query.algorithm.clone().unwrap_or_else(|| {
|
||||
default_algorithm_from_hashes(std::slice::from_ref(&hash))
|
||||
}),
|
||||
hash,
|
||||
hash_query.version_id.map(|x| x.into()),
|
||||
&**pool,
|
||||
@@ -577,10 +575,9 @@ pub async fn delete_file(
|
||||
.1;
|
||||
|
||||
let hash = info.into_inner().0.to_lowercase();
|
||||
let algorithm = hash_query
|
||||
.algorithm
|
||||
.clone()
|
||||
.unwrap_or_else(|| default_algorithm_from_hashes(&[hash.clone()]));
|
||||
let algorithm = hash_query.algorithm.clone().unwrap_or_else(|| {
|
||||
default_algorithm_from_hashes(std::slice::from_ref(&hash))
|
||||
});
|
||||
let file = database::models::DBVersion::get_file_from_hash(
|
||||
algorithm.clone(),
|
||||
hash,
|
||||
@@ -709,10 +706,9 @@ pub async fn download_version(
|
||||
.ok();
|
||||
|
||||
let hash = info.into_inner().0.to_lowercase();
|
||||
let algorithm = hash_query
|
||||
.algorithm
|
||||
.clone()
|
||||
.unwrap_or_else(|| default_algorithm_from_hashes(&[hash.clone()]));
|
||||
let algorithm = hash_query.algorithm.clone().unwrap_or_else(|| {
|
||||
default_algorithm_from_hashes(std::slice::from_ref(&hash))
|
||||
});
|
||||
let file = database::models::DBVersion::get_file_from_hash(
|
||||
algorithm.clone(),
|
||||
hash,
|
||||
|
||||
Reference in New Issue
Block a user