eightequal/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/routes/v3/friends.rs
View File

@@ -43,13 +43,13 @@ pub async fn add_friend(
let string = info.into_inner().0;
let friend =
crate::database::models::User::get(&string, &**pool, &redis).await?;
crate::database::models::DBUser::get(&string, &**pool, &redis).await?;
if let Some(friend) = friend {
let mut transaction = pool.begin().await?;
if let Some(friend) =
crate::database::models::friend_item::FriendItem::get_friend(
crate::database::models::friend_item::DBFriend::get_friend(
user.id.into(),
friend.id,
&**pool,
@@ -68,7 +68,7 @@ pub async fn add_friend(
));
}
crate::database::models::friend_item::FriendItem::update_friend(
crate::database::models::friend_item::DBFriend::update_friend(
friend.user_id,
friend.friend_id,
true,
@@ -115,7 +115,7 @@ pub async fn add_friend(
));
}
crate::database::models::friend_item::FriendItem {
crate::database::models::friend_item::DBFriend {
user_id: user.id.into(),
friend_id: friend.id,
created: Utc::now(),
@@ -161,12 +161,12 @@ pub async fn remove_friend(
let string = info.into_inner().0;
let friend =
crate::database::models::User::get(&string, &**pool, &redis).await?;
crate::database::models::DBUser::get(&string, &**pool, &redis).await?;
if let Some(friend) = friend {
let mut transaction = pool.begin().await?;
crate::database::models::friend_item::FriendItem::remove(
crate::database::models::friend_item::DBFriend::remove(
user.id.into(),
friend.id,
&mut transaction,
@@ -206,7 +206,7 @@ pub async fn friends(
.1;
let friends =
crate::database::models::friend_item::FriendItem::get_user_friends(
crate::database::models::friend_item::DBFriend::get_user_friends(
user.id.into(),
None,
&**pool,