add constructor for typing service

src/service.rs

@@ -4,7 +4,7 @@ use std::{
 };
 
 use lru_cache::LruCache;
-use tokio::sync::{broadcast, Mutex, RwLock};
+use tokio::sync::Mutex;
 
 use crate::{observability::FilterReloadHandles, Config, Result};
 
@@ -85,11 +85,7 @@ impl Services {
                 directory: db,
                 edus: rooms::edus::Service {
                     read_receipt: db,
-                    typing: rooms::edus::typing::Service {
+                    typing: rooms::edus::typing::Service::new(),
-                        typing: RwLock::new(BTreeMap::new()),
-                        last_typing_update: RwLock::new(BTreeMap::new()),
-                        typing_update_sender: broadcast::channel(100).0,
-                    },
                 },
                 event_handler: rooms::event_handler::Service,
                 lazy_loading: rooms::lazy_loading::Service {

src/service/rooms/edus/typing.rs

@@ -11,14 +11,21 @@ use crate::{services, utils, Result};
 
 pub(crate) struct Service {
     // u64 is unix timestamp of timeout
-    pub(crate) typing:
+    typing: RwLock<BTreeMap<OwnedRoomId, BTreeMap<OwnedUserId, u64>>>,
-        RwLock<BTreeMap<OwnedRoomId, BTreeMap<OwnedUserId, u64>>>,
     // timestamp of the last change to typing users
-    pub(crate) last_typing_update: RwLock<BTreeMap<OwnedRoomId, u64>>,
+    last_typing_update: RwLock<BTreeMap<OwnedRoomId, u64>>,
-    pub(crate) typing_update_sender: broadcast::Sender<OwnedRoomId>,
+    typing_update_sender: broadcast::Sender<OwnedRoomId>,
 }
 
 impl Service {
+    pub(crate) fn new() -> Self {
+        Self {
+            typing: RwLock::new(BTreeMap::new()),
+            last_typing_update: RwLock::new(BTreeMap::new()),
+            typing_update_sender: broadcast::channel(100).0,
+        }
+    }
+
     /// Sets a user as typing until the timeout timestamp is reached or
     /// `roomtyping_remove` is called.
     #[tracing::instrument(skip(self))]