Don't add my own handle to a reply (#1254) (#1256)

* Don't add my own handle (#1254) * Remove CoreData-stuff (#1254( * Remove MastodonMentionContainer (#1254) This is a left over from the status-refactoring. The Core Data-persistence-stuff for Status needed that, but as we don't use that any more say byebye
mastodon · Mar 19, 2024 · 13cc2bd · 13cc2bd
1 parent 484d72f
commit 13cc2bd
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 53 deletions.
diff --git a/MastodonSDK/Sources/MastodonCore/Extension/CoreDataStack/Status+Property.swift b/MastodonSDK/Sources/MastodonCore/Extension/CoreDataStack/Status+Property.swift
@@ -35,7 +35,7 @@ extension Status.Property {
             deletedAt: nil,
             attachments: entity.mastodonAttachments,
             emojis: entity.mastodonEmojis,
-            mentions: entity.mastodonMentions
+            mentions: []
         )
     }
 }

diff --git a/MastodonSDK/Sources/MastodonCore/Persistence/Protocol/MastodonMentionContainer.swift b/MastodonSDK/Sources/MastodonCore/Persistence/Protocol/MastodonMentionContainer.swift
diff --git a/MastodonSDK/Sources/MastodonSDK/Entity/Mastodon+Entity+Status.swift b/MastodonSDK/Sources/MastodonSDK/Entity/Mastodon+Entity+Status.swift
@@ -36,7 +36,7 @@ extension Mastodon.Entity {
         public let application: Application?
 
         // Rendering
-        public let mentions: [Mention]?
+        public let mentions: [Mention]
         public let tags: [Tag]
         public let emojis: [Emoji]
 

diff --git a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/ComposeContentViewModel.swift b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/ComposeContentViewModel.swift
@@ -193,34 +193,31 @@ public final class ComposeContentViewModel: NSObject, ObservableObject {
         let initialContentWithSpace = initialContent.isEmpty ? "" : initialContent + " "
         switch destination {
         case .reply(let record):
-            context.managedObjectContext.performAndWait {
-                let status = record.entity
-                let author = authContext.mastodonAuthenticationBox.authentication.account()
-
-                var mentionAccts: [String] = []
-                if author?.id != status.account.id {
-                    mentionAccts.append("@" + status.account.acct)
-                }
-                let mentions = status.mentions ?? []
-                    .filter { author?.id != $0.id }
-                for mention in mentions {
-                    let acct = "@" + mention.acct
-                    guard !mentionAccts.contains(acct) else { continue }
-                    mentionAccts.append(acct)
-                }
-                for acct in mentionAccts {
-                    UITextChecker.learnWord(acct)
-                }
-                if let spoilerText = status.spoilerText, !spoilerText.isEmpty {
-                    self.isContentWarningActive = true
-                    self.contentWarning = spoilerText
-                }
-
-                let initialComposeContent = mentionAccts.joined(separator: " ")
-                let preInsertedContent = initialComposeContent.isEmpty ? "" : initialComposeContent + " "
-                self.initialContent = preInsertedContent + initialContentWithSpace
-                self.content = preInsertedContent + initialContentWithSpace
+            let status = record.entity
+            let author = authContext.mastodonAuthenticationBox.authentication.account()
+
+            var mentionAccts: [String] = []
+            if author?.id != status.account.id {
+                mentionAccts.append("@" + status.account.acct)
+            }
+            let mentions = status.mentions.filter { author?.id != $0.id }
+            for mention in mentions {
+                let acct = "@" + mention.acct
+                guard !mentionAccts.contains(acct) else { continue }
+                mentionAccts.append(acct)
+            }
+            for acct in mentionAccts {
+                UITextChecker.learnWord(acct)
             }
+            if let spoilerText = status.spoilerText, !spoilerText.isEmpty {
+                self.isContentWarningActive = true
+                self.contentWarning = spoilerText
+            }
+
+            let initialComposeContent = mentionAccts.joined(separator: " ")
+            let preInsertedContent = initialComposeContent.isEmpty ? "" : initialComposeContent + " "
+            self.initialContent = preInsertedContent + initialContentWithSpace
+            self.content = preInsertedContent + initialContentWithSpace
         case .topLevel:
             self.initialContent = initialContentWithSpace
             self.content = initialContentWithSpace