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

Commonize and distinguish a lot of struct names in labrinth::database::models (#3691)

Browse Source
This commit is contained in:
Josiah Glosson
2025-05-24 04:38:43 -05:00
committed by GitHub
parent 9c1bdf16e4
commit 4e4a7be7ef
78 changed files with 1075 additions and 1009 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/labrinth/src/routes/v2/project_creation.rs
View File

@@ -258,8 +258,12 @@ pub async fn project_create(
Ok(project) => {
let version_item = match project.versions.first() {
Some(vid) => {
version_item::Version::get((*vid).into(), &**client, &redis)
.await?
version_item::DBVersion::get(
(*vid).into(),
&**client,
&redis,
)
.await?
}
None => None,
};

8
apps/labrinth/src/routes/v2/projects.rs
View File

@@ -229,7 +229,7 @@ pub async fn project_get(
Ok(project) => {
let version_item = match project.versions.first() {
Some(vid) => {
version_item::Version::get((*vid).into(), &**pool, &redis)
version_item::DBVersion::get((*vid).into(), &**pool, &redis)
.await?
}
None => None,
@@ -469,7 +469,7 @@ pub async fn project_edit(
if let Some(donation_urls) = v2_new_project.donation_urls {
// Fetch current donation links from project so we know what to delete
let fetched_example_project =
project_item::Project::get(&info.0, &**pool, &redis).await?;
project_item::DBProject::get(&info.0, &**pool, &redis).await?;
let donation_links = fetched_example_project
.map(|x| {
x.urls
@@ -533,7 +533,7 @@ pub async fn project_edit(
if response.status().is_success()
&& (client_side.is_some() || server_side.is_some())
{
let project_item = project_item::Project::get(
let project_item = project_item::DBProject::get(
&new_slug.unwrap_or(project_id),
&**pool,
&redis,
@@ -541,7 +541,7 @@ pub async fn project_edit(
.await?;
let version_ids = project_item.map(|x| x.versions).unwrap_or_default();
let versions =
version_item::Version::get_many(&version_ids, &**pool, &redis)
version_item::DBVersion::get_many(&version_ids, &**pool, &redis)
.await?;
for version in versions {
let version = Version::from(version);

21
apps/labrinth/src/routes/v2/version_creation.rs
View File

@@ -288,17 +288,20 @@ async fn get_example_version_fields(
None => return Ok(None),
};
let vid =
match project_item::Project::get_id(project_id.into(), &**pool, redis)
.await?
.and_then(|p| p.versions.first().cloned())
{
Some(vid) => vid,
None => return Ok(None),
};
let vid = match project_item::DBProject::get_id(
project_id.into(),
&**pool,
redis,
)
.await?
.and_then(|p| p.versions.first().cloned())
{
Some(vid) => vid,
None => return Ok(None),
};
let example_version =
match version_item::Version::get(vid, &**pool, redis).await? {
match version_item::DBVersion::get(vid, &**pool, redis).await? {
Some(version) => version,
None => return Ok(None),
};