From 0915aba44c424686dcd59992b030b1e5578384fd Mon Sep 17 00:00:00 2001 From: Charles Hall Date: Wed, 15 May 2024 15:07:26 -0700 Subject: [PATCH] remove commented-out code --- src/api/client_server/session.rs | 1 - src/database.rs | 22 ---------------------- src/database/abstraction/sqlite.rs | 4 ---- src/database/key_value.rs | 2 -- src/main.rs | 1 - src/service/admin.rs | 1 - src/service/pdu.rs | 7 ------- src/service/pusher.rs | 3 --- src/service/rooms/spaces.rs | 17 ----------------- src/service/rooms/timeline.rs | 23 ----------------------- 10 files changed, 81 deletions(-) diff --git a/src/api/client_server/session.rs b/src/api/client_server/session.rs index 7a58a992..4f2e2839 100644 --- a/src/api/client_server/session.rs +++ b/src/api/client_server/session.rs @@ -20,7 +20,6 @@ use tracing::{info, warn}; #[derive(Debug, Deserialize)] struct Claims { sub: String, - //exp: usize, } /// # `GET /_matrix/client/r0/login` diff --git a/src/database.rs b/src/database.rs index 5b14ebe6..94de39c9 100644 --- a/src/database.rs +++ b/src/database.rs @@ -605,28 +605,6 @@ impl KeyValueDatabase { states_parents, )?; - /* - let mut tmp = services().rooms.load_shortstatehash_info(¤t_sstatehash)?; - let state = tmp.pop().unwrap(); - println!( - "{}\t{}{:?}: {:?} + {:?} - {:?}", - current_room, - " ".repeat(tmp.len()), - utils::u64_from_bytes(¤t_sstatehash).unwrap(), - tmp.last().map(|b| utils::u64_from_bytes(&b.0).unwrap()), - state - .2 - .iter() - .map(|b| utils::u64_from_bytes(&b[size_of::()..]).unwrap()) - .collect::>(), - state - .3 - .iter() - .map(|b| utils::u64_from_bytes(&b[size_of::()..]).unwrap()) - .collect::>() - ); - */ - Ok::<_, Error>(()) }; diff --git a/src/database/abstraction/sqlite.rs b/src/database/abstraction/sqlite.rs index 495f6193..7609698a 100644 --- a/src/database/abstraction/sqlite.rs +++ b/src/database/abstraction/sqlite.rs @@ -195,8 +195,6 @@ impl SqliteTable { let statement_ref = AliasableBox(statement); - //let name = self.name.clone(); - let iterator = Box::new( statement .query_map([], |row| Ok((row.get_unwrap(0), row.get_unwrap(1)))) @@ -279,8 +277,6 @@ impl KvTree for SqliteTable { let guard = self.engine.read_lock_iterator(); let from = from.to_vec(); // TODO change interface? - //let name = self.name.clone(); - if backwards { let statement = Box::leak(Box::new( guard diff --git a/src/database/key_value.rs b/src/database/key_value.rs index c4496af8..098f3391 100644 --- a/src/database/key_value.rs +++ b/src/database/key_value.rs @@ -1,10 +1,8 @@ mod account_data; -//mod admin; mod appservice; mod globals; mod key_backups; mod media; -//mod pdu; mod pusher; mod rooms; mod sending; diff --git a/src/main.rs b/src/main.rs index d445d207..bd266bb4 100644 --- a/src/main.rs +++ b/src/main.rs @@ -426,7 +426,6 @@ fn routes(config: &Config) -> Router { .ruma_route(client_server::get_key_changes_route) .ruma_route(client_server::get_pushers_route) .ruma_route(client_server::set_pushers_route) - // .ruma_route(client_server::third_party_route) .ruma_route(client_server::upgrade_room_route) .ruma_route(client_server::get_threads_route) .ruma_route(client_server::get_relating_events_with_rel_type_and_event_type_route) diff --git a/src/service/admin.rs b/src/service/admin.rs index bdfc6a9c..55a456af 100644 --- a/src/service/admin.rs +++ b/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!( "@{}:{}", diff --git a/src/service/pdu.rs b/src/service/pdu.rs index 6e1a6ae3..1de3d852 100644 --- a/src/service/pdu.rs +++ b/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> - // serde_json::from_str::>( - // 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") } diff --git a/src/service/pusher.rs b/src/service/pusher.rs index 2e54f867..6e0fc755 100644 --- a/src/service/pusher.rs +++ b/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 diff --git a/src/service/rooms/spaces.rs b/src/service/rooms/spaces.rs index bd1f5702..c478b2f2 100644 --- a/src/service/rooms/spaces.rs +++ b/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, ¤t_room)? - //} CachedJoinRule::Full(f) => { self.handle_join_rule(f, sender_user, ¤t_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() diff --git a/src/service/rooms/timeline.rs b/src/service/rooms/timeline.rs index 42b8d113..eb7db36f 100644 --- a/src/service/rooms/timeline.rs +++ b/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 { - 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> { self.db.get_pdu_json(event_id)