move userdevicesessionid_uiaarequest to service

This commit is contained in:
Charles Hall 2024-09-30 13:38:25 -07:00
parent a1fe0f3fff
commit fb534d8140
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
5 changed files with 42 additions and 70 deletions

View file

@ -1,5 +1,5 @@
use std::{
collections::{BTreeMap, HashMap, HashSet},
collections::{HashMap, HashSet},
fs,
io::Write,
mem::size_of,
@ -13,8 +13,7 @@ use ruma::{
push_rules::PushRulesEvent, GlobalAccountDataEventType, StateEventType,
},
push::Ruleset,
CanonicalJsonValue, EventId, OwnedDeviceId, OwnedEventId, OwnedRoomId,
OwnedUserId, RoomId, UserId,
EventId, OwnedEventId, OwnedRoomId, OwnedUserId, RoomId, UserId,
};
use tracing::{debug, error, info, info_span, warn, Instrument};
@ -81,9 +80,6 @@ pub(crate) struct KeyValueDatabase {
// Trees "owned" by `self::key_value::uiaa`
// User-interactive authentication
pub(super) userdevicesessionid_uiaainfo: Arc<dyn KvTree>,
pub(super) userdevicesessionid_uiaarequest: RwLock<
BTreeMap<(OwnedUserId, OwnedDeviceId, String), CanonicalJsonValue>,
>,
// Trees "owned" by `self::key_value::rooms::edus`
// ReadReceiptId = RoomId + Count + UserId
@ -376,7 +372,6 @@ impl KeyValueDatabase {
userdevicesessionid_uiaainfo: builder
.open_tree("userdevicesessionid_uiaainfo")?,
userdevicesessionid_uiaarequest: RwLock::new(BTreeMap::new()),
readreceiptid_readreceipt: builder
.open_tree("readreceiptid_readreceipt")?,
// "Private" read receipt