Preserve content from /make_join as well as supplied content in the…

… request (#2481)
matrix-org · May 23, 2022 · 4472267 · 4472267
1 parent 8a7567c
commit 4472267
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/federationapi/internal/perform.go b/federationapi/internal/perform.go
@@ -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)
 	}