From dfd5485a0dafc809f2b9edc0b89e9dab85474aea Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Tue, 2 Dec 2025 14:16:22 +0200
Subject: [PATCH] bridgev2/networkinterface: remove deprecated fields in
 MatrixMembershipChange

---
 bridgev2/networkinterface.go | 5 -----
 bridgev2/portal.go           | 7 ++-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/bridgev2/networkinterface.go b/bridgev2/networkinterface.go
index 193dc909..b4bf36ff 100644
--- a/bridgev2/networkinterface.go
+++ b/bridgev2/networkinterface.go
@@ -897,11 +897,6 @@ type MatrixMembershipChange struct {
 	MatrixRoomMeta[*event.MemberEventContent]
 	Target GhostOrUserLogin
 	Type   MembershipChangeType
-
-	// Deprecated: Use Target instead
-	TargetGhost *Ghost
-	// Deprecated: Use Target instead
-	TargetUserLogin *UserLogin
 }
 
 type MembershipHandlingNetworkAPI interface {
diff --git a/bridgev2/portal.go b/bridgev2/portal.go
index 84fb5333..5b4e31ef 100644
--- a/bridgev2/portal.go
+++ b/bridgev2/portal.go
@@ -1842,7 +1842,6 @@ func (portal *Portal) handleMatrixMembership(
 		return EventHandlingResultIgnored //.WithMSSError(ErrIgnoringLeaveEvent)
 	}
 	targetGhost, _ := target.(*Ghost)
-	targetUserLogin, _ := target.(*UserLogin)
 	membershipChange := &MatrixMembershipChange{
 		MatrixRoomMeta: MatrixRoomMeta[*event.MemberEventContent]{
 			MatrixEventBase: MatrixEventBase[*event.MemberEventContent]{
@@ -1856,10 +1855,8 @@ func (portal *Portal) handleMatrixMembership(
 			IsStateRequest: isStateRequest,
 			PrevContent:    prevContent,
 		},
-		Target:          target,
-		TargetGhost:     targetGhost,
-		TargetUserLogin: targetUserLogin,
-		Type:            membershipChangeType,
+		Target: target,
+		Type:   membershipChangeType,
 	}
 	_, err = api.HandleMatrixMembership(ctx, membershipChange)
 	if err != nil {