From 4fc69443600c63a191e5d51f6caa7ca3ada9d46d Mon Sep 17 00:00:00 2001 From: Thomas Ricouard Date: Sun, 15 Jan 2023 15:02:32 +0100 Subject: [PATCH] Fix editing status dropping mentions / account name --- .../Sources/Status/Editor/StatusEditorViewModel.swift | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Packages/Status/Sources/Status/Editor/StatusEditorViewModel.swift b/Packages/Status/Sources/Status/Editor/StatusEditorViewModel.swift index b019af31..661ec473 100644 --- a/Packages/Status/Sources/Status/Editor/StatusEditorViewModel.swift +++ b/Packages/Status/Sources/Status/Editor/StatusEditorViewModel.swift @@ -158,7 +158,11 @@ public class StatusEditorViewModel: ObservableObject { self.visibility = visibility selectedRange = .init(location: statusText.string.utf16.count, length: 0) case let .edit(status): - statusText = .init(status.content.asMarkdown.asSafeAttributedString) + var rawText = NSAttributedString(status.content.asMarkdown.asSafeAttributedString).string + for mention in status.mentions { + rawText = rawText.replacingOccurrences(of: "@\(mention.username)", with: "@\(mention.acct)") + } + statusText = .init(string: rawText) selectedRange = .init(location: statusText.string.utf16.count, length: 0) spoilerOn = !status.spoilerText.isEmpty spoilerText = status.spoilerText