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

22
apps/labrinth/src/routes/v3/notifications.rs
View File

@@ -46,7 +46,7 @@ pub async fn notifications_get(
.1;
use database::models::DBNotificationId;
use database::models::notification_item::Notification as DBNotification;
use database::models::notification_item::DBNotification;
let notification_ids: Vec<DBNotificationId> =
serde_json::from_str::<Vec<NotificationId>>(ids.ids.as_str())?
@@ -55,7 +55,7 @@ pub async fn notifications_get(
.collect();
let notifications_data: Vec<DBNotification> =
database::models::notification_item::Notification::get_many(
database::models::notification_item::DBNotification::get_many(
&notification_ids,
&**pool,
)
@@ -90,7 +90,7 @@ pub async fn notification_get(
let id = info.into_inner().0;
let notification_data =
database::models::notification_item::Notification::get(
database::models::notification_item::DBNotification::get(
id.into(),
&**pool,
)
@@ -127,7 +127,7 @@ pub async fn notification_read(
let id = info.into_inner().0;
let notification_data =
database::models::notification_item::Notification::get(
database::models::notification_item::DBNotification::get(
id.into(),
&**pool,
)
@@ -137,7 +137,7 @@ pub async fn notification_read(
if data.user_id == user.id.into() || user.role.is_admin() {
let mut transaction = pool.begin().await?;
database::models::notification_item::Notification::read(
database::models::notification_item::DBNotification::read(
id.into(),
&mut transaction,
&redis,
@@ -177,7 +177,7 @@ pub async fn notification_delete(
let id = info.into_inner().0;
let notification_data =
database::models::notification_item::Notification::get(
database::models::notification_item::DBNotification::get(
id.into(),
&**pool,
)
@@ -187,7 +187,7 @@ pub async fn notification_delete(
if data.user_id == user.id.into() || user.role.is_admin() {
let mut transaction = pool.begin().await?;
database::models::notification_item::Notification::remove(
database::models::notification_item::DBNotification::remove(
id.into(),
&mut transaction,
&redis,
@@ -234,7 +234,7 @@ pub async fn notifications_read(
let mut transaction = pool.begin().await?;
let notifications_data =
database::models::notification_item::Notification::get_many(
database::models::notification_item::DBNotification::get_many(
&notification_ids,
&**pool,
)
@@ -249,7 +249,7 @@ pub async fn notifications_read(
}
}
database::models::notification_item::Notification::read_many(
database::models::notification_item::DBNotification::read_many(
&notifications,
&mut transaction,
&redis,
@@ -287,7 +287,7 @@ pub async fn notifications_delete(
let mut transaction = pool.begin().await?;
let notifications_data =
database::models::notification_item::Notification::get_many(
database::models::notification_item::DBNotification::get_many(
&notification_ids,
&**pool,
)
@@ -302,7 +302,7 @@ pub async fn notifications_delete(
}
}
database::models::notification_item::Notification::remove_many(
database::models::notification_item::DBNotification::remove_many(
&notifications,
&mut transaction,
&redis,