From 167807e0a6e333a4a8f7be9b8ed0da46831ce234 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Tue, 22 Oct 2024 00:09:55 +0000
Subject: [PATCH] de-wrapper max_fetch_prev_event; increase default config

Signed-off-by: Jason Volk <jason@zemos.net>
---
 src/core/config/mod.rs                 | 2 +-
 src/service/globals/mod.rs             | 2 --
 src/service/rooms/event_handler/mod.rs | 6 ++++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/core/config/mod.rs b/src/core/config/mod.rs
index 52ce8a01..23d35424 100644
--- a/src/core/config/mod.rs
+++ b/src/core/config/mod.rs
@@ -1822,7 +1822,7 @@ fn default_appservice_idle_timeout() -> u64 { 300 }
 
 fn default_pusher_idle_timeout() -> u64 { 15 }
 
-fn default_max_fetch_prev_events() -> u16 { 100_u16 }
+fn default_max_fetch_prev_events() -> u16 { 192_u16 }
 
 fn default_tracing_flame_filter() -> String {
 	cfg!(debug_assertions)
diff --git a/src/service/globals/mod.rs b/src/service/globals/mod.rs
index 7680007d..329a6583 100644
--- a/src/service/globals/mod.rs
+++ b/src/service/globals/mod.rs
@@ -171,8 +171,6 @@ impl Service {
 	#[inline]
 	pub fn server_name(&self) -> &ServerName { self.config.server_name.as_ref() }
 
-	pub fn max_fetch_prev_events(&self) -> u16 { self.config.max_fetch_prev_events }
-
 	pub fn allow_registration(&self) -> bool { self.config.allow_registration }
 
 	pub fn allow_guest_registration(&self) -> bool { self.config.allow_guest_registration }
diff --git a/src/service/rooms/event_handler/mod.rs b/src/service/rooms/event_handler/mod.rs
index 41ab79f1..8f96f68e 100644
--- a/src/service/rooms/event_handler/mod.rs
+++ b/src/service/rooms/event_handler/mod.rs
@@ -13,7 +13,7 @@ use conduit::{
 	result::LogErr,
 	trace,
 	utils::{math::continue_exponential_backoff_secs, IterStream, MutexMap},
-	warn, Err, Error, PduEvent, Result,
+	warn, Err, Error, PduEvent, Result, Server,
 };
 use futures::{future, future::ready, FutureExt, StreamExt, TryFutureExt};
 use ruma::{
@@ -55,6 +55,7 @@ struct Services {
 	state_accessor: Dep<rooms::state_accessor::Service>,
 	state_compressor: Dep<rooms::state_compressor::Service>,
 	timeline: Dep<rooms::timeline::Service>,
+	server: Arc<Server>,
 }
 
 type RoomMutexMap = MutexMap<OwnedRoomId, ()>;
@@ -76,6 +77,7 @@ impl crate::Service for Service {
 				state_accessor: args.depend::<rooms::state_accessor::Service>("rooms::state_accessor"),
 				state_compressor: args.depend::<rooms::state_compressor::Service>("rooms::state_compressor"),
 				timeline: args.depend::<rooms::timeline::Service>("rooms::timeline"),
+				server: args.server.clone(),
 			},
 			federation_handletime: HandleTimeMap::new().into(),
 			mutex_federation: RoomMutexMap::new(),
@@ -1280,7 +1282,7 @@ impl Service {
 			{
 				check_room_id(room_id, &pdu)?;
 
-				let limit = self.services.globals.max_fetch_prev_events();
+				let limit = self.services.server.config.max_fetch_prev_events;
 				if amount > limit {
 					debug_warn!("Max prev event limit reached! Limit: {limit}");
 					graph.insert(prev_event_id.clone(), HashSet::new());