diff --git a/Cargo.lock b/Cargo.lock index c5ffd744..f1072f11 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1362,7 +1362,6 @@ dependencies = [ "libc", "libz-sys", "lz4-sys", - "pkg-config", "zstd-sys", ] diff --git a/Cargo.toml b/Cargo.toml index 4a2393b6..d9aded99 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -90,7 +90,7 @@ heed = { git = "https://github.com/timokoesters/heed.git", rev = "f6f825da7fb2c7 # Used for ruma wrapper serde_html_form = "0.2.2" -rocksdb = { git = "https://github.com/girlbossceo/rust-rocksdb", rev = "eaa2beedb1f36466a52ca01ffbf3a2118b2cb41b", default-features = false, features = ["multi-threaded-cf", "snappy", "lz4", "zstd", "io-uring"], optional = true } +rocksdb = { git = "https://github.com/girlbossceo/rust-rocksdb", rev = "eaa2beedb1f36466a52ca01ffbf3a2118b2cb41b", default-features = false, features = ["multi-threaded-cf", "snappy", "lz4", "zstd"], optional = true } thread_local = "1.1.7" # used for TURN server authentication diff --git a/src/service/pdu.rs b/src/service/pdu.rs index 4a170bc2..34c0320d 100644 --- a/src/service/pdu.rs +++ b/src/service/pdu.rs @@ -383,6 +383,7 @@ impl PartialEq for PduEvent { self.event_id == other.event_id } } +#[allow(clippy::non_canonical_partial_ord_impl)] impl PartialOrd for PduEvent { fn partial_cmp(&self, other: &Self) -> Option { self.event_id.partial_cmp(&other.event_id) diff --git a/src/service/rooms/event_handler/mod.rs b/src/service/rooms/event_handler/mod.rs index 4be7bf5a..a26735f4 100644 --- a/src/service/rooms/event_handler/mod.rs +++ b/src/service/rooms/event_handler/mod.rs @@ -85,6 +85,7 @@ impl Service { } if services().rooms.metadata.is_disabled(room_id)? { + info!("Federaton of room {room_id} is currently disabled on this server. Request by origin {origin} and event ID {event_id}"); return Err(Error::BadRequest( ErrorKind::Forbidden, "Federation of this room is currently disabled on this server.", @@ -157,6 +158,7 @@ impl Service { for prev_id in sorted_prev_events { // Check for disabled again because it might have changed if services().rooms.metadata.is_disabled(room_id)? { + info!("Federaton of room {room_id} is currently disabled on this server. Request by origin {origin} and event ID {event_id}"); return Err(Error::BadRequest( ErrorKind::Forbidden, "Federation of this room is currently disabled on this server.",