Hot-Reloading Refactor

Signed-off-by: Jason Volk <jason@zemos.net>

src/service/rooms/threads/data.rs

@@ -4,7 +4,7 @@ use crate::{PduEvent, Result};
 
 type PduEventIterResult<'a> = Result<Box<dyn Iterator<Item = Result<(u64, PduEvent)>> + 'a>>;
 
-pub(crate) trait Data: Send + Sync {
+pub trait Data: Send + Sync {
 	fn threads_until<'a>(
 		&'a self, user_id: &'a UserId, room_id: &'a RoomId, until: u64, include: &'a IncludeThreads,
 	) -> PduEventIterResult<'a>;

src/service/rooms/threads/mod.rs

@@ -1,8 +1,8 @@
 mod data;
 
-use std::collections::BTreeMap;
+use std::{collections::BTreeMap, sync::Arc};
 
-pub(crate) use data::Data;
+pub use data::Data;
 use ruma::{
 	api::client::{error::ErrorKind, threads::get_threads::v1::IncludeThreads},
 	events::relation::BundledThread,
@@ -12,18 +12,18 @@ use serde_json::json;
 
 use crate::{services, Error, PduEvent, Result};
 
-pub(crate) struct Service {
-	pub(crate) db: &'static dyn Data,
+pub struct Service {
+	pub db: Arc<dyn Data>,
 }
 
 impl Service {
-	pub(crate) fn threads_until<'a>(
+	pub fn threads_until<'a>(
 		&'a self, user_id: &'a UserId, room_id: &'a RoomId, until: u64, include: &'a IncludeThreads,
 	) -> Result<impl Iterator<Item = Result<(u64, PduEvent)>> + 'a> {
 		self.db.threads_until(user_id, room_id, until, include)
 	}
 
-	pub(crate) fn add_to_thread(&self, root_event_id: &EventId, pdu: &PduEvent) -> Result<()> {
+	pub fn add_to_thread(&self, root_event_id: &EventId, pdu: &PduEvent) -> Result<()> {
 		let root_id = &services()
 			.rooms
 			.timeline