", with: "
").replacingOccurrences(of: "
", with: "").replacingOccurrences(of: "
", with: "") + text = html.toPlainText() + } +} + diff --git a/Mastodon/Extension/String.swift b/Mastodon/Extension/String.swift new file mode 100644 index 000000000..b583d3f69 --- /dev/null +++ b/Mastodon/Extension/String.swift @@ -0,0 +1,39 @@ +// +// String.swift +// Mastodon +// +// Created by sxiaojian on 2021/1/29. +// + +import Foundation +extension String { + public func pregReplace(pattern: String, with: String, options: NSRegularExpression.Options = []) -> String { + // swiftlint:disable force_try + let regex = try! NSRegularExpression(pattern: pattern, options: options) + return regex.stringByReplacingMatches(in: self, options: [], range: NSRange(location: 0, length: nsLength), withTemplate: with) + } +} +extension String { + public var nsLength: Int { + let string_NS = self as NSString + return string_NS.length + } +} +extension String { + func toPlainText() -> String { + return self.pregReplace(pattern: "", with: "\n\n") + .pregReplace(pattern: "<.+?>", with: "") + .replacingOccurrences(of: "<", with: "<") + .replacingOccurrences(of: ">", with: ">") + .replacingOccurrences(of: "'", with: "'") + .replacingOccurrences(of: """, with: "\"") + .replacingOccurrences(of: "&", with: "&") + } +} +extension String { + func string(in nsrange: NSRange) -> String? { + guard let range = Range(nsrange, in: self) else { return nil } + return String(self[range]) + } +} diff --git a/Mastodon/Scene/HomeViewController.swift b/Mastodon/Scene/HomeViewController.swift index 6a533558d..db2340f1d 100644 --- a/Mastodon/Scene/HomeViewController.swift +++ b/Mastodon/Scene/HomeViewController.swift @@ -22,6 +22,6 @@ extension HomeViewController { title = "Home" view.backgroundColor = .systemBackground + } - } diff --git a/Mastodon/Scene/Share/View/Content/TimelinePostView.swift b/Mastodon/Scene/Share/View/Content/TimelinePostView.swift index 12ba1ccc5..44443361c 100644 --- a/Mastodon/Scene/Share/View/Content/TimelinePostView.swift +++ b/Mastodon/Scene/Share/View/Content/TimelinePostView.swift @@ -7,6 +7,7 @@ import UIKit import AVKit +import ActiveLabel final class TimelinePostView: UIView { @@ -41,6 +42,7 @@ final class TimelinePostView: UIView { let mainContainerStackView = UIStackView() + let activeTextLabel = ActiveLabel(style: .default) override init(frame: CGRect) { super.init(frame: frame) @@ -107,6 +109,15 @@ extension TimelinePostView { usernameLabel.setContentCompressionResistancePriority(.defaultHigh - 1, for: .horizontal) dateLabel.setContentHuggingPriority(.defaultLow, for: .horizontal) dateLabel.setContentCompressionResistancePriority(.required - 2, for: .horizontal) + + // main container: [text | image / video | quote | geo] + tweetContainerStackView.addArrangedSubview(mainContainerStackView) + mainContainerStackView.axis = .vertical + mainContainerStackView.spacing = 8 + activeTextLabel.translatesAutoresizingMaskIntoConstraints = false + mainContainerStackView.addArrangedSubview(activeTextLabel) + + activeTextLabel.setContentCompressionResistancePriority(.required - 2, for: .vertical) } diff --git a/Mastodon/Service/Persist/APIService+Persist+Timeline.swift b/Mastodon/Service/Persist/APIService+Persist+Timeline.swift index b43ee1010..c2d1602d5 100644 --- a/Mastodon/Service/Persist/APIService+Persist+Timeline.swift +++ b/Mastodon/Service/Persist/APIService+Persist+Timeline.swift @@ -25,7 +25,7 @@ extension APIService.Persist { return managedObjectContext.performChanges { let toots = response.value let _ = toots.map { - let userProperty = MastodonUser.Property(id: $0.account.id, domain: domain, acct: $0.account.acct, username: $0.account.username, displayName: $0.account.displayName, createdAt: $0.createdAt, networkDate: $0.createdAt) + let userProperty = MastodonUser.Property(id: $0.account.id, domain: domain, acct: $0.account.acct, username: $0.account.username, displayName: $0.account.displayName,avatar: $0.account.avatar,avatarStatic: $0.account.avatarStatic, createdAt: $0.createdAt, networkDate: $0.createdAt) let author = MastodonUser.insert(into: managedObjectContext, property: userProperty) let tootProperty = Toot.Property(id: $0.id, domain: domain, content: $0.content, createdAt: $0.createdAt, networkDate: $0.createdAt) Toot.insert(into: managedObjectContext, property: tootProperty, author: author) diff --git a/MastodonSDK/Sources/MastodonSDK/Entity/Mastodon+Entity+Account.swift b/MastodonSDK/Sources/MastodonSDK/Entity/Mastodon+Entity+Account.swift index f794dabb9..6f167730e 100644 --- a/MastodonSDK/Sources/MastodonSDK/Entity/Mastodon+Entity+Account.swift +++ b/MastodonSDK/Sources/MastodonSDK/Entity/Mastodon+Entity+Account.swift @@ -34,9 +34,9 @@ extension Mastodon.Entity { public let displayName: String public let note: String public let avatar: String - public let avatarStatic: String? + public let avatarStatic: String public let header: String - public let headerStatic: String? + public let headerStatic: String public let locked: Bool public let emojis: [Emoji]? public let discoverable: Bool? diff --git a/Podfile b/Podfile index 32659fa54..dee59e4d9 100644 --- a/Podfile +++ b/Podfile @@ -9,7 +9,7 @@ target 'Mastodon' do # misc pod 'SwiftGen', '~> 6.4.0' pod 'DateToolsSwift', '~> 5.0.0' - + pod 'ActiveLabel', git: 'https://github.com/ReticentJohn/ActiveLabel.swift.git', branch: 'master' target 'MastodonTests' do inherit! :search_paths # Pods for testing diff --git a/Podfile.lock b/Podfile.lock index da5a99e0e..94ee59e39 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,8 +1,10 @@ PODS: + - ActiveLabel (1.1.0) - DateToolsSwift (5.0.0) - SwiftGen (6.4.0) DEPENDENCIES: + - ActiveLabel (from `https://github.com/ReticentJohn/ActiveLabel.swift.git`, branch `master`) - DateToolsSwift (~> 5.0.0) - SwiftGen (~> 6.4.0) @@ -11,10 +13,21 @@ SPEC REPOS: - DateToolsSwift - SwiftGen +EXTERNAL SOURCES: + ActiveLabel: + :branch: master + :git: https://github.com/ReticentJohn/ActiveLabel.swift.git + +CHECKOUT OPTIONS: + ActiveLabel: + :commit: 01dd31cbbd1b3fec33b0c024b011e6b932794eff + :git: https://github.com/ReticentJohn/ActiveLabel.swift.git + SPEC CHECKSUMS: + ActiveLabel: 5e3f4de79a1952d4604b845a0610d4776e4b82b3 DateToolsSwift: 4207ada6ad615d8dc076323d27037c94916dbfa6 SwiftGen: 67860cc7c3cfc2ed25b9b74cfd55495fc89f9108 -PODFILE CHECKSUM: 5a58ccfd113912468e008313e1c91ed51b7cba20 +PODFILE CHECKSUM: 7fd5233d3180e2f7f67c96a28abbc20c6eddac93 COCOAPODS: 1.10.1