Merge branch 'axum' of http://www.github.com/modrinth/labrinth into axum

modrinth · Jan 16, 2024 · dd08a60 · dd08a60
2 parents 4a651b4 + b8f6f86
commit dd08a60
Show file tree

Hide file tree

Showing 23 changed files with 834 additions and 820 deletions.
diff --git a/src/auth/mod.rs b/src/auth/mod.rs
@@ -55,7 +55,7 @@ impl IntoResponse for AuthenticationError {
     fn into_response(self) -> Response {
         let error_message = ApiError {
             error: self.error_name(),
-            description: &*self.to_string(),
+            description: &self.to_string(),
         };
 
         (self.status_code(), Json(error_message)).into_response()

diff --git a/src/database/models/notification_item.rs b/src/database/models/notification_item.rs
@@ -91,11 +91,8 @@ impl Notification {
         .execute(&mut **transaction)
         .await?;
 
-        Notification::clear_user_notifications_cache(
-            notifications.iter().map(|n| &n.user_id),
-            redis,
-        )
-        .await?;
+        let user_ids = notifications.iter().map(|n| n.user_id).collect::<Vec<_>>();
+        Notification::clear_user_notifications_cache(&user_ids, redis).await?;
 
         Ok(())
     }