From cde6fdd74132b1943c4befb2b2d6d72aa46e5e10 Mon Sep 17 00:00:00 2001
From: strawberry <strawberry@puppygock.gay>
Date: Sat, 2 Mar 2024 17:09:10 -0500
Subject: [PATCH] resolve or_fun_call clippy lint

Signed-off-by: strawberry <strawberry@puppygock.gay>
---
 Cargo.toml                       |  2 +-
 src/api/client_server/report.rs  |  4 ++--
 src/api/client_server/session.rs |  2 +-
 src/api/client_server/sync.rs    | 13 +++++++++----
 src/service/admin/mod.rs         |  2 +-
 src/service/sending/mod.rs       |  5 ++++-
 src/service/users/mod.rs         |  6 +++---
 7 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index a91d37fc..81e77bd3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -257,5 +257,5 @@ unseparated_literal_suffix = "warn"
 # unwrap_used = "warn"
 # expect_used = "warn"
 wildcard_dependencies = "warn"
-# or_fun_call = "warn"
+or_fun_call = "warn"
 unnecessary_lazy_evaluations = "warn"
diff --git a/src/api/client_server/report.rs b/src/api/client_server/report.rs
index 3872e882..4d0921e7 100644
--- a/src/api/client_server/report.rs
+++ b/src/api/client_server/report.rs
@@ -86,7 +86,7 @@ pub async fn report_event_route(
                 pdu.event_id,
                 pdu.room_id,
                 pdu.sender.to_owned(),
-                body.score.unwrap_or(ruma::Int::from(0)),
+                body.score.unwrap_or_else(|| ruma::Int::from(0)),
                 body.reason.as_deref().unwrap_or("")
             ),
             format!(
@@ -100,7 +100,7 @@ pub async fn report_event_route(
             pdu.event_id.to_owned(),
             pdu.room_id.to_owned(),
             pdu.sender.to_owned(),
-            body.score.unwrap_or(ruma::Int::from(0)),
+            body.score.unwrap_or_else(|| ruma::Int::from(0)),
             HtmlEscape(body.reason.as_deref().unwrap_or(""))
         ),
         ));
diff --git a/src/api/client_server/session.rs b/src/api/client_server/session.rs
index b5e80001..a5181d59 100644
--- a/src/api/client_server/session.rs
+++ b/src/api/client_server/session.rs
@@ -215,7 +215,7 @@ pub async fn login_route(body: Ruma<login::v3::Request>) -> Result<login::v3::Re
             .globals
             .well_known_client()
             .to_owned()
-            .unwrap_or("".to_owned()),
+            .unwrap_or_else(|| "".to_owned()),
     ));
 
     info!("{} logged in", user_id);
diff --git a/src/api/client_server/sync.rs b/src/api/client_server/sync.rs
index bc5eacc0..9216fb84 100644
--- a/src/api/client_server/sync.rs
+++ b/src/api/client_server/sync.rs
@@ -554,12 +554,17 @@ async fn process_room_presence_updates(
 
                 // Update existing presence event with more info
                 curr_content.presence = new_content.presence;
-                curr_content.status_msg = new_content.status_msg.or(curr_content.status_msg.take());
+                curr_content.status_msg = new_content
+                    .status_msg
+                    .or_else(|| curr_content.status_msg.take());
                 curr_content.last_active_ago =
                     new_content.last_active_ago.or(curr_content.last_active_ago);
-                curr_content.displayname =
-                    new_content.displayname.or(curr_content.displayname.take());
-                curr_content.avatar_url = new_content.avatar_url.or(curr_content.avatar_url.take());
+                curr_content.displayname = new_content
+                    .displayname
+                    .or_else(|| curr_content.displayname.take());
+                curr_content.avatar_url = new_content
+                    .avatar_url
+                    .or_else(|| curr_content.avatar_url.take());
                 curr_content.currently_active = new_content
                     .currently_active
                     .or(curr_content.currently_active);
diff --git a/src/service/admin/mod.rs b/src/service/admin/mod.rs
index c77fde29..309e225c 100644
--- a/src/service/admin/mod.rs
+++ b/src/service/admin/mod.rs
@@ -1961,7 +1961,7 @@ impl Service {
                 .get_name(&id)
                 .ok()
                 .flatten()
-                .unwrap_or(id.to_string()),
+                .unwrap_or_else(|| id.to_string()),
         )
     }
 
diff --git a/src/service/sending/mod.rs b/src/service/sending/mod.rs
index 53debbcc..f634c903 100644
--- a/src/service/sending/mod.rs
+++ b/src/service/sending/mod.rs
@@ -310,7 +310,10 @@ impl Service {
                         user_id,
                         presence: presence_event.content.presence,
                         currently_active: presence_event.content.currently_active.unwrap_or(false),
-                        last_active_ago: presence_event.content.last_active_ago.unwrap_or(uint!(0)),
+                        last_active_ago: presence_event
+                            .content
+                            .last_active_ago
+                            .unwrap_or_else(|| uint!(0)),
                         status_msg: presence_event.content.status_msg,
                     });
                 }
diff --git a/src/service/users/mod.rs b/src/service/users/mod.rs
index b1a771ef..d2d0cb64 100644
--- a/src/service/users/mod.rs
+++ b/src/service/users/mod.rs
@@ -100,7 +100,7 @@ impl Service {
                 list.include_old_rooms = list
                     .include_old_rooms
                     .clone()
-                    .or(cached_list.include_old_rooms.clone());
+                    .or_else(|| cached_list.include_old_rooms.clone());
                 match (&mut list.filters, cached_list.filters.clone()) {
                     (Some(list_filters), Some(cached_filters)) => {
                         list_filters.is_dm = list_filters.is_dm.or(cached_filters.is_dm);
@@ -168,13 +168,13 @@ impl Service {
             .account_data
             .lists
             .clone()
-            .or(cached.extensions.account_data.lists.clone());
+            .or_else(|| cached.extensions.account_data.lists.clone());
         request.extensions.account_data.rooms = request
             .extensions
             .account_data
             .rooms
             .clone()
-            .or(cached.extensions.account_data.rooms.clone());
+            .or_else(|| cached.extensions.account_data.rooms.clone());
 
         cached.extensions = request.extensions.clone();