From 7fd784034dd867a97bdaddae19771918c34a58f9 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Mon, 4 May 2020 10:47:43 +0100
Subject: [PATCH] Unmarshal the content, that would help

---
 roomserver/internal/perform_join.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/roomserver/internal/perform_join.go b/roomserver/internal/perform_join.go
index ff74449c7..67f7d3942 100644
--- a/roomserver/internal/perform_join.go
+++ b/roomserver/internal/perform_join.go
@@ -2,6 +2,7 @@ package internal
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"strings"
 	"time"
@@ -146,6 +147,9 @@ func (r *RoomserverInternalAPI) performJoinRoomByID(
 			if se.Type() == gomatrixserverlib.MRoomMember {
 				if se.StateKey() != nil && *se.StateKey() == userID {
 					var content map[string]interface{}
+					if err = json.Unmarshal(se.Content(), &content); err != nil {
+						continue
+					}
 					if membership, ok := content["membership"]; ok {
 						alreadyJoined = (membership == "join")
 						break