From 5de499a3b5dd083d07b03d1f6697d1127a8ba35d Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Sat, 6 Jan 2024 11:11:39 +0200
Subject: [PATCH] Reuse existing getEvent function

---
 portal.go | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/portal.go b/portal.go
index c9b4871..f32ba28 100644
--- a/portal.go
+++ b/portal.go
@@ -1114,7 +1114,7 @@ func (portal *Portal) getEvent(mxid id.EventID) (*event.Event, error) {
 	if evt.Type == event.EventEncrypted {
 		decryptedEvt, err := portal.bridge.Crypto.Decrypt(evt)
 		if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("failed to decrypt event: %w", err)
 		} else {
 			evt = decryptedEvt
 		}
@@ -1410,19 +1410,9 @@ func cutBody(body string) string {
 }
 
 func (portal *Portal) convertReplyMessageToEmbed(eventID id.EventID, url string) (*discordgo.MessageEmbed, error) {
-	evt, err := portal.MainIntent().GetEvent(portal.MXID, eventID)
+	evt, err := portal.getEvent(eventID)
 	if err != nil {
-		return nil, fmt.Errorf("failed to fetch event: %w", err)
-	}
-	if evt.Type == event.EventEncrypted {
-		evt, err = portal.bridge.Crypto.Decrypt(evt)
-		if err != nil {
-			return nil, fmt.Errorf("failed to decrypt event: %w", err)
-		}
-	}
-	err = evt.Content.ParseRaw(evt.Type)
-	if err != nil {
-		return nil, fmt.Errorf("failed to parse event content: %w", err)
+		return nil, fmt.Errorf("failed to get reply target event: %w", err)
 	}
 	content, ok := evt.Content.Parsed.(*event.MessageEventContent)
 	if !ok {