From eab6118f12b6d2aefe173352616007b3f6d014d2 Mon Sep 17 00:00:00 2001
From: Igor Sirotin <sirotin@status.im>
Date: Wed, 8 Nov 2023 17:28:55 +0000
Subject: [PATCH] fix: edit message even if converting link previews to proto

---
 protocol/messenger.go          |  3 ++-
 protocol/messenger_messages.go | 13 +++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/protocol/messenger.go b/protocol/messenger.go
index ef1e3ce1e..5017e0546 100644
--- a/protocol/messenger.go
+++ b/protocol/messenger.go
@@ -2309,9 +2309,10 @@ func (m *Messenger) sendChatMessage(ctx context.Context, message *common.Message
 		}
 	}
 
-	unfurledLinks, err := message.ConvertLinkPreviewsToProto()
 	// We consider link previews non-critical data, so we do not want to block
 	// messages from being sent.
+
+	unfurledLinks, err := message.ConvertLinkPreviewsToProto()
 	if err != nil {
 		m.logger.Error("failed to convert link previews", zap.Error(err))
 	} else {
diff --git a/protocol/messenger_messages.go b/protocol/messenger_messages.go
index f0907435d..adb987334 100644
--- a/protocol/messenger_messages.go
+++ b/protocol/messenger_messages.go
@@ -69,17 +69,22 @@ func (m *Messenger) EditMessage(ctx context.Context, request *requests.EditMessa
 		editMessage.MessageId = message.ID
 		editMessage.Clock = clock
 
+		// We consider link previews non-critical data, so we do not want to block
+		// messages from being sent.
+
 		unfurledLinks, err := message.ConvertLinkPreviewsToProto()
 		if err != nil {
-			return nil, err
+			m.logger.Error("failed to convert link previews", zap.Error(err))
+		} else {
+			editMessage.UnfurledLinks = unfurledLinks
 		}
-		editMessage.UnfurledLinks = unfurledLinks
 
 		unfurledStatusLinks, err := message.ConvertStatusLinkPreviewsToProto()
 		if err != nil {
-			return nil, err
+			m.logger.Error("failed to convert status link previews", zap.Error(err))
+		} else {
+			editMessage.UnfurledStatusLinks = unfurledStatusLinks
 		}
-		editMessage.UnfurledStatusLinks = unfurledStatusLinks
 
 		err = m.applyEditMessage(editMessage.EditMessage, message)
 		if err != nil {