Packages/ComposeUI/Sources/ComposeUI/Controllers/ComposeController.swift

@@ -244,13 +244,6 @@ public final class ComposeController: ViewController {
         }
         
         var body: some View {
-            NavigationView {
-                navRoot
-            }
-            .navigationViewStyle(.stack)
-        }
-        
-        private var navRoot: some View {
             ZStack(alignment: .top) {
                 // just using .background doesn't work; for some reason it gets inset immediately after the software keyboard is dismissed
                 config.backgroundColor
@@ -298,7 +291,6 @@ public final class ComposeController: ViewController {
             })
             .onDisappear(perform: controller.onDisappear)
             .navigationTitle(controller.navigationTitle)
-            .navigationBarTitleDisplayMode(.inline)
         }
         
         private var mainList: some View {

Packages/ComposeUI/Sources/ComposeUI/CoreData/DraftAttachment.swift

@@ -58,13 +58,6 @@ public final class DraftAttachment: NSManagedObject, Identifiable {
         case file(URL, UTType)
     }
     
-    public override func prepareForDeletion() {
-        super.prepareForDeletion()
-        if let fileURL {
-            try? FileManager.default.removeItem(at: fileURL)
-        }
-    }
-    
 }
 
 extension DraftAttachment {

Packages/Duckable/Sources/Duckable/API.swift

@@ -10,8 +10,6 @@ import UIKit
 public protocol DuckableViewController: UIViewController {
     var duckableDelegate: DuckableViewControllerDelegate? { get set }
     
-    func duckableViewControllerShouldDuck() -> Bool
-    
     func duckableViewControllerMayAttemptToDuck()
     
     func duckableViewControllerWillAnimateDuck(withDuration duration: CGFloat, afterDelay delay: CGFloat)
@@ -20,7 +18,6 @@ public protocol DuckableViewController: UIViewController {
 }
 
 extension DuckableViewController {
-    public func duckableViewControllerShouldDuck() -> Bool { true }
     public func duckableViewControllerMayAttemptToDuck() {}
     public func duckableViewControllerWillAnimateDuck(withDuration duration: CGFloat, afterDelay delay: CGFloat) {}
     public func duckableViewControllerDidFinishAnimatingDuck() {}

Packages/Duckable/Sources/Duckable/DuckAnimationController.swift

@@ -63,9 +63,6 @@ class DuckAnimationController: NSObject, UIViewControllerAnimatedTransitioning {
             let fadeAnimator = UIViewPropertyAnimator(duration: 0.1, curve: .linear) {
                 presented.view.layer.opacity = 0
             }
-            fadeAnimator.addCompletion { _ in
-                presented.view.layer.opacity = 1
-            }
             fadeAnimator.startAnimation(afterDelay: 0.3)
 
         } else {
@@ -83,7 +80,6 @@ class DuckAnimationController: NSObject, UIViewControllerAnimatedTransitioning {
                 presented.view.layer.opacity = 0
             }
             fadeAnimator.addCompletion { _ in
-                presented.view.layer.opacity = 1
                 duckable.duckableViewControllerDidFinishAnimatingDuck()
                 transitionContext.completeTransition(true)
             }

Packages/Duckable/Sources/Duckable/DuckableContainerViewController.swift

@@ -88,9 +88,10 @@ public class DuckableContainerViewController: UIViewController, DuckableViewCont
     
     private func doPresentDuckable(_ viewController: DuckableViewController, animated: Bool, completion: (() -> Void)?) {
         viewController.duckableDelegate = self
-        viewController.modalPresentationStyle = .custom
-        viewController.transitioningDelegate = self
-        present(viewController, animated: animated) {
+        let nav = UINavigationController(rootViewController: viewController)
+        nav.modalPresentationStyle = .custom
+        nav.transitioningDelegate = self
+        present(nav, animated: animated) {
             self.configureChildForDuckedPlaceholder()
             completion?()
         }
@@ -135,10 +136,6 @@ public class DuckableContainerViewController: UIViewController, DuckableViewCont
         guard case .presentingDucked(let viewController, isFirstPresentation: _) = state else {
             return
         }
-        guard viewController.duckableViewControllerShouldDuck() else {
-            viewController.sheetPresentationController!.selectedDetentIdentifier = .large
-            return
-        }
         let placeholder = createPlaceholderForDuckedViewController(viewController)
         state = .ducked(viewController, placeholder: placeholder)
         configureChildForDuckedPlaceholder()
@@ -239,3 +236,4 @@ extension DuckableContainerViewController: UISheetPresentationControllerDelegate
         }
     }
 }
+

Packages/Pachyderm/Sources/Pachyderm/Model/Status.swift

@@ -48,12 +48,7 @@ public final class Status: StatusProtocol, Decodable, Sendable {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         self.id = try container.decode(String.self, forKey: .id)
         self.uri = try container.decode(String.self, forKey: .uri)
-        do {
-            self.url = try container.decodeIfPresent(WebURL.self, forKey: .url)
-        } catch {
-            let s = (try? container.decode(String.self, forKey: .url)) ?? "<failed to decode string>"
-            throw DecodingError.dataCorruptedError(forKey: .url, in: container, debugDescription: "Could not decode URL '\(s)', reason: \(String(describing: error))")
-        }
+        self.url = try container.decodeIfPresent(WebURL.self, forKey: .url)
         self.account = try container.decode(Account.self, forKey: .account)
         self.inReplyToID = try container.decodeIfPresent(String.self, forKey: .inReplyToID)
         self.inReplyToAccountID = try container.decodeIfPresent(String.self, forKey: .inReplyToAccountID)