Bommels05/Modrinth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ignore any dependencies set manually for modpacks (#433)

Browse Source 
* Ignore any dependencies set manually for modpacks

* actually build
This commit is contained in:
wafflecoffee 2022-09-17 16:17:32 -04:00 committed by GitHub
parent 60252267d5
commit d754eb74f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sqlx-data.json
View File

@ -3681,6 +3681,18 @@
}, },
"query": "\n SELECT f.url url, h.hash hash, h.algorithm algorithm, f.version_id version_id, v.mod_id project_id FROM hashes h\n INNER JOIN files f ON h.file_id = f.id\n INNER JOIN versions v ON v.id = f.version_id\n INNER JOIN mods m on v.mod_id = m.id\n INNER JOIN statuses s on m.status = s.id\n WHERE h.algorithm = $2 AND h.hash = ANY($1::bytea[]) AND s.status != $3\n " "query": "\n SELECT f.url url, h.hash hash, h.algorithm algorithm, f.version_id version_id, v.mod_id project_id FROM hashes h\n INNER JOIN files f ON h.file_id = f.id\n INNER JOIN versions v ON v.id = f.version_id\n INNER JOIN mods m on v.mod_id = m.id\n INNER JOIN statuses s on m.status = s.id\n WHERE h.algorithm = $2 AND h.hash = ANY($1::bytea[]) AND s.status != $3\n "
}, },
"9c8f3f9503b5bb52e05bbc8a8eee7f640ab7d6b04a59ec111ce8b23e886911de": {
"describe": {
"columns": [],
"nullable": [],
"parameters": {
"Left": [
"Int8"
]
}
},
"query": "\n DELETE FROM dependencies WHERE dependent_id = $1\n "
},
"9ceca63fb11f35f09f77bb9db175a1ac74dfcc2200c8134866922742fbbedea3": { "9ceca63fb11f35f09f77bb9db175a1ac74dfcc2200c8134866922742fbbedea3": {
"describe": { "describe": {
"columns": [], "columns": [],
@ -3840,18 +3852,6 @@
}, },
"query": "\n DELETE FROM states\n WHERE id = $1\n " "query": "\n DELETE FROM states\n WHERE id = $1\n "
}, },
"a40e4075ba1bff5b6fde104ed1557ad8d4a75d7d90d481decd222f31685c4981": {
"describe": {
"columns": [],
"nullable": [],
"parameters": {
"Left": [
"Int8"
]
}
},
"query": "\n DELETE FROM dependencies WHERE dependent_id = $1\n "
},
"a647c282a276b63f36d2d8a253c32d0f627cea9cab8eb1b32b39875536bdfcbb": { "a647c282a276b63f36d2d8a253c32d0f627cea9cab8eb1b32b39875536bdfcbb": {
"describe": { "describe": {
"columns": [], "columns": [],

10
src/routes/versions.rs
View File

@ -208,6 +208,12 @@ pub async fn version_edit(
let result = database::models::Version::get_full(id, &**pool).await?; let result = database::models::Version::get_full(id, &**pool).await?;
if let Some(version_item) = result { if let Some(version_item) = result {
let project_item = database::models::Project::get_full(
version_item.project_id,
&**pool,
)
.await?;
let team_member = let team_member =
database::models::TeamMember::get_from_user_id_version( database::models::TeamMember::get_from_user_id_version(
version_item.id, version_item.id,
@ -281,6 +287,8 @@ pub async fn version_edit(
} }
if let Some(dependencies) = &new_version.dependencies { if let Some(dependencies) = &new_version.dependencies {
if let Some(project) = project_item {
if project.project_type != "modpack" {
sqlx::query!( sqlx::query!(
" "
DELETE FROM dependencies WHERE dependent_id = $1 DELETE FROM dependencies WHERE dependent_id = $1
@ -306,6 +314,8 @@ pub async fn version_edit(
.await?; .await?;
} }
} }
}
}
if let Some(game_versions) = &new_version.game_versions { if let Some(game_versions) = &new_version.game_versions {
sqlx::query!( sqlx::query!(