From 34cbfc2601128facc947c20d33bdfe0495c7615b Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Tue, 25 Jun 2024 16:05:59 +0300
Subject: [PATCH] event: fix content of `io.element.functional_members`

---
 bridgev2/portal.go | 2 +-
 event/state.go     | 2 +-
 hicli/sync.go      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bridgev2/portal.go b/bridgev2/portal.go
index 0d8d779e..e0243453 100644
--- a/bridgev2/portal.go
+++ b/bridgev2/portal.go
@@ -1711,7 +1711,7 @@ func (portal *Portal) CreateMatrixRoom(ctx context.Context, source *UserLogin, i
 		StateKey: &emptyString,
 		Type:     event.StateElementFunctionalMembers,
 		Content: event.Content{Parsed: &event.ElementFunctionalMembersContent{
-			FunctionalMembers: append(extraFunctionalMembers, portal.Bridge.Bot.GetMXID()),
+			ServiceMembers: append(extraFunctionalMembers, portal.Bridge.Bot.GetMXID()),
 		}},
 	}, &event.Event{
 		StateKey: &bridgeInfoStateKey,
diff --git a/event/state.go b/event/state.go
index 809951cf..20a383d5 100644
--- a/event/state.go
+++ b/event/state.go
@@ -195,5 +195,5 @@ type InsertionMarkerContent struct {
 }
 
 type ElementFunctionalMembersContent struct {
-	FunctionalMembers []id.UserID `json:"functional_members"`
+	ServiceMembers []id.UserID `json:"service_members"`
 }
diff --git a/hicli/sync.go b/hicli/sync.go
index 24f0cfed..c3f30a72 100644
--- a/hicli/sync.go
+++ b/hicli/sync.go
@@ -435,7 +435,7 @@ func (h *HiClient) calculateRoomParticipantName(ctx context.Context, roomID id.R
 		_ = mautrixEvt.Content.ParseRaw(mautrixEvt.Type)
 		content, ok := mautrixEvt.Content.Parsed.(*event.ElementFunctionalMembersContent)
 		if ok {
-			functionalMembers = content.FunctionalMembers
+			functionalMembers = content.ServiceMembers
 		}
 	}
 	var members, leftMembers []string