backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-16 23:31:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

include ban reasons when banning a user that already had a member event

Browse source 
The case where the user never had a member event in the room is already
handled correctly.
This commit is contained in:
Olivia Lee 2025-05-04 14:15:27 -07:00 • committed by Lambda
parent c965c9747b
commit 188eac5cfd
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
book/changelog.md
View file

@ -242,6 +242,9 @@ This will be the first release of Grapevine since it was forked from Conduit
([!158](https://gitlab.computer.surgery/matrix/grapevine/-/merge_requests/158)) ([!158](https://gitlab.computer.surgery/matrix/grapevine/-/merge_requests/158))
28. Fix read receipts not being sent over federation (or only arbitrarily late) 28. Fix read receipts not being sent over federation (or only arbitrarily late)
([!162](https://gitlab.computer.surgery/matrix/grapevine/-/merge_requests/162)) ([!162](https://gitlab.computer.surgery/matrix/grapevine/-/merge_requests/162))
29. Fix bug where ban reasons would be ignored when the banned user already had
a member event in the room.
([!185](https://gitlab.computer.surgery/matrix/grapevine/-/merge_requests/185))
### Added ### Added

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

@ -288,6 +288,7 @@ pub(crate) async fn ban_user_route(
RoomMemberEventContent { RoomMemberEventContent {
membership: MembershipState::Ban, membership: MembershipState::Ban,
join_authorized_via_users_server: None, join_authorized_via_users_server: None,
reason: body.reason.clone(),
..event ..event
} }
}) })