From c0c7f23a0579a2e736c7874012fa3d5b2095f824 Mon Sep 17 00:00:00 2001
From: strawberry <strawberry@puppygock.gay>
Date: Fri, 7 Jun 2024 03:52:37 -0400
Subject: [PATCH] services(timeline): use `self` instead of `services()`

Signed-off-by: strawberry <strawberry@puppygock.gay>
---
 src/service/rooms/timeline/mod.rs | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/service/rooms/timeline/mod.rs b/src/service/rooms/timeline/mod.rs
index 34a60507..b8462b87 100644
--- a/src/service/rooms/timeline/mod.rs
+++ b/src/service/rooms/timeline/mod.rs
@@ -494,11 +494,7 @@ impl Service {
 		}
 
 		if let Ok(content) = serde_json::from_str::<ExtractRelatesToEventId>(pdu.content.get()) {
-			if let Some(related_pducount) = services()
-				.rooms
-				.timeline
-				.get_pdu_count(&content.relates_to.event_id)?
-			{
+			if let Some(related_pducount) = self.get_pdu_count(&content.relates_to.event_id)? {
 				services()
 					.rooms
 					.pdu_metadata
@@ -513,11 +509,7 @@ impl Service {
 				} => {
 					// We need to do it again here, because replies don't have
 					// event_id as a top level field
-					if let Some(related_pducount) = services()
-						.rooms
-						.timeline
-						.get_pdu_count(&in_reply_to.event_id)?
-					{
+					if let Some(related_pducount) = self.get_pdu_count(&in_reply_to.event_id)? {
 						services()
 							.rooms
 							.pdu_metadata
@@ -646,7 +638,7 @@ impl Service {
 		// Our depth is the maximum depth of prev_events + 1
 		let depth = prev_events
 			.iter()
-			.filter_map(|event_id| Some(services().rooms.timeline.get_pdu(event_id).ok()??.depth))
+			.filter_map(|event_id| Some(self.get_pdu(event_id).ok()??.depth))
 			.max()
 			.unwrap_or_else(|| uint!(0))
 			+ uint!(1);
@@ -945,9 +937,7 @@ impl Service {
 			return Ok(None);
 		}
 
-		let pdu_id = services()
-			.rooms
-			.timeline
+		let pdu_id = self
 			.append_pdu(pdu, pdu_json, new_room_leaves, state_lock)
 			.await?;
 
@@ -1138,7 +1128,7 @@ impl Service {
 		let mutex_lock = mutex.lock().await;
 
 		// Skip the PDU if we already have it as a timeline event
-		if let Some(pdu_id) = services().rooms.timeline.get_pdu_id(&event_id)? {
+		if let Some(pdu_id) = self.get_pdu_id(&event_id)? {
 			info!("We already know {event_id} at {pdu_id:?}");
 			return Ok(());
 		}