From f855bd09d1cac4159da85614c8cf3fff5b1c03e7 Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Tue, 14 May 2024 19:28:36 -0700
Subject: [PATCH] enable `unused_async` lint

This also caused a "new" `unnecessary_wraps` lint to fire too, so that
got fixed too.
---
 Cargo.toml                          |  1 +
 src/api/client_server/membership.rs | 12 ++++++------
 src/service/rooms/state_accessor.rs |  8 ++++----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 80eb00bd..dd4cf60c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -90,6 +90,7 @@ unneeded_field_pattern = "warn"
 unnested_or_patterns = "warn"
 unreadable_literal = "warn"
 unseparated_literal_suffix = "warn"
+unused_async = "warn"
 verbose_file_reads = "warn"
 wildcard_dependencies = "warn"
 
diff --git a/src/api/client_server/membership.rs b/src/api/client_server/membership.rs
index b8663ce1..005ce01d 100644
--- a/src/api/client_server/membership.rs
+++ b/src/api/client_server/membership.rs
@@ -599,12 +599,12 @@ async fn join_room_by_id_helper(
                 .collect::<Vec<_>>()
             {
                 if user.server_name() == services().globals.server_name()
-                    && services()
-                        .rooms
-                        .state_accessor
-                        .user_can_invite(room_id, &user, sender_user, &state_lock)
-                        .await
-                        .unwrap_or(false)
+                    && services().rooms.state_accessor.user_can_invite(
+                        room_id,
+                        &user,
+                        sender_user,
+                        &state_lock,
+                    )
                 {
                     auth_user = Some(user);
                     break;
diff --git a/src/service/rooms/state_accessor.rs b/src/service/rooms/state_accessor.rs
index 0c0b8ac5..4ed4d43f 100644
--- a/src/service/rooms/state_accessor.rs
+++ b/src/service/rooms/state_accessor.rs
@@ -310,13 +310,13 @@ impl Service {
             })
     }
 
-    pub(crate) async fn user_can_invite(
+    pub(crate) fn user_can_invite(
         &self,
         room_id: &RoomId,
         sender: &UserId,
         target_user: &UserId,
         state_lock: &MutexGuard<'_, ()>,
-    ) -> Result<bool> {
+    ) -> bool {
         let content = to_raw_value(&RoomMemberEventContent::new(MembershipState::Invite))
             .expect("Event content always serializes");
 
@@ -328,11 +328,11 @@ impl Service {
             redacts: None,
         };
 
-        Ok(services()
+        services()
             .rooms
             .timeline
             .create_hash_and_sign_event(new_event, sender, room_id, state_lock)
-            .is_ok())
+            .is_ok()
     }
 
     pub(crate) fn get_member(