From a061644b2dde4fc5964d101c525030aeb195ee9d Mon Sep 17 00:00:00 2001 From: strawberry Date: Fri, 7 Jun 2024 03:42:33 -0400 Subject: [PATCH] service(event_handler): use `self` instead of `services()` Signed-off-by: strawberry --- src/service/rooms/event_handler/mod.rs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/service/rooms/event_handler/mod.rs b/src/service/rooms/event_handler/mod.rs index 2243cb0a..d1413cb5 100644 --- a/src/service/rooms/event_handler/mod.rs +++ b/src/service/rooms/event_handler/mod.rs @@ -93,7 +93,7 @@ impl Service { } // 1.3.1 Check room ACL on origin field/server - services().rooms.event_handler.acl_check(origin, room_id)?; + self.acl_check(origin, room_id)?; // 1.3.2 Check room ACL on sender's server name let sender: OwnedUserId = serde_json::from_value( @@ -105,10 +105,7 @@ impl Service { ) .map_err(|_| Error::BadRequest(ErrorKind::BadJson, "User ID in sender is invalid"))?; - services() - .rooms - .event_handler - .acl_check(sender.server_name(), room_id)?; + self.acl_check(sender.server_name(), room_id)?; // Fetch create event let create_event = services() @@ -199,9 +196,7 @@ impl Service { .await .insert(room_id.to_owned(), (event_id.to_owned(), start_time)); - let r = services() - .rooms - .event_handler + let r = self .upgrade_outlier_to_timeline_pdu(incoming_pdu, val, &create_event, origin, room_id, pub_key_map) .await;