From eed0e5bcf3496fb540ed6a631e07b03a3f28f642 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Wed, 29 Apr 2020 14:57:33 +0100
Subject: [PATCH] Make sure membership content shows join

---
 federationsender/query/perform.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/federationsender/query/perform.go b/federationsender/query/perform.go
index deb15068f..d39fef5ed 100644
--- a/federationsender/query/perform.go
+++ b/federationsender/query/perform.go
@@ -44,6 +44,10 @@ func (r *FederationSenderInternalAPI) PerformJoin(
 	respMakeJoin.JoinEvent.StateKey = &request.UserID
 	respMakeJoin.JoinEvent.RoomID = request.RoomID
 	respMakeJoin.JoinEvent.Redacts = ""
+	if request.Content == nil {
+		request.Content = map[string]interface{}{}
+	}
+	request.Content["membership"] = "join"
 	if err = respMakeJoin.JoinEvent.SetContent(request.Content); err != nil {
 		return fmt.Errorf("respMakeJoin.JoinEvent.SetContent: %w", err)
 	}