zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 19 Releases Wiki Activity

Merge branch 'fix/extra-space' into release/0.6.1

This commit is contained in:
CMK 2021-06-15 18:57:28 +08:00
parent e70c1a6586 bb49104240
commit 43b67a4cc3
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Mastodon/Scene/Compose/ComposeViewModel.swift
View File

@ -92,7 +92,8 @@ final class ComposeViewModel {
self.activeAuthentication = CurrentValueSubject(context.authenticationService.activeMastodonAuthentication.value) self.activeAuthentication = CurrentValueSubject(context.authenticationService.activeMastodonAuthentication.value)
self.activeAuthenticationBox = CurrentValueSubject(context.authenticationService.activeMastodonAuthenticationBox.value) self.activeAuthenticationBox = CurrentValueSubject(context.authenticationService.activeMastodonAuthenticationBox.value)
// end init // end init
if case let .reply(repliedToStatusObjectID) = composeKind { switch composeKind {
case .reply(let repliedToStatusObjectID):
context.managedObjectContext.performAndWait { context.managedObjectContext.performAndWait {
guard let status = context.managedObjectContext.object(with: repliedToStatusObjectID) as? Status else { return } guard let status = context.managedObjectContext.object(with: repliedToStatusObjectID) as? Status else { return }
let composeAuthor: MastodonUser? = { let composeAuthor: MastodonUser? = {
@ -124,14 +125,13 @@ final class ComposeViewModel {
self.preInsertedContent = preInsertedContent self.preInsertedContent = preInsertedContent
self.composeStatusAttribute.composeContent.value = preInsertedContent self.composeStatusAttribute.composeContent.value = preInsertedContent
} }
case .hashtag(let hashtag):
} else if case let .hashtag(text) = composeKind { let initialComposeContent = "#" + hashtag
let initialComposeContent = "#" + text
UITextChecker.learnWord(initialComposeContent) UITextChecker.learnWord(initialComposeContent)
let preInsertedContent = initialComposeContent + " " let preInsertedContent = initialComposeContent + " "
self.preInsertedContent = preInsertedContent self.preInsertedContent = preInsertedContent
self.composeStatusAttribute.composeContent.value = preInsertedContent self.composeStatusAttribute.composeContent.value = preInsertedContent
} else if case let .mention(mastodonUserObjectID) = composeKind { case .mention(let mastodonUserObjectID):
context.managedObjectContext.performAndWait { context.managedObjectContext.performAndWait {
let mastodonUser = context.managedObjectContext.object(with: mastodonUserObjectID) as! MastodonUser let mastodonUser = context.managedObjectContext.object(with: mastodonUserObjectID) as! MastodonUser
let initialComposeContent = "@" + mastodonUser.acct let initialComposeContent = "@" + mastodonUser.acct
@ -140,7 +140,7 @@ final class ComposeViewModel {
self.preInsertedContent = preInsertedContent self.preInsertedContent = preInsertedContent
self.composeStatusAttribute.composeContent.value = preInsertedContent self.composeStatusAttribute.composeContent.value = preInsertedContent
} }
} else { case .post:
self.preInsertedContent = nil self.preInsertedContent = nil
} }
@ -263,7 +263,7 @@ final class ComposeViewModel {
} }
// if preInsertedContent plus a space is equal to the content, simply dismiss the modal // if preInsertedContent plus a space is equal to the content, simply dismiss the modal
if let preInsertedContent = self?.preInsertedContent { if let preInsertedContent = self?.preInsertedContent {
return content == (preInsertedContent + " ") return content == preInsertedContent
} }
return false return false
} }
@ -374,11 +374,6 @@ final class ComposeViewModel {
self.isPollToolbarButtonEnabled.value = !shouldPollDisable self.isPollToolbarButtonEnabled.value = !shouldPollDisable
}) })
.store(in: &disposeBag) .store(in: &disposeBag)
if let preInsertedContent = preInsertedContent {
// add a space after the injected text
composeStatusAttribute.composeContent.send(preInsertedContent + " ")
}
} }
deinit { deinit {