mirror of
https://github.com/1f349/dendrite.git
synced 2024-11-09 22:42:58 +00:00
Preserve content from /make_join
as well as supplied content in the request (#2481)
This commit is contained in:
parent
8a7567c652
commit
4472267901
@ -166,7 +166,8 @@ func (r *FederationInternalAPI) performJoinUsingServer(
|
||||
if content == nil {
|
||||
content = map[string]interface{}{}
|
||||
}
|
||||
content["membership"] = "join"
|
||||
_ = json.Unmarshal(respMakeJoin.JoinEvent.Content, &content)
|
||||
content["membership"] = gomatrixserverlib.Join
|
||||
if err = respMakeJoin.JoinEvent.SetContent(content); err != nil {
|
||||
return fmt.Errorf("respMakeJoin.JoinEvent.SetContent: %w", err)
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user