Merge branch 'main' into truman/project-download-modal

This commit is contained in:
Truman Gao
2026-07-03 13:27:03 -06:00
committed by GitHub
+18 -16
View File
@@ -130,23 +130,25 @@ pub async fn ws_init(
)?)
.await;
let unread_server_invites = DBNotification::get_many_user_exposed_on_site(
user_id.into(),
&**pool,
&redis,
)
.await?
.into_iter()
.filter(|notification| {
!notification.read
&& matches!(
&notification.body,
NotificationBody::ServerInvite { .. }
)
})
.map(Notification::from);
let unread_launcher_invites =
DBNotification::get_many_user_exposed_on_site(
user_id.into(),
&**pool,
&redis,
)
.await?
.into_iter()
.filter(|notification| {
!notification.read
&& matches!(
&notification.body,
NotificationBody::ServerInvite { .. }
| NotificationBody::SharedInstanceInvite { .. }
)
})
.map(Notification::from);
for notification in unread_server_invites {
for notification in unread_launcher_invites {
let _ = session.text(serde_json::to_string(&notification)?).await;
}