zelo72/mastodon-ios
2
2
Fork 1
mirror of https://github.com/mastodon/mastodon-ios synced 2025-04-11 22:58:02 +02:00
Code Issues 20 Releases Wiki Activity

Fix link char count (IOS-285)

Browse Source
This commit is contained in:
Marcus Kida 2024-07-31 11:29:47 +02:00
parent 42b47af8de
commit d84ca7bc75
No known key found for this signature in database
GPG Key ID: 19FF64E08013CA40
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
MastodonSDK/Sources/MastodonCore/MastodonAuthentication.swift
View File

@ -5,6 +5,8 @@ import CoreDataStack
import MastodonSDK
public struct MastodonAuthentication: Codable, Hashable, UserIdentifier {
public static let fallbackCharactersReservedPerURL = 23
public enum InstanceConfiguration: Codable, Hashable {
case v1(Mastodon.Entity.Instance)
case v2(Mastodon.Entity.V2.Instance, TranslationLanguages)
@ -38,6 +40,15 @@ public struct MastodonAuthentication: Codable, Hashable, UserIdentifier {
}
return version?.majorServerVersion(greaterThanOrEquals: 4) ?? false // following Tags is support beginning with Mastodon v4.0.0
}
public var charactersReservedPerURL: Int {
switch self {
case let .v1(instance):
return instance.configuration?.statuses?.charactersReservedPerURL ?? fallbackCharactersReservedPerURL
case let .v2(instance, _):
return instance.configuration?.statuses?.charactersReservedPerURL ?? fallbackCharactersReservedPerURL
}
}
}
public typealias ID = UUID

19
MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/ComposeContentViewModel.swift
View File

@ -324,7 +324,24 @@ extension ComposeContentViewModel {
// bind text
$content
.map { $0.count }
.map { [weak self] input in
guard let self, let detector = try? NSDataDetector(types: NSTextCheckingResult.CheckingType.link.rawValue) else {
return input.count
}
let matches = detector.matches(in: input, options: [], range: NSRange(location: 0, length: input.count))
let lengthWithoutLinks = input.count - matches.map({ match in
guard let range = Range(match.range, in: input) else {
return 0
}
let url = input[range]
return url.count
}).reduce(0, +)
let charactersReservedPerURL = authContext.mastodonAuthenticationBox
.authentication
.instanceConfiguration?
.charactersReservedPerURL ?? MastodonAuthentication.fallbackCharactersReservedPerURL
return lengthWithoutLinks + (matches.count * charactersReservedPerURL)
}
.assign(to: &$contentWeightedLength)
Publishers.CombineLatest(