pull stuff out of globals

src/service/globals/mod.rs

@@ -1,20 +1,10 @@
 mod data;
 
-use std::{
-	collections::HashMap,
-	fmt::Write,
-	ops::Range,
-	sync::{Arc, RwLock},
-	time::Instant,
-};
+use std::{ops::Range, sync::Arc};
 
-use async_trait::async_trait;
 use data::Data;
-use regex::RegexSet;
-use ruma::{
-	OwnedEventId, OwnedRoomAliasId, OwnedServerName, OwnedUserId, RoomAliasId, ServerName, UserId,
-};
-use tuwunel_core::{Result, Server, error, utils::bytes::pretty};
+use ruma::{OwnedUserId, RoomAliasId, ServerName, UserId};
+use tuwunel_core::{Result, Server, error};
 
 use crate::service;
 
@@ -22,16 +12,11 @@ pub struct Service {
 	pub db: Data,
 	server: Arc<Server>,
 
-	pub bad_event_ratelimiter: Arc<RwLock<HashMap<OwnedEventId, RateLimitState>>>,
 	pub server_user: OwnedUserId,
-	pub admin_alias: OwnedRoomAliasId,
 	pub turn_secret: String,
 	pub registration_token: Option<String>,
 }
 
-type RateLimitState = (Instant, u32); // Time if last failed try, number of failed tries
-
-#[async_trait]
 impl crate::Service for Service {
 	fn build(args: &crate::Args<'_>) -> Result<Arc<Self>> {
 		let db = Data::new(args);
@@ -67,9 +52,6 @@ impl crate::Service for Service {
 		Ok(Arc::new(Self {
 			db,
 			server: args.server.clone(),
-			bad_event_ratelimiter: Arc::new(RwLock::new(HashMap::new())),
-			admin_alias: OwnedRoomAliasId::try_from(format!("#admins:{}", &args.server.name))
-				.expect("#admins:server_name is valid alias name"),
 			server_user: UserId::parse_with_server_name(
 				String::from("conduit"),
 				&args.server.name,
@@ -80,29 +62,6 @@ impl crate::Service for Service {
 		}))
 	}
 
-	async fn memory_usage(&self, out: &mut (dyn Write + Send)) -> Result {
-		let (ber_count, ber_bytes) = self.bad_event_ratelimiter.read()?.iter().fold(
-			(0_usize, 0_usize),
-			|(mut count, mut bytes), (event_id, _)| {
-				bytes = bytes.saturating_add(event_id.capacity());
-				bytes = bytes.saturating_add(size_of::<RateLimitState>());
-				count = count.saturating_add(1);
-				(count, bytes)
-			},
-		);
-
-		writeln!(out, "bad_event_ratelimiter: {ber_count} ({})", pretty(ber_bytes))?;
-
-		Ok(())
-	}
-
-	async fn clear_cache(&self) {
-		self.bad_event_ratelimiter
-			.write()
-			.expect("locked for writing")
-			.clear();
-	}
-
 	fn name(&self) -> &str { service::make_name(std::module_path!()) }
 }
 
@@ -141,110 +100,6 @@ impl Service {
 	#[must_use]
 	pub fn server_name(&self) -> &ServerName { self.server.name.as_ref() }
 
-	#[inline]
-	#[must_use]
-	pub fn allow_public_room_directory_over_federation(&self) -> bool {
-		self.server
-			.config
-			.allow_public_room_directory_over_federation
-	}
-
-	#[inline]
-	#[must_use]
-	pub fn allow_device_name_federation(&self) -> bool {
-		self.server.config.allow_device_name_federation
-	}
-
-	#[inline]
-	#[must_use]
-	pub fn allow_room_creation(&self) -> bool { self.server.config.allow_room_creation }
-
-	#[inline]
-	#[must_use]
-	pub fn new_user_displayname_suffix(&self) -> &String {
-		&self.server.config.new_user_displayname_suffix
-	}
-
-	#[inline]
-	#[must_use]
-	pub fn trusted_servers(&self) -> &[OwnedServerName] { &self.server.config.trusted_servers }
-
-	#[inline]
-	#[must_use]
-	pub fn turn_password(&self) -> &String { &self.server.config.turn_password }
-
-	#[inline]
-	#[must_use]
-	pub fn turn_ttl(&self) -> u64 { self.server.config.turn_ttl }
-
-	#[inline]
-	#[must_use]
-	pub fn turn_uris(&self) -> &[String] { &self.server.config.turn_uris }
-
-	#[inline]
-	#[must_use]
-	pub fn turn_username(&self) -> &String { &self.server.config.turn_username }
-
-	#[inline]
-	#[must_use]
-	pub fn notification_push_path(&self) -> &String { &self.server.config.notification_push_path }
-
-	#[inline]
-	#[must_use]
-	pub fn url_preview_domain_contains_allowlist(&self) -> &Vec<String> {
-		&self
-			.server
-			.config
-			.url_preview_domain_contains_allowlist
-	}
-
-	#[inline]
-	#[must_use]
-	pub fn url_preview_domain_explicit_allowlist(&self) -> &Vec<String> {
-		&self
-			.server
-			.config
-			.url_preview_domain_explicit_allowlist
-	}
-
-	#[inline]
-	#[must_use]
-	pub fn url_preview_domain_explicit_denylist(&self) -> &Vec<String> {
-		&self
-			.server
-			.config
-			.url_preview_domain_explicit_denylist
-	}
-
-	#[inline]
-	#[must_use]
-	pub fn url_preview_url_contains_allowlist(&self) -> &Vec<String> {
-		&self
-			.server
-			.config
-			.url_preview_url_contains_allowlist
-	}
-
-	#[inline]
-	#[must_use]
-	pub fn url_preview_max_spider_size(&self) -> usize {
-		self.server.config.url_preview_max_spider_size
-	}
-
-	#[inline]
-	#[must_use]
-	pub fn url_preview_check_root_domain(&self) -> bool {
-		self.server.config.url_preview_check_root_domain
-	}
-
-	#[inline]
-	#[must_use]
-	pub fn forbidden_alias_names(&self) -> &RegexSet { &self.server.config.forbidden_alias_names }
-
-	#[inline]
-	#[must_use]
-	pub fn forbidden_usernames(&self) -> &RegexSet { &self.server.config.forbidden_usernames }
-
 	/// checks if `user_id` is local to us via server_name comparison
 	#[inline]
 	#[must_use]