oss/conduit
oss/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2025-09-05 18:41:00 +00:00
Code Wiki Activity

Merge branch 'GL517' into 'next'

Browse source 
Draft: fix: Fallback to user display name, if room name is not set

Closes #517

See merge request famedly/conduit!766
This commit is contained in:
Jakub Pieńkowski 2025-07-10 11:38:47 +00:00
commit 2c951d128a
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -702,7 +702,14 @@ pub(crate) async fn invite_helper(
&state_lock, &state_lock,
)?; )?;
let invite_room_state = services().rooms.state.stripped_state(&pdu.room_id)?; let mut invite_room_state = services().rooms.state.stripped_state(&pdu.room_id)?;
if let Some(sender) = services().rooms.state_accessor.room_state_get(
&pdu.room_id,
&StateEventType::RoomMember,
sender_user.as_str(),
)? {
invite_room_state.push(sender.to_stripped_state_event());
}
drop(state_lock); drop(state_lock);