move read_receipt feature up one level out of rooms.edus.

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

src/service/mod.rs

@@ -73,9 +73,6 @@ impl Services<'_> {
 					presence: rooms::edus::presence::Service {
 						db,
 					},
-					read_receipt: rooms::edus::read_receipt::Service {
-						db,
-					},
 					typing: rooms::edus::typing::Service {
 						typing: RwLock::new(BTreeMap::new()),
 						last_typing_update: RwLock::new(BTreeMap::new()),
@@ -96,6 +93,9 @@ impl Services<'_> {
 				pdu_metadata: rooms::pdu_metadata::Service {
 					db,
 				},
+				read_receipt: rooms::read_receipt::Service {
+					db,
+				},
 				search: rooms::search::Service {
 					db,
 				},

src/service/rooms/edus/mod.rs

@@ -1,11 +1,9 @@
 pub mod presence;
-pub mod read_receipt;
 pub mod typing;
 
-pub trait Data: presence::Data + read_receipt::Data + 'static {}
+pub trait Data: presence::Data + 'static {}
 
 pub struct Service {
 	pub presence: presence::Service,
-	pub read_receipt: read_receipt::Service,
 	pub typing: typing::Service,
 }

src/service/rooms/mod.rs

@@ -7,6 +7,7 @@ pub mod lazy_loading;
 pub mod metadata;
 pub mod outlier;
 pub mod pdu_metadata;
+pub mod read_receipt;
 pub mod search;
 pub mod short;
 pub mod spaces;
@@ -27,6 +28,7 @@ pub trait Data:
 	+ metadata::Data
 	+ outlier::Data
 	+ pdu_metadata::Data
+	+ read_receipt::Data
 	+ search::Data
 	+ short::Data
 	+ state::Data
@@ -49,6 +51,7 @@ pub struct Service {
 	pub metadata: metadata::Service,
 	pub outlier: outlier::Service,
 	pub pdu_metadata: pdu_metadata::Service,
+	pub read_receipt: read_receipt::Service,
 	pub search: search::Service,
 	pub short: short::Service,
 	pub state: state::Service,

src/service/rooms/timeline/mod.rs

@@ -296,7 +296,6 @@ impl Service {
 		// appending fails
 		services()
 			.rooms
-			.edus
 			.read_receipt
 			.private_read_set(&pdu.room_id, &pdu.sender, count1)?;
 		services()

src/service/sending/mod.rs

@@ -521,7 +521,6 @@ pub fn select_edus_receipts(
 ) -> Result<bool> {
 	for r in services()
 		.rooms
-		.edus
 		.read_receipt
 		.readreceipts_since(room_id, since)
 	{