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

14
apps/labrinth/src/queue/moderation.rs
View File

@@ -233,7 +233,7 @@ impl AutomatedModerationQueue {
for project in projects {
async {
let project =
database::Project::get_id((project).into(), &pool, &redis).await?;
database::DBProject::get_id((project).into(), &pool, &redis).await?;
if let Some(project) = project {
let res = async {
@@ -261,7 +261,7 @@ impl AutomatedModerationQueue {
}
let versions =
database::Version::get_many(&project.versions, &pool, &redis)
database::DBVersion::get_many(&project.versions, &pool, &redis)
.await?
.into_iter()
// we only support modpacks at this time
@@ -343,7 +343,7 @@ impl AutomatedModerationQueue {
}
}
let files = database::models::Version::get_files_from_hash(
let files = database::models::DBVersion::get_files_from_hash(
"sha1".to_string(),
&hashes.iter().map(|x| x.0.clone()).collect::<Vec<_>>(),
&pool,
@@ -354,7 +354,7 @@ impl AutomatedModerationQueue {
let version_ids =
files.iter().map(|x| x.version_id).collect::<Vec<_>>();
let versions_data = filter_visible_versions(
database::models::Version::get_many(
database::models::DBVersion::get_many(
&version_ids,
&pool,
&redis,
@@ -621,7 +621,7 @@ impl AutomatedModerationQueue {
}
if !mod_messages.is_empty() {
let first_time = database::models::Thread::get(project.thread_id, &pool).await?
let first_time = database::models::DBThread::get(project.thread_id, &pool).await?
.map(|x| x.messages.iter().all(|x| x.author_id == Some(database::models::DBUserId(AUTOMOD_ID)) || x.hide_identity))
.unwrap_or(true);
@@ -640,7 +640,7 @@ impl AutomatedModerationQueue {
.insert(&mut transaction)
.await?;
let members = database::models::TeamMember::get_from_team_full(
let members = database::models::DBTeamMember::get_from_team_full(
project.inner.team_id,
&pool,
&redis,
@@ -700,7 +700,7 @@ impl AutomatedModerationQueue {
.execute(&pool)
.await?;
database::models::Project::clear_cache(
database::models::DBProject::clear_cache(
project.inner.id,
project.inner.slug.clone(),
None,

10
apps/labrinth/src/queue/session.rs
View File

@@ -1,5 +1,5 @@
use crate::database::models::pat_item::PersonalAccessToken;
use crate::database::models::session_item::Session;
use crate::database::models::pat_item::DBPersonalAccessToken;
use crate::database::models::session_item::DBSession;
use crate::database::models::{
DBOAuthAccessTokenId, DBPatId, DBSessionId, DBUserId, DatabaseError,
};
@@ -123,10 +123,10 @@ impl AuthQueue {
Some(session),
Some(user_id),
));
Session::remove(id, &mut transaction).await?;
DBSession::remove(id, &mut transaction).await?;
}
Session::clear_cache(clear_cache_sessions, redis).await?;
DBSession::clear_cache(clear_cache_sessions, redis).await?;
let ids = pat_queue.iter().map(|id| id.0).collect_vec();
let clear_cache_pats = pat_queue
@@ -153,7 +153,7 @@ impl AuthQueue {
.await?;
transaction.commit().await?;
PersonalAccessToken::clear_cache(clear_cache_pats, redis).await?;
DBPersonalAccessToken::clear_cache(clear_cache_pats, redis).await?;
}
Ok(())