mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-06 13:43:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into neilalexander/restrictedmakesendjoin

Browse source
This commit is contained in:
Neil Alexander 2022-05-24 10:22:43 +01:00
parent 174f44f274 ead0112aa1
commit 8468d57d86
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clientapi/routing/sendevent.go
View file

@ -108,7 +108,7 @@ func SendEvent(
// via key if it is present, otherwise other servers won't be able to auth // via key if it is present, otherwise other servers won't be able to auth
// the event if the room is set to the "restricted" join rule. // the event if the room is set to the "restricted" join rule.
if eventType == gomatrixserverlib.MRoomMember { if eventType == gomatrixserverlib.MRoomMember {
delete(r, "join_authorised_by_users_server") delete(r, "join_authorised_via_users_server")
} }
evTime, err := httputil.ParseTSParam(req) evTime, err := httputil.ParseTSParam(req)