Fix attachments container more view not beign removed on cell reuse

Closes #92

Pachyderm/Model/Card.swift

@@ -22,6 +22,23 @@ public class Card: Decodable {
     public let width: Int?
     public let height: Int?
     
+    public required init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        
+        self.url = try container.decode(URL.self, forKey: .url)
+        self.title = try container.decode(String.self, forKey: .title)
+        self.description = try container.decode(String.self, forKey: .description)
+        self.kind = try container.decode(Kind.self, forKey: .kind)
+        self.image = try? container.decode(URL.self, forKey: .image)
+        self.authorName = try? container.decode(String.self, forKey: .authorName)
+        self.authorURL = try? container.decode(URL.self, forKey: .authorURL)
+        self.providerName = try? container.decode(String.self, forKey: .providerName)
+        self.providerURL = try? container.decode(URL.self, forKey: .providerURL)
+        self.html = try? container.decode(String.self, forKey: .html)
+        self.width = try? container.decode(Int.self, forKey: .width)
+        self.height = try? container.decode(Int.self, forKey: .height)
+    }
+    
     private enum CodingKeys: String, CodingKey {
         case url
         case title

Pachyderm/Model/Status.swift

@@ -36,6 +36,7 @@ public class Status: Decodable {
     public let language: String?
     public let pinned: Bool?
     public let bookmarked: Bool?
+    public let card: Card?
     
     public static func getContext(_ status: Status) -> Request<ConversationContext> {
         return Request<ConversationContext>(method: .get, path: "/api/v1/statuses/\(status.id)/context")
@@ -128,6 +129,7 @@ public class Status: Decodable {
         case language
         case pinned
         case bookmarked
+        case card
     }
 }
 

Tusker/Screens/Compose/ComposeViewController.swift

@@ -217,15 +217,7 @@ class ComposeViewController: UIViewController {
         NotificationCenter.default.removeObserver(self, name: UIResponder.keyboardWillHideNotification, object: nil)
         NotificationCenter.default.removeObserver(self, name: UIResponder.keyboardWillChangeFrameNotification, object: nil)
     }
-    
-    override func viewDidLayoutSubviews() {
-        super.viewDidLayoutSubviews()
-        
-//        if inReplyToID != nil {
-//            scrollView.contentOffset = CGPoint(x: 0, y: stackView.arrangedSubviews.first!.frame.height)
-//        }
-    }
-    
+
     override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
         super.traitCollectionDidChange(previousTraitCollection)
         

Tusker/Screens/Compose/Drafts/DraftsTableViewController.swift

@@ -102,6 +102,7 @@ class DraftsTableViewController: UITableViewController {
     override func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCell.EditingStyle, forRowAt indexPath: IndexPath) {
         guard editingStyle == .delete else { return }
         DraftsManager.shared.remove(draft(for: indexPath))
+        drafts.remove(at: indexPath.row)
         tableView.deleteRows(at: [indexPath], with: .automatic)
     }
     

Tusker/Screens/Notifications/NotificationsTableViewController.swift

@@ -51,7 +51,7 @@ class NotificationsTableViewController: EnhancedTableViewController {
         tableView.register(UINib(nibName: "ActionNotificationGroupTableViewCell", bundle: .main), forCellReuseIdentifier: actionGroupCell)
         tableView.register(UINib(nibName: "FollowNotificationGroupTableViewCell", bundle: .main), forCellReuseIdentifier: followGroupCell)
         tableView.register(UINib(nibName: "FollowRequestNotificationTableViewCell", bundle: .main), forCellReuseIdentifier: followRequestCell)
-        tableView.register(UINib(nibName: "UnknownNotificationTableViewCell", bundle: .main), forCellReuseIdentifier: unknownCell)
+        tableView.register(UINib(nibName: "BasicTableViewCell", bundle: .main), forCellReuseIdentifier: unknownCell)
         
         tableView.prefetchDataSource = self
         
@@ -120,7 +120,9 @@ class NotificationsTableViewController: EnhancedTableViewController {
             return cell
             
         case .unknown:
-            return tableView.dequeueReusableCell(withIdentifier: unknownCell, for: indexPath)
+            let cell = tableView.dequeueReusableCell(withIdentifier: unknownCell, for: indexPath)
+            cell.textLabel!.text = NSLocalizedString("Unknown Notification", comment: "unknown notification fallback cell text")
+            return cell
         }
     }
  

Tusker/Screens/Preferences/SilentActionPrefs.swift

@@ -7,30 +7,7 @@
 
 import SwiftUI
 
-//struct SilentActionPermission: Identifiable {
-//    let application: String
-//    let permission: Preferences.Permission
-//
-//    var id: String {
-//        return application
-//    }
-//
-//    init(_ application: String, _ permission: Preferences.Permission) {
-//        self.application = application
-//        self.permission = permission
-//    }
-//}
-
 struct SilentActionPrefs : View {
-//    @MappedPreference(\.silentActions, fromPref: {
-//        var array = [SilentActionPermission]()
-//        for (application, permission) in $0 {
-//            array.append(SilentActionPermission(application, permission))
-//        }
-//        return array
-//    })
-//    var silentActionPermissions: [SilentActionPermission]
-//    @Preference(\.silentActions) var silentActions: [String: Preferences.Permission]
     @ObservedObject var preferences = Preferences.shared
     
     var body: some View {
@@ -40,23 +17,13 @@ struct SilentActionPrefs : View {
             .listStyle(GroupedListStyle())
 //            .navigationBarTitle("Silent Action Permissions")
         // see FB6838291
-//        List(Array(silentActions.keys).identified(by: \.self)) { application in
-//            Text(application)
-////            Toggle(isOn: Binding(getValue: { self.silentActions[application] == .accepted }, setValue: { self.silentActions[application] = $0 ? .accepted : .rejected }), label: Text(application))
-//        }.listStyle(.grouped)
     }
 }
 
 struct SilentActionPermissionCell: View {
-    @EnvironmentObject var preferences: Preferences
+    @ObservedObject var preferences = Preferences.shared
     let source: String
-//    var binding: Binding<Bool>
-    
-    init(source: String) {
-        self.source = source
-//        self.binding = Binding(getValue: { self.preferences.silentActions[source] == .accepted }, setValue: { self.preferences.silentActions[source] = $0 ? .accepted : .rejected })
-    }
-    
+
     var body: some View {
         Toggle(isOn: Binding(get: {
             self.preferences.silentActions[self.source] == .accepted

Tusker/Shortcuts/UserActivityManager.swift

@@ -24,7 +24,6 @@ class UserActivityManager {
         let scene = UIApplication.shared.connectedScenes.compactMap { $0 as? UIWindowScene }.first!
         let window = scene.windows.first { $0.isKeyWindow }!
         return window.rootViewController as! MainTabBarViewController
-//        return (UIApplication.shared.delegate! as! AppDelegate).window!.rootViewController as! MainTabBarViewController
     }
     
     private static func present(_ vc: UIViewController, animated: Bool = true) {

Tusker/Views/Attachments/AttachmentsContainerView.swift

@@ -19,6 +19,7 @@ class AttachmentsContainerView: UIView {
     var attachments: [Attachment]!
     
     let attachmentViews: NSHashTable<AttachmentView> = .weakObjects()
+    var moreView: UIView?
     
     var blurView: UIVisualEffectView?
     var hideButtonView: UIVisualEffectView?
@@ -53,6 +54,7 @@ class AttachmentsContainerView: UIView {
         
         attachmentViews.allObjects.forEach { $0.removeFromSuperview() }
         attachmentViews.removeAllObjects()
+        moreView?.removeFromSuperview()
 
         if attachments.count > 0 {
             self.isHidden = false
@@ -128,6 +130,7 @@ class AttachmentsContainerView: UIView {
                 accessibilityElements.append(bottomRight)
             default: // more than 4
                 let moreView = UIView()
+                self.moreView = moreView
                 moreView.backgroundColor = .secondarySystemBackground
                 moreView.translatesAutoresizingMaskIntoConstraints = false
                 moreView.isUserInteractionEnabled = true

Tusker/Views/Profile Header/ProfileHeaderTableViewCell.swift

@@ -157,28 +157,3 @@ class ProfileHeaderTableViewCell: UITableViewCell {
     }
     
 }
-
-//extension ProfileHeaderTableViewCell: MenuPreviewProvider {
-//    var navigationDelegate: TuskerNavigationDelegate? { return delegate }
-//    func getPreviewProviders(for location: CGPoint, sourceViewController: UIViewController) -> PreviewProviders? {
-//        let noteLabelPoint = noteLabel.convert(location, from: self)
-//        if noteLabel.bounds.contains(noteLabelPoint),
-//            let link = noteLabel.getLink(atPoint: noteLabelPoint) {
-//            return (
-//                content: { self.noteLabel.getViewController(forLink: link.url, inRange: link.range) },
-//                actions: {
-//                    let text = (self.noteLabel.text! as NSString).substring(with: link.range)
-//                    if let mention = self.noteLabel.getMention(for: link.url, text: text) {
-//                        return self.actionsForProfile(accountID: mention.id, sourceView: self)
-//                    } else if let hashtag = self.noteLabel.getHashtag(for: link.url, text: text) {
-//                        return self.actionsForHashtag(hashtag, sourceView: self)
-//                    } else {
-//                        return self.actionsForURL(link.url, sourceView: self)
-//                    }
-//                }
-//            )
-//        } else {
-//            return nil
-//        }
-//    }
-//}

Tusker/Views/Status/BaseStatusTableViewCell.swift

@@ -27,7 +27,7 @@ class BaseStatusTableViewCell: UITableViewCell {
     @IBOutlet weak var avatarImageView: UIImageView!
     @IBOutlet weak var displayNameLabel: EmojiLabel!
     @IBOutlet weak var usernameLabel: UILabel!
-    @IBOutlet weak var contentWarningLabel: UILabel!
+    @IBOutlet weak var contentWarningLabel: EmojiLabel!
     @IBOutlet weak var collapseButton: UIButton!
     @IBOutlet weak var contentTextView: StatusContentTextView!
     @IBOutlet weak var attachmentsView: AttachmentsContainerView!
@@ -137,6 +137,9 @@ class BaseStatusTableViewCell: UITableViewCell {
         
         contentWarningLabel.text = status.spoilerText
         contentWarningLabel.isHidden = status.spoilerText.isEmpty
+        if !contentWarningLabel.isHidden {
+            contentWarningLabel.setEmojis(status.emojis, identifier: statusID)
+        }
         
         if state.unknown {
             collapsible = !status.spoilerText.isEmpty
@@ -339,22 +342,7 @@ extension BaseStatusTableViewCell: MenuPreviewProvider {
                     actions: { [] }
                 )
             }
-        }/* else if contentLabel.frame.contains(location),
-            let link = contentLabel.getLink(atPoint: contentLabel.convert(location, from: self)) {
-            return (
-                content: { self.contentLabel.getViewController(forLink: link.url, inRange: link.range) },
-                actions: {
-                    let text = (self.contentLabel.text! as NSString).substring(with: link.range)
-                    if let mention = self.contentLabel.getMention(for: link.url, text: text) {
-                        return self.actionsForProfile(accountID: mention.id, sourceView: self)
-                    } else if let hashtag = self.contentLabel.getHashtag(for: link.url, text: text) {
-                        return self.actionsForHashtag(hashtag, sourceView: self)
-                    } else {
-                        return self.actionsForURL(link.url, sourceView: self)
-                    }
-                }
-            )
-        }*/
+        }
         return self.getStatusCellPreviewProviders(for: location, sourceViewController: sourceViewController)
     }
 }

Tusker/Views/Status/ConversationMainStatusTableViewCell.xib

@@ -52,7 +52,7 @@
                                 <constraint firstItem="SWg-Ka-QyP" firstAttribute="top" secondItem="lZY-2e-17d" secondAttribute="bottom" id="lvX-1b-8cN"/>
                             </constraints>
                         </view>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="751" text="Content Warning" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cwQ-mR-L1b">
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="751" text="Content Warning" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cwQ-mR-L1b" customClass="EmojiLabel" customModule="Tusker" customModuleProvider="target">
                             <rect key="frame" x="0.0" y="58" width="138" height="20.5"/>
                             <accessibility key="accessibilityConfiguration">
                                 <accessibilityTraits key="traits" staticText="YES" notEnabled="YES"/>

Tusker/Views/Status/TimelineStatusTableViewCell.xib

@@ -82,7 +82,7 @@
                                                 <constraint firstAttribute="height" secondItem="gll-xe-FSr" secondAttribute="height" id="B7p-Pc-fZD"/>
                                             </constraints>
                                         </stackView>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="755" text="Content Warning" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="inI-Og-YiU">
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="755" text="Content Warning" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="inI-Og-YiU" customClass="EmojiLabel" customModule="Tusker" customModuleProvider="target">
                                             <rect key="frame" x="0.0" y="24.5" width="277" height="20.5"/>
                                             <accessibility key="accessibilityConfiguration">
                                                 <accessibilityTraits key="traits" staticText="YES" notEnabled="YES"/>