dissolve key_value/*

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

src/service/rooms/directory/data.rs

@@ -1,6 +1,6 @@
 use ruma::{OwnedRoomId, RoomId};
 
-use crate::Result;
+use crate::{utils, Error, KeyValueDatabase, Result};
 
 pub trait Data: Send + Sync {
 	/// Adds the room to the public room directory
@@ -15,3 +15,23 @@ pub trait Data: Send + Sync {
 	/// Returns the unsorted public room directory
 	fn public_rooms<'a>(&'a self) -> Box<dyn Iterator<Item = Result<OwnedRoomId>> + 'a>;
 }
+
+impl Data for KeyValueDatabase {
+	fn set_public(&self, room_id: &RoomId) -> Result<()> { self.publicroomids.insert(room_id.as_bytes(), &[]) }
+
+	fn set_not_public(&self, room_id: &RoomId) -> Result<()> { self.publicroomids.remove(room_id.as_bytes()) }
+
+	fn is_public_room(&self, room_id: &RoomId) -> Result<bool> {
+		Ok(self.publicroomids.get(room_id.as_bytes())?.is_some())
+	}
+
+	fn public_rooms<'a>(&'a self) -> Box<dyn Iterator<Item = Result<OwnedRoomId>> + 'a> {
+		Box::new(self.publicroomids.iter().map(|(bytes, _)| {
+			RoomId::parse(
+				utils::string_from_bytes(&bytes)
+					.map_err(|_| Error::bad_database("Room ID in publicroomids is invalid unicode."))?,
+			)
+			.map_err(|_| Error::bad_database("Room ID in publicroomids is invalid."))
+		}))
+	}
+}

src/service/rooms/directory/mod.rs

@@ -2,7 +2,7 @@ mod data;
 
 use std::sync::Arc;
 
-pub use data::Data;
+use data::Data;
 use ruma::{OwnedRoomId, RoomId};
 
 use crate::Result;