From 6281418ecbc7adf8514b40be19d43889578caa08 Mon Sep 17 00:00:00 2001
From: Paul Makles <paulmakles@gmail.com>
Date: Fri, 29 Apr 2022 13:03:48 +0100
Subject: [PATCH] chore: separate BannedUser mapping

---
 src/routes/servers/ban_list.rs | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/routes/servers/ban_list.rs b/src/routes/servers/ban_list.rs
index 217f0b81..d66bca01 100644
--- a/src/routes/servers/ban_list.rs
+++ b/src/routes/servers/ban_list.rs
@@ -27,6 +27,16 @@ pub struct BanListResult {
     bans: Vec<ServerBan>,
 }
 
+impl From<User> for BannedUser {
+    fn from(user: User) -> Self {
+        BannedUser {
+            id: user.id,
+            username: user.username,
+            avatar: user.avatar,
+        }
+    }
+}
+
 /// # Fetch Bans
 ///
 /// Fetch all bans on a server.
@@ -50,11 +60,7 @@ pub async fn req(db: &Db, user: User, target: Ref) -> Result<Json<BanListResult>
         )
         .await?
         .into_iter()
-        .map(|x| BannedUser {
-            id: x.id,
-            username: x.username,
-            avatar: x.avatar,
-        })
+        .map(|x| x.into())
         .collect();
 
     Ok(Json(BanListResult { users, bans }))