remove commented-out code

src/service/admin.rs

@@ -210,7 +210,6 @@ impl Service {
     async fn handler(&self) {
         let mut receiver = self.receiver.lock().await;
         // TODO: Use futures when we have long admin commands
-        //let mut futures = FuturesUnordered::new();
 
         let grapevine_user = UserId::parse(format!(
             "@{}:{}",

src/service/pdu.rs

@@ -327,13 +327,6 @@ impl PduEvent {
 
         pdu_json.remove("event_id");
 
-        // TODO: another option would be to convert it to a canonical string to validate size
-        // and return a Result<Raw<...>>
-        // serde_json::from_str::<Raw<_>>(
-        //     ruma::serde::to_canonical_json_string(pdu_json).expect("CanonicalJson is valid serde_json::Value"),
-        // )
-        // .expect("Raw::from_value always works")
-
         to_raw_value(&pdu_json).expect("CanonicalJson is valid serde_json::Value")
     }
 

src/service/pusher.rs

@@ -72,9 +72,6 @@ impl Service {
 
         let reqwest_request = reqwest::Request::try_from(http_request)?;
 
-        // TODO: we could keep this very short and let expo backoff do it's thing...
-        //*reqwest_request.timeout_mut() = Some(Duration::from_secs(5));
-
         let url = reqwest_request.url().clone();
         let response = services()
             .globals

src/service/rooms/spaces.rs

@@ -32,7 +32,6 @@ use tracing::{debug, error, warn};
 use crate::{services, Error, PduEvent, Result};
 
 pub(crate) enum CachedJoinRule {
-    //Simplified(SpaceRoomJoinRule),
     Full(JoinRule),
 }
 
@@ -87,9 +86,6 @@ impl Service {
             {
                 if let Some(cached) = cached {
                     let allowed = match &cached.join_rule {
-                        //CachedJoinRule::Simplified(s) => {
-                        //self.handle_simplified_join_rule(s, sender_user, &current_room)?
-                        //}
                         CachedJoinRule::Full(f) => {
                             self.handle_join_rule(f, sender_user, &current_room)?
                         }
@@ -275,19 +271,6 @@ impl Service {
                             join_rule: CachedJoinRule::Full(join_rule),
                         }),
                     );
-
-                    /* TODO:
-                    for child in response.children {
-                        roomid_spacechunk_cache.insert(
-                            current_room.clone(),
-                            CachedSpaceChunk {
-                                chunk: child.chunk,
-                                children,
-                                join_rule,
-                            },
-                        );
-                    }
-                    */
                 } else {
                     self.roomid_spacechunk_cache
                         .lock()

src/service/rooms/timeline.rs

@@ -114,29 +114,6 @@ impl Service {
         self.db.get_pdu_count(event_id)
     }
 
-    // TODO Is this the same as the function above?
-    /*
-    #[tracing::instrument(skip(self))]
-    pub(crate) fn latest_pdu_count(&self, room_id: &RoomId) -> Result<u64> {
-        let prefix = self
-            .get_shortroomid(room_id)?
-            .expect("room exists")
-            .to_be_bytes()
-            .to_vec();
-
-        let mut last_possible_key = prefix.clone();
-        last_possible_key.extend_from_slice(&u64::MAX.to_be_bytes());
-
-        self.pduid_pdu
-            .iter_from(&last_possible_key, true)
-            .take_while(move |(k, _)| k.starts_with(&prefix))
-            .next()
-            .map(|b| self.pdu_count(&b.0))
-            .transpose()
-            .map(|op| op.unwrap_or_default())
-    }
-    */
-
     /// Returns the json of a pdu.
     pub(crate) fn get_pdu_json(&self, event_id: &EventId) -> Result<Option<CanonicalJsonObject>> {
         self.db.get_pdu_json(event_id)