git-mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2025-09-11 15:23:02 +02:00
Code Issues Projects Releases Packages Wiki Activity

refactor dyn KvTree out of services

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-06-28 22:51:39 +00:00
commit cb48e25783
69 changed files with 594 additions and 647 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/service/rooms/directory/data.rs
View file

@ -1,18 +1,17 @@
use std::sync::Arc;
use database::KvTree;
use conduit::{utils, Error, Result};
use database::{Database, Map};
use ruma::{OwnedRoomId, RoomId};
use crate::{utils, Error, KeyValueDatabase, Result};
pub(super) struct Data {
publicroomids: Arc<dyn KvTree>,
publicroomids: Arc<Map>,
}
impl Data {
pub(super) fn new(db: &Arc<KeyValueDatabase>) -> Self {
pub(super) fn new(db: &Arc<Database>) -> Self {
Self {
publicroomids: db.publicroomids.clone(),
publicroomids: db["publicroomids"].clone(),
}
}

7
src/service/rooms/directory/mod.rs
View file

@ -1,11 +1,10 @@
use conduit::Server;
use database::KeyValueDatabase;
mod data;
use std::sync::Arc;
use conduit::Server;
use data::Data;
use database::Database;
use ruma::{OwnedRoomId, RoomId};
use crate::Result;
@ -15,7 +14,7 @@ pub struct Service {
}
impl Service {
pub fn build(_server: &Arc<Server>, db: &Arc<KeyValueDatabase>) -> Result<Self> {
pub fn build(_server: &Arc<Server>, db: &Arc<Database>) -> Result<Self> {
Ok(Self {
db: Data::new(db),
})