Tusker/Extensions/Date+TimeAgo.swift

@@ -10,11 +10,11 @@ import Foundation
 
 extension Date {
 
-    private static let unitFlags = Set<Calendar.Component>([.second, .minute, .hour, .day, .weekOfYear, .month, .year])
-    
     func timeAgo() -> (Int, Calendar.Component) {
         let calendar = NSCalendar.current
-        let components = calendar.dateComponents(Date.unitFlags, from: self, to: Date())
+        let unitFlags = Set<Calendar.Component>([.second, .minute, .hour, .day, .weekOfYear, .month, .year])
+        
+        let components = calendar.dateComponents(unitFlags, from: self, to: Date())
         
         if components.year! >= 1 {
             return (components.year!, .year)

Tusker/Screens/Utilities/Previewing.swift

@@ -133,15 +133,16 @@ extension MenuPreviewProvider {
         ]
     }
     
-    func actionsForStatus(_ status: StatusMO, sourceView: UIView?) -> [UIMenuElement] {
-        guard let mastodonController = mastodonController else { return [] }
+    func actionsForStatus(statusID: String, sourceView: UIView?) -> [UIMenuElement] {
+        guard let mastodonController = mastodonController,
+            let status = mastodonController.persistentContainer.status(for: statusID) else { return [] }
         
         guard mastodonController.loggedIn else {
             return [
                 openInSafariAction(url: status.url!),
                 createAction(identifier: "share", title: "Share...", systemImageName: "square.and.arrow.up", handler: { [weak self] (_) in
                     guard let self = self else { return }
-                    self.navigationDelegate?.showMoreOptions(forStatus: status.id, sourceView: sourceView)
+                    self.navigationDelegate?.showMoreOptions(forStatus: statusID, sourceView: sourceView)
                 })
             ]
         }
@@ -152,11 +153,11 @@ extension MenuPreviewProvider {
         var actionsSection = [
             createAction(identifier: "reply", title: "Reply", systemImageName: "arrowshape.turn.up.left", handler: { [weak self] (_) in
                 guard let self = self else { return }
-                self.navigationDelegate?.compose(inReplyToID: status.id)
+                self.navigationDelegate?.compose(inReplyToID: statusID)
             }),
             createAction(identifier: "bookmark", title: bookmarked ? "Unbookmark" : "Bookmark", systemImageName: bookmarked ? "bookmark.fill" : "bookmark", handler: { [weak self] (_) in
                 guard let self = self else { return }
-                let request = (bookmarked ? Status.unbookmark : Status.bookmark)(status.id)
+                let request = (bookmarked ? Status.unbookmark : Status.bookmark)(statusID)
                 self.mastodonController?.run(request) { (response) in
                     if case let .success(status, _) = response {
                         self.mastodonController?.persistentContainer.addOrUpdate(status: status, incrementReferenceCount: false)
@@ -165,7 +166,7 @@ extension MenuPreviewProvider {
             }),
             createAction(identifier: "mute", title: muted ? "Unmute" : "Mute", systemImageName: muted ? "speaker" : "speaker.slash", handler: { [weak self] (_) in
                 guard let self = self else { return }
-                let request = (muted ? Status.unmuteConversation : Status.muteConversation)(status.id)
+                let request = (muted ? Status.unmuteConversation : Status.muteConversation)(statusID)
                 self.mastodonController?.run(request) { (response) in
                     if case let .success(status, _) = response {
                         self.mastodonController?.persistentContainer.addOrUpdate(status: status, incrementReferenceCount: false)
@@ -178,7 +179,7 @@ extension MenuPreviewProvider {
             let pinned = status.pinned ?? false
             actionsSection.append(createAction(identifier: "", title: pinned ? "Unpin" : "Pin", systemImageName: pinned ? "pin.slash" : "pin", handler: { [weak self] (_) in
                 guard let self = self else { return }
-                let request = (pinned ? Status.unpin : Status.pin)(status.id)
+                let request = (pinned ? Status.unpin : Status.pin)(statusID)
                 self.mastodonController?.run(request, completion: { [weak self] (response) in
                     guard let self = self else { return }
                     if case let .success(status, _) = response {
@@ -192,7 +193,7 @@ extension MenuPreviewProvider {
             openInSafariAction(url: status.url!),
             createAction(identifier: "share", title: "Share...", systemImageName: "square.and.arrow.up", handler: { [weak self] (_) in
                 guard let self = self else { return }
-                self.navigationDelegate?.showMoreOptions(forStatus: status.id, sourceView: sourceView)
+                self.navigationDelegate?.showMoreOptions(forStatus: statusID, sourceView: sourceView)
             }),
         ]
         
@@ -202,7 +203,7 @@ extension MenuPreviewProvider {
                 return
             }
             // todo: this should try to find an existing session
-            UIApplication.shared.requestSceneSessionActivation(nil, userActivity: UserActivityManager.showConversationActivity(mainStatusID: status.id, accountID: id), options: nil, errorHandler: nil)
+            UIApplication.shared.requestSceneSessionActivation(nil, userActivity: UserActivityManager.showConversationActivity(mainStatusID: statusID, accountID: id), options: nil, errorHandler: nil)
         }))
         #endif
         

Tusker/Views/ContentTextView.swift

@@ -22,8 +22,6 @@ class ContentTextView: LinkTextView {
     var defaultFont: UIFont = .systemFont(ofSize: 17)
     var defaultColor: UIColor = .label
     
-    private(set) var hasEmojis = false
-    
     // The link range currently being previewed
     private var currentPreviewedLinkRange: NSRange?
     // The preview created in the previewForHighlighting method, so that we can use the same one in previewForDismissing.
@@ -51,11 +49,7 @@ class ContentTextView: LinkTextView {
     
     // MARK: - Emojis
     func setEmojis(_ emojis: [Emoji]) {
-        guard !emojis.isEmpty else {
-            hasEmojis = false
-            return
-        }
-        hasEmojis = true
+        guard !emojis.isEmpty else { return }
         
         let emojiImages = MultiThreadDictionary<String, UIImage>(name: "ContentTextView Emoji Images")
         

Tusker/Views/EmojiLabel.swift

@@ -11,8 +11,6 @@ import Pachyderm
 
 class EmojiLabel: UILabel, BaseEmojiLabel {
     
-    private(set) var hasEmojis = false
-    
     var emojiIdentifier: String?
     var emojiRequests: [ImageCache.Request] = []
     var emojiFont: UIFont { font }
@@ -24,7 +22,6 @@ class EmojiLabel: UILabel, BaseEmojiLabel {
         self.emojiIdentifier = identifier
         emojiRequests.forEach { $0.cancel() }
         emojiRequests = []
-        hasEmojis = true
         
         replaceEmojis(in: attributedText.string, emojis: emojis, identifier: identifier) { [weak self] (newAttributedText) in
             guard let self = self, self.emojiIdentifier == identifier else { return }
@@ -38,7 +35,6 @@ class EmojiLabel: UILabel, BaseEmojiLabel {
         emojiIdentifier = nil
         emojiRequests.forEach { $0.cancel() }
         emojiRequests = []
-        hasEmojis = false
     }
     
 }

Tusker/Views/Status/BaseStatusTableViewCell.swift

@@ -147,7 +147,6 @@ class BaseStatusTableViewCell: UITableViewCell {
         let account = status.account
         self.accountID = account.id
         updateUI(account: account)
-        contentTextView.setTextFrom(status: status)
         updateGrayscaleableUI(account: account, status: status)
         updateUIForPreferences(account: account, status: status)
         
@@ -213,7 +212,7 @@ class BaseStatusTableViewCell: UITableViewCell {
         
         if #available(iOS 14.0, *) {
             // keep menu in sync with changed states e.g. bookmarked, muted
-            moreButton.menu = UIMenu(title: "", image: nil, identifier: nil, options: [], children: actionsForStatus(status, sourceView: moreButton))
+            moreButton.menu = UIMenu(title: "", image: nil, identifier: nil, options: [], children: actionsForStatus(statusID: statusID, sourceView: moreButton))
         }
     }
     
@@ -231,7 +230,7 @@ class BaseStatusTableViewCell: UITableViewCell {
     
     func updateUIForPreferences(account: AccountMO, status: StatusMO) {
         avatarImageView.layer.cornerRadius = Preferences.shared.avatarStyle.cornerRadius(for: avatarImageView)
-        attachmentsView.contentHidden = Preferences.shared.blurAllMedia || status.sensitive
+        attachmentsView.contentHidden = Preferences.shared.blurAllMedia || (mastodonController.persistentContainer.status(for: statusID)?.sensitive ?? false)
         
         updateStatusIconsForPreferences(status)
         
@@ -275,9 +274,7 @@ class BaseStatusTableViewCell: UITableViewCell {
             }
         }
         
-        if contentTextView.hasEmojis {
-            contentTextView.setTextFrom(status: status)
-        }
+        contentTextView.setTextFrom(status: status)
         
         displayNameLabel.updateForAccountDisplayName(account: account)
     }

Tusker/Views/Status/TimelineStatusTableViewCell.swift

@@ -98,7 +98,6 @@ class TimelineStatusTableViewCell: BaseStatusTableViewCell {
         super.updateGrayscaleableUI(account: account, status: status)
         
         if let rebloggerID = rebloggerID,
-           reblogLabel.hasEmojis,
             let reblogger = mastodonController.persistentContainer.account(for: rebloggerID) {
             updateRebloggerLabel(reblogger: reblogger)
         }
@@ -181,13 +180,10 @@ class TimelineStatusTableViewCell: BaseStatusTableViewCell {
     }
 
     override func getStatusCellPreviewProviders(for location: CGPoint, sourceViewController: UIViewController) -> BaseStatusTableViewCell.PreviewProviders? {
-        guard let mastodonController = mastodonController,
-              let status = mastodonController.persistentContainer.status(for: statusID) else {
-            return nil
-        }
+        guard let mastodonController = mastodonController else { return nil }
         return (
             content: { ConversationTableViewController(for: self.statusID, state: self.statusState.copy(), mastodonController: mastodonController) },
-            actions: { self.actionsForStatus(status, sourceView: self) }
+            actions: { self.actionsForStatus(statusID: self.statusID, sourceView: self) }
         )
     }