From f0aed35ecf78e029f174c0d93524a4ffc6ad3ce8 Mon Sep 17 00:00:00 2001
From: timokoesters <timo@koesters.xyz>
Date: Mon, 18 May 2020 10:29:45 +0200
Subject: [PATCH] improvement: user dir search also searches in displaynames

---
 src/client_server.rs         | 15 +++++++++++----
 src/database/account_data.rs |  1 -
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/client_server.rs b/src/client_server.rs
index 60309524..054a0bc4 100644
--- a/src/client_server.rs
+++ b/src/client_server.rs
@@ -1205,11 +1205,18 @@ pub fn search_users_route(
             .users
             .iter()
             .map(Result::unwrap)
-            .filter(|user_id| user_id.to_string().contains(&body.search_term))
             .map(|user_id| search_users::User {
-                user_id,
-                display_name: None,
-                avatar_url: None,
+                user_id: user_id.clone(),
+                display_name: db.users.displayname(&user_id).unwrap(),
+                avatar_url: db.users.avatar_url(&user_id).unwrap(),
+            })
+            .filter(|user| {
+                user.user_id.to_string().contains(&body.search_term)
+                    || user
+                        .display_name
+                        .as_ref()
+                        .filter(|name| name.contains(&body.search_term))
+                        .is_some()
             })
             .collect(),
         limited: false,
diff --git a/src/database/account_data.rs b/src/database/account_data.rs
index 21982dec..e09ef2cd 100644
--- a/src/database/account_data.rs
+++ b/src/database/account_data.rs
@@ -113,7 +113,6 @@ impl AccountData {
             })
         {
             let (kind, data) = r.unwrap();
-            &data.deserialize();
             userdata.insert(kind, data);
         }