rzerres/conduit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: join rooms over federation

Browse Source
This commit is contained in:
Timo Kösters
2020-09-12 21:30:07 +02:00
parent 1e8fbd8d50
commit 12a8c9badd
17 changed files with 395 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/client_server/profile.rs
View File

@@ -33,8 +33,6 @@ pub fn set_displayname_route(
let room_id = room_id?;
db.rooms.build_and_append_pdu(
PduBuilder {
room_id: room_id.clone(),
sender: sender_id.clone(),
event_type: EventType::RoomMember,
content: serde_json::to_value(ruma::events::room::member::MemberEventContent {
displayname: body.displayname.clone(),
@@ -62,6 +60,8 @@ pub fn set_displayname_route(
state_key: Some(sender_id.to_string()),
redacts: None,
},
&sender_id,
&room_id,
&db.globals,
&db.account_data,
)?;
@@ -136,8 +136,6 @@ pub fn set_avatar_url_route(
let room_id = room_id?;
db.rooms.build_and_append_pdu(
PduBuilder {
room_id: room_id.clone(),
sender: sender_id.clone(),
event_type: EventType::RoomMember,
content: serde_json::to_value(ruma::events::room::member::MemberEventContent {
avatar_url: body.avatar_url.clone(),
@@ -165,6 +163,8 @@ pub fn set_avatar_url_route(
state_key: Some(sender_id.to_string()),
redacts: None,
},
&sender_id,
&room_id,
&db.globals,
&db.account_data,
)?;