From a2121347e8fee254bd34c019e560fe376d713d6a Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Thu, 2 Feb 2023 22:23:51 +0200
Subject: [PATCH] Don't set extra data in edit fallbacks

---
 go.mod    | 2 +-
 go.sum    | 4 ++--
 portal.go | 7 ++-----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/go.mod b/go.mod
index 4f0c339..54b09dd 100644
--- a/go.mod
+++ b/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/stretchr/testify v1.8.1
 	github.com/yuin/goldmark v1.5.3
 	maunium.net/go/maulogger/v2 v2.3.2
-	maunium.net/go/mautrix v0.13.1-0.20230131110946-41fd713d1765
+	maunium.net/go/mautrix v0.13.1-0.20230202202225-0cf9a4064667
 )
 
 require (
diff --git a/go.sum b/go.sum
index 1d2a875..1d754db 100644
--- a/go.sum
+++ b/go.sum
@@ -77,5 +77,5 @@ maunium.net/go/mauflag v1.0.0 h1:YiaRc0tEI3toYtJMRIfjP+jklH45uDHtT80nUamyD4M=
 maunium.net/go/mauflag v1.0.0/go.mod h1:nLivPOpTpHnpzEh8jEdSL9UqO9+/KBJFmNRlwKfkPeA=
 maunium.net/go/maulogger/v2 v2.3.2 h1:1XmIYmMd3PoQfp9J+PaHhpt80zpfmMqaShzUTC7FwY0=
 maunium.net/go/maulogger/v2 v2.3.2/go.mod h1:TYWy7wKwz/tIXTpsx8G3mZseIRiC5DoMxSZazOHy68A=
-maunium.net/go/mautrix v0.13.1-0.20230131110946-41fd713d1765 h1:A9OYPQ5okmWrU4zMnU21UxZtXATuBLEgQ9FGZrFhNS0=
-maunium.net/go/mautrix v0.13.1-0.20230131110946-41fd713d1765/go.mod h1:gYMQPsZ9lQpyKlVp+DGwOuc9LIcE/c8GZW2CvKHISgM=
+maunium.net/go/mautrix v0.13.1-0.20230202202225-0cf9a4064667 h1:aI5VtfD9C+5GAMBbaQ3Nyt0wLnoVgUQfgzVC8rjKf7E=
+maunium.net/go/mautrix v0.13.1-0.20230202202225-0cf9a4064667/go.mod h1:gYMQPsZ9lQpyKlVp+DGwOuc9LIcE/c8GZW2CvKHISgM=
diff --git a/portal.go b/portal.go
index c41d945..1821856 100644
--- a/portal.go
+++ b/portal.go
@@ -1243,12 +1243,9 @@ func (portal *Portal) handleDiscordMessageUpdate(user *User, msg *discordgo.Mess
 		return
 	}
 	converted.Content.SetEdit(existing[0].MXID)
-	extraContentCopy := map[string]any{}
-	for key, value := range converted.Extra {
-		extraContentCopy[key] = value
+	converted.Extra = map[string]any{
+		"m.new_content": converted.Extra,
 	}
-	extraContentCopy["m.new_content"] = converted.Extra
-	converted.Extra = extraContentCopy
 
 	var editTS int64
 	if msg.EditedTimestamp != nil {