Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Mar 19, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f234c0
Don't add my own handle (#1254)
zeitschlag Mar 12, 2024
d761711
Remove CoreData-stuff (#1254(
zeitschlag Mar 12, 2024
d03597f
Remove MastodonMentionContainer (#1254)
zeitschlag Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MastodonSDK/Sources/MastodonCore/Extension/CoreDataStack/Status+Property.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ extension Status.Property {
deletedAt: nil,
attachments: entity.mastodonAttachments,
emojis: entity.mastodonEmojis,
mentions: entity.mastodonMentions
mentions: []
)
}
}
Expand Down
24 changes: 0 additions & 24 deletions MastodonSDK/Sources/MastodonCore/Persistence/Protocol/MastodonMentionContainer.swift
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion MastodonSDK/Sources/MastodonSDK/Entity/Mastodon+Entity+Status.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
51 changes: 24 additions & 27 deletions MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/ComposeContentViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading