Matthias/conduit
1
0
Fork 0
Code Issues 179 Pull requests 44 Projects Releases 5 Packages Wiki Activity

chore: clippy

Browse source
This commit is contained in:
Nyaaori 2022-12-16 08:37:28 +01:00
parent 5894d35eb2
commit d2cc9e105a
No known key found for this signature in database
GPG key ID: E7819C3ED4D1F82E
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/api/client_server/membership.rs
View file

@ -584,7 +584,7 @@ async fn join_room_by_id_helper(
if let Some(signed_raw) = &send_join_response.room_state.event { if let Some(signed_raw) = &send_join_response.room_state.event {
let (signed_event_id, signed_value) = let (signed_event_id, signed_value) =
match gen_event_id_canonical_json(&signed_raw, &room_version_id) { match gen_event_id_canonical_json(signed_raw, &room_version_id) {
Ok(t) => t, Ok(t) => t,
Err(_) => { Err(_) => {
// Event could not be converted to canonical json // Event could not be converted to canonical json
@ -784,7 +784,7 @@ async fn join_room_by_id_helper(
// TODO: Conduit does not implement restricted join rules yet, we always ask over // TODO: Conduit does not implement restricted join rules yet, we always ask over
// federation // federation
let join_rules_event = services().rooms.state_accessor.room_state_get( let join_rules_event = services().rooms.state_accessor.room_state_get(
&room_id, room_id,
&StateEventType::RoomJoinRules, &StateEventType::RoomJoinRules,
"", "",
)?; )?;
@ -1114,7 +1114,7 @@ pub(crate) async fn invite_helper<'a>(
create_invite::v2::Request { create_invite::v2::Request {
room_id, room_id,
event_id: &pdu.event_id, event_id: &pdu.event_id,
room_version: &room_version_id, room_version: room_version_id,
event: &PduEvent::convert_to_outgoing_federation_event(pdu_json.clone()), event: &PduEvent::convert_to_outgoing_federation_event(pdu_json.clone()),
invite_room_state: &invite_room_state, invite_room_state: &invite_room_state,
}, },