Reformat imports and fix clippy warnings
This commit is contained in:
parent
db8a0c5d69
commit
0d69ebdc6c
7 changed files with 34 additions and 22 deletions
|
@ -15,13 +15,10 @@ use ruma::{
|
|||
},
|
||||
},
|
||||
events::{
|
||||
room::canonical_alias,
|
||||
room::guest_access,
|
||||
room::history_visibility,
|
||||
room::join_rules,
|
||||
room::member,
|
||||
room::name,
|
||||
room::{message, topic},
|
||||
room::{
|
||||
canonical_alias, guest_access, history_visibility, join_rules, member, message, name,
|
||||
topic,
|
||||
},
|
||||
EventType,
|
||||
},
|
||||
RoomAliasId, RoomId, RoomVersionId, UserId,
|
||||
|
|
|
@ -15,9 +15,7 @@ use ruma::{
|
|||
},
|
||||
federation,
|
||||
},
|
||||
directory::Filter,
|
||||
directory::RoomNetwork,
|
||||
directory::{IncomingFilter, IncomingRoomNetwork, PublicRoomsChunk},
|
||||
directory::{Filter, IncomingFilter, IncomingRoomNetwork, PublicRoomsChunk, RoomNetwork},
|
||||
events::{
|
||||
room::{avatar, canonical_alias, guest_access, history_visibility, name, topic},
|
||||
EventType,
|
||||
|
|
|
@ -17,15 +17,12 @@ use ruma::{
|
|||
},
|
||||
federation,
|
||||
},
|
||||
events::pdu::Pdu,
|
||||
events::{room::member, EventType},
|
||||
events::{pdu::Pdu, room::member, EventType},
|
||||
EventId, Raw, RoomId, RoomVersionId, ServerName, UserId,
|
||||
};
|
||||
use state_res::StateEvent;
|
||||
use std::{
|
||||
collections::BTreeMap,
|
||||
collections::HashMap,
|
||||
collections::HashSet,
|
||||
collections::{BTreeMap, HashMap, HashSet},
|
||||
convert::{TryFrom, TryInto},
|
||||
iter,
|
||||
sync::Arc,
|
||||
|
|
|
@ -9,9 +9,8 @@ use ruma::{
|
|||
},
|
||||
},
|
||||
events::{
|
||||
room::history_visibility::HistoryVisibility,
|
||||
room::history_visibility::HistoryVisibilityEventContent, AnyStateEventContent,
|
||||
EventContent, EventType,
|
||||
room::history_visibility::{HistoryVisibility, HistoryVisibilityEventContent},
|
||||
AnyStateEventContent, EventContent, EventType,
|
||||
},
|
||||
EventId, RoomId, UserId,
|
||||
};
|
||||
|
@ -103,6 +102,7 @@ pub async fn get_state_events_route(
|
|||
) -> ConduitResult<get_state_events::Response> {
|
||||
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
|
||||
|
||||
#[allow(clippy::blocks_in_if_conditions)]
|
||||
// Users not in the room should not be able to access the state unless history_visibility is
|
||||
// WorldReadable
|
||||
if !db.rooms.is_joined(sender_user, &body.room_id)?
|
||||
|
@ -148,6 +148,7 @@ pub async fn get_state_events_for_key_route(
|
|||
) -> ConduitResult<get_state_events_for_key::Response> {
|
||||
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
|
||||
|
||||
#[allow(clippy::blocks_in_if_conditions)]
|
||||
// Users not in the room should not be able to access the state unless history_visibility is
|
||||
// WorldReadable
|
||||
if !db.rooms.is_joined(sender_user, &body.room_id)?
|
||||
|
@ -198,6 +199,7 @@ pub async fn get_state_events_for_empty_key_route(
|
|||
) -> ConduitResult<get_state_events_for_empty_key::Response> {
|
||||
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
|
||||
|
||||
#[allow(clippy::blocks_in_if_conditions)]
|
||||
// Users not in the room should not be able to access the state unless history_visibility is
|
||||
// WorldReadable
|
||||
if !db.rooms.is_joined(sender_user, &body.room_id)?
|
||||
|
|
|
@ -116,6 +116,7 @@ impl Sending {
|
|||
}
|
||||
}
|
||||
Err((_server, _e)) => {
|
||||
log::error!("server: {}\nerror: {}", _server, _e)
|
||||
// TODO: exponential backoff
|
||||
}
|
||||
};
|
||||
|
@ -131,7 +132,7 @@ impl Sending {
|
|||
.expect("splitn will always return 1 or more elements"),
|
||||
)
|
||||
.map_err(|_| Error::bad_database("ServerName in servernamepduid bytes are invalid."))
|
||||
.and_then(|server_str|Box::<ServerName>::try_from(server_str)
|
||||
.and_then(|server_str| Box::<ServerName>::try_from(server_str)
|
||||
.map_err(|_| Error::bad_database("ServerName in servernamepduid is invalid.")))
|
||||
.ok()
|
||||
.and_then(|server| parts
|
||||
|
@ -162,7 +163,7 @@ impl Sending {
|
|||
});
|
||||
}
|
||||
|
||||
pub fn send_pdu(&self, server: Box<ServerName>, pdu_id: &[u8]) -> Result<()> {
|
||||
pub fn send_pdu(&self, server: &ServerName, pdu_id: &[u8]) -> Result<()> {
|
||||
let mut key = server.as_bytes().to_vec();
|
||||
key.push(0xff);
|
||||
key.extend_from_slice(pdu_id);
|
||||
|
|
|
@ -4,7 +4,10 @@ use ruma::{
|
|||
identifiers::{DeviceId, UserId},
|
||||
Outgoing,
|
||||
};
|
||||
use std::{convert::TryFrom, convert::TryInto, ops::Deref};
|
||||
use std::{
|
||||
convert::{TryFrom, TryInto},
|
||||
ops::Deref,
|
||||
};
|
||||
|
||||
#[cfg(feature = "conduit_bin")]
|
||||
use {
|
||||
|
|
16
src/utils.rs
16
src/utils.rs
|
@ -89,9 +89,23 @@ pub fn common_elements(
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
false
|
||||
})
|
||||
.all(|b| b)
|
||||
}))
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn sled_tests() {
|
||||
let db = sled::Config::new().temporary(true).open().unwrap();
|
||||
|
||||
db.insert(1_u64.to_be_bytes(), vec![10]).unwrap();
|
||||
db.insert(2_u64.to_be_bytes(), vec![20]).unwrap();
|
||||
db.insert(3_u64.to_be_bytes(), vec![30]).unwrap();
|
||||
|
||||
let mut key = 1_u64.to_be_bytes().to_vec();
|
||||
key.push(1);
|
||||
db.insert(key, vec![40]).unwrap();
|
||||
|
||||
println!("{:?}", db.iter().collect::<Result<Vec<_>, _>>().unwrap())
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue