tomasalias/AstralRinth
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

Inherit dependencies from workspace manifest, and optimize some out (#3655)

Browse Source 
* chore: inherit dependencies from workspace, optimize some deps out

* Update bitflags from 2.9.0 to 2.9.1

* Fix temp directory leak in check_java_at_filepath

* Fix build

* Fix lint

* chore(app-lib): refactor overkill `futures` executor usage to Tokio MPSC

* chore: fix Clippy lint

* tweak: optimize out dependency on OpenSSL source build

Contrary to what I expected before, this was caused due to the Tauri
updater plugin using a different TLS stack than everything else.

* chore(labrinth): drop now unused dependency

* Update zip because 2.6.1 got yanked

* Downgrade weezl to 0.1.8

* Mention that p256 is also a blocker for rand 0.9

* chore: sidestep GitHub review requirements

* chore: sidestep GitHub review requirements (2)

* chore: sidestep GitHub review requirements (3)

---------

Co-authored-by: Josiah Glosson <soujournme@gmail.com>
This commit is contained in:
Alejandro González
2025-05-15 22:47:29 +02:00
committed by GitHub
parent 37cc81a36d
commit f19643095e
35 changed files with 876 additions and 1020 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
apps/labrinth/src/routes/v3/versions.rs
View File

@@ -287,10 +287,10 @@ pub async fn version_edit_helper(
ApiError::Validation(validation_errors_to_string(err, None))
})?;
let version_id = info.0;
let id = version_id.into();
let version_id = info.0.into();
let result = database::models::Version::get(id, &**pool, &redis).await?;
let result =
database::models::Version::get(version_id, &**pool, &redis).await?;
if let Some(version_item) = result {
let team_member =
@@ -345,7 +345,7 @@ pub async fn version_edit_helper(
WHERE (id = $2)
",
name.trim(),
id as database::models::ids::VersionId,
version_id as database::models::ids::VersionId,
)
.execute(&mut *transaction)
.await?;
@@ -359,7 +359,7 @@ pub async fn version_edit_helper(
WHERE (id = $2)
",
number,
id as database::models::ids::VersionId,
version_id as database::models::ids::VersionId,
)
.execute(&mut *transaction)
.await?;
@@ -373,7 +373,7 @@ pub async fn version_edit_helper(
WHERE (id = $2)
",
version_type.as_str(),
id as database::models::ids::VersionId,
version_id as database::models::ids::VersionId,
)
.execute(&mut *transaction)
.await?;
@@ -384,7 +384,7 @@ pub async fn version_edit_helper(
"
DELETE FROM dependencies WHERE dependent_id = $1
",
id as database::models::ids::VersionId,
version_id as database::models::ids::VersionId,
)
.execute(&mut *transaction)
.await?;
@@ -448,7 +448,7 @@ pub async fn version_edit_helper(
WHERE version_id = $1
AND field_id = ANY($2)
",
id as database::models::ids::VersionId,
version_id as database::models::ids::VersionId,
&loader_field_ids
)
.execute(&mut *transaction)
@@ -476,7 +476,7 @@ pub async fn version_edit_helper(
.remove(&loader_field.id)
.unwrap_or_default();
let vf: VersionField = VersionField::check_parse(
version_id.into(),
version_id,
loader_field.clone(),
vf_value.clone(),
enum_variants,
@@ -493,7 +493,7 @@ pub async fn version_edit_helper(
"
DELETE FROM loaders_versions WHERE version_id = $1
",
id as database::models::ids::VersionId,
version_id as database::models::ids::VersionId,
)
.execute(&mut *transaction)
.await?;
@@ -513,7 +513,10 @@ pub async fn version_edit_helper(
.to_string(),
)
})?;
loader_versions.push(LoaderVersion::new(loader_id, id));
loader_versions.push(LoaderVersion {
loader_id,
version_id,
});
}
LoaderVersion::insert_many(loader_versions, &mut transaction)
.await?;
@@ -535,7 +538,7 @@ pub async fn version_edit_helper(
WHERE (id = $2)
",
featured,
id as database::models::ids::VersionId,
version_id as database::models::ids::VersionId,
)
.execute(&mut *transaction)
.await?;
@@ -549,7 +552,7 @@ pub async fn version_edit_helper(
WHERE (id = $2)
",
body,
id as database::models::ids::VersionId,
version_id as database::models::ids::VersionId,
)
.execute(&mut *transaction)
.await?;
@@ -569,7 +572,7 @@ pub async fn version_edit_helper(
WHERE (id = $2)
",
*downloads as i32,
id as database::models::ids::VersionId,
version_id as database::models::ids::VersionId,
)
.execute(&mut *transaction)
.await?;
@@ -604,7 +607,7 @@ pub async fn version_edit_helper(
WHERE (id = $2)
",
status.as_str(),
id as database::models::ids::VersionId,
version_id as database::models::ids::VersionId,
)
.execute(&mut *transaction)
.await?;
@@ -652,7 +655,7 @@ pub async fn version_edit_helper(
WHERE (id = $2)
",
ordering.to_owned() as Option<i32>,
id as database::models::ids::VersionId,
version_id as database::models::ids::VersionId,
)
.execute(&mut *transaction)
.await?;