CHANGELOG.md

@@ -1,28 +1,5 @@
 # Changelog
 
-## 2023.5 (77)
-The Compose screen has been substantially refactored in this build, in preparation for upcoming features, so please report any issues you encounter!
-
-Features/Improvements:
-- Use system photo picker instead of custom interface
-- Improve Customize Timelines hashtag search UI
-
-Bugfixes:
-- Fix scroll-to-top not working in in-app Safari
-- Fix crash when decoding pinned timelines fails
-- Fix inaccurate titles in certain error popups
-- Fix crash when comments present in status HTML
-- Fix replied-to account not being the first mention
-- Fix Compose window not having title set initially
-- Fix crash when the API returns notifications that are missing statuses
-- Fix "No Content" cell on profiles not using non-pure-black background
-- Fix reblogged statuses appearing in the Bookmarks list
-- Fix keyboard focus highlight not showing
-- macOS: Fix sidebar item keyboard shortcuts not working
-
-## 2023.4 (76)
-App Store release
-
 ## 2023.4 (75)
 This build contains tweaks to automatic error reporting for the timeline marker API. The previous build's changelog is included below.
 

Packages/ComposeUI/.gitignore

@@ -1,9 +0,0 @@
-.DS_Store
-/.build
-/Packages
-/*.xcodeproj
-xcuserdata/
-DerivedData/
-.swiftpm/config/registries.json
-.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
-.netrc

Packages/ComposeUI/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>

Packages/ComposeUI/Package.resolved

@@ -1,23 +0,0 @@
-{
-  "pins" : [
-    {
-      "identity" : "swift-system",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-system.git",
-      "state" : {
-        "revision" : "025bcb1165deab2e20d4eaba79967ce73013f496",
-        "version" : "1.2.1"
-      }
-    },
-    {
-      "identity" : "swift-url",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/karwa/swift-url.git",
-      "state" : {
-        "branch" : "main",
-        "revision" : "6f45f3cd6606f39c3753b302fe30aea980067b30"
-      }
-    }
-  ],
-  "version" : 2
-}

Packages/ComposeUI/Package.swift

@@ -1,33 +0,0 @@
-// swift-tools-version: 5.7
-// The swift-tools-version declares the minimum version of Swift required to build this package.
-
-import PackageDescription
-
-let package = Package(
-    name: "ComposeUI",
-    platforms: [
-        .iOS(.v15),
-    ],
-    products: [
-        // Products define the executables and libraries a package produces, and make them visible to other packages.
-        .library(
-            name: "ComposeUI",
-            targets: ["ComposeUI"]),
-    ],
-    dependencies: [
-        // Dependencies declare other packages that this package depends on.
-        .package(path: "../Pachyderm"),
-        .package(path: "../InstanceFeatures"),
-        .package(path: "../TuskerComponents"),
-    ],
-    targets: [
-        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
-        // Targets can depend on other targets in this package, and on products in packages this package depends on.
-        .target(
-            name: "ComposeUI",
-            dependencies: ["Pachyderm", "InstanceFeatures", "TuskerComponents"]),
-        .testTarget(
-            name: "ComposeUITests",
-            dependencies: ["ComposeUI"]),
-    ]
-)

Packages/ComposeUI/README.md

@@ -1,3 +0,0 @@
-# ComposeUI
-
-A description of this package.

Packages/ComposeUI/Sources/ComposeUI/ComposeInput.swift

@@ -1,27 +0,0 @@
-//
-//  ComposeInput.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 3/5/23.
-//
-
-import Foundation
-import Combine
-
-protocol ComposeInput: AnyObject, ObservableObject {
-    var toolbarElements: [ToolbarElement] { get }
-    
-    var autocompleteState: AutocompleteState? { get }
-    var autocompleteStatePublisher: Published<AutocompleteState?>.Publisher { get }
-    
-    func autocomplete(with string: String)
-    
-    func applyFormat(_ format: StatusFormat)
-    
-    func beginAutocompletingEmoji()
-}
-
-enum ToolbarElement {
-    case emojiPicker
-    case formattingButtons
-}

Packages/ComposeUI/Sources/ComposeUI/ComposeMastodonContext.swift

@@ -1,26 +0,0 @@
-//
-//  ComposeMastodonContext.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 3/5/23.
-//
-
-import Foundation
-import Pachyderm
-import InstanceFeatures
-import UserAccounts
-
-public protocol ComposeMastodonContext {
-    var accountInfo: UserAccountInfo? { get }
-    var instanceFeatures: InstanceFeatures { get }
-    
-    func run<Result: Sendable>(_ request: Request<Result>) async throws -> (Result, Pagination?)
-    func getCustomEmojis(completion: @escaping ([Emoji]) -> Void)
-    
-    @MainActor
-    func searchCachedAccounts(query: String) -> [AccountProtocol]
-    @MainActor
-    func cachedRelationship(for accountID: String) -> RelationshipProtocol?
-    @MainActor
-    func searchCachedHashtags(query: String) -> [Hashtag]
-}

Packages/ComposeUI/Sources/ComposeUI/ComposeUIConfig.swift

@@ -1,35 +0,0 @@
-//
-//  ComposeUIConfig.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 3/4/23.
-//
-
-import SwiftUI
-import Pachyderm
-import PhotosUI
-import PencilKit
-import TuskerComponents
-
-public struct ComposeUIConfig {
-    public var backgroundColor = Color(uiColor: .systemBackground)
-    public var groupedBackgroundColor = Color(uiColor: .systemGroupedBackground)
-    public var groupedCellBackgroundColor = Color(uiColor: .systemBackground)
-    public var fillColor = Color(uiColor: .systemFill)
-    public var avatarStyle = AvatarImageView.Style.roundRect
-    public var useTwitterKeyboard = false
-    public var contentType = StatusContentType.plain
-    public var automaticallySaveDrafts = false
-    public var requireAttachmentDescriptions = false
-    
-    public var dismiss: @MainActor (DismissMode) -> Void = { _ in }
-    public var presentAssetPicker: ((@MainActor @escaping ([PHPickerResult]) -> Void) -> Void)?
-    public var presentDrawing: ((PKDrawing, @escaping (PKDrawing) -> Void) -> Void)?
-    public var userActivityForDraft: ((Draft) -> NSItemProvider?) = { _ in nil }
-    
-    public init() {
-    }
-}
-
-extension ComposeUIConfig {
-}

Packages/ComposeUI/Sources/ComposeUI/Controllers/AttachmentRowController.swift

@@ -1,162 +0,0 @@
-//
-//  AttachmentRowController.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 3/12/23.
-//
-
-import SwiftUI
-import TuskerComponents
-import Vision
-
-class AttachmentRowController: ViewController {
-    let parent: ComposeController
-    let attachment: DraftAttachment
-    
-    @Published var descriptionMode: DescriptionMode = .allowEntry
-    @Published var textRecognitionError: Error?
-    
-    init(parent: ComposeController, attachment: DraftAttachment) {
-        self.parent = parent
-        self.attachment = attachment
-    }
-    
-    var view: some View {
-        AttachmentView(attachment: attachment)
-    }
-    
-    private func removeAttachment() {
-        withAnimation {
-            parent.draft.attachments.removeAll(where: { $0.id == attachment.id })
-        }
-    }
-    
-    private func editDrawing() {
-        guard case .drawing(let drawing) = attachment.data else {
-            return
-        }
-        parent.config.presentDrawing?(drawing) { newDrawing in
-            self.attachment.data = .drawing(newDrawing)
-        }
-    }
-    
-    private func recognizeText() {
-        descriptionMode = .recognizingText
-        
-        DispatchQueue.global(qos: .userInitiated).async {
-            self.attachment.data.getData(features: self.parent.mastodonController.instanceFeatures, skipAllConversion: true) { result in
-                let data: Data
-                switch result {
-                case .success((let d, _)):
-                    data = d
-                case .failure(let error):
-                    self.descriptionMode = .allowEntry
-                    self.textRecognitionError = error
-                    return
-                }
-                
-                let handler = VNImageRequestHandler(data: data)
-                let request = VNRecognizeTextRequest { request, error in
-                    DispatchQueue.main.async {
-                        if let results = request.results as? [VNRecognizedTextObservation] {
-                            var text = ""
-                            for observation in results {
-                                let result = observation.topCandidates(1).first!
-                                text.append(result.string)
-                                text.append("\n")
-                            }
-                            self.attachment.attachmentDescription = text
-                        }
-                        self.descriptionMode = .allowEntry
-                    }
-                }
-                request.recognitionLevel = .accurate
-                request.usesLanguageCorrection = true
-                DispatchQueue.global(qos: .userInitiated).async {
-                    do {
-                        try handler.perform([request])
-                    } catch let error as NSError where error.code == 1 {
-                        // The perform call throws an error with code 1 if the request is cancelled, which we don't want to show an alert for.
-                        return
-                    } catch {
-                        DispatchQueue.main.async {
-                            self.descriptionMode = .allowEntry
-                            self.textRecognitionError = error
-                        }
-                    }
-                }
-            }
-        }
-    }
-    
-    struct AttachmentView: View {
-        @ObservedObject private var attachment: DraftAttachment
-        @EnvironmentObject private var controller: AttachmentRowController
-        
-        init(attachment: DraftAttachment) {
-            self.attachment = attachment
-        }
-        
-        var body: some View {
-            HStack(alignment: .center, spacing: 4) {
-                AttachmentThumbnailView(attachment: attachment, fullSize: false)
-                    .frame(width: 80, height: 80)
-                    .cornerRadius(8)
-                    .contextMenu {
-                        if case .drawing(_) = attachment.data {
-                            Button(action: controller.editDrawing) {
-                                Label("Edit Drawing", systemImage: "hand.draw")
-                            }
-                        } else if attachment.data.type == .image {
-                            Button(action: controller.recognizeText) {
-                                Label("Recognize Text", systemImage: "doc.text.viewfinder")
-                            }
-                        }
-                        
-                        Button(role: .destructive, action: controller.removeAttachment) {
-                            Label("Delete", systemImage: "trash")
-                        }
-                    } previewIfAvailable: {
-                       AttachmentThumbnailView(attachment: attachment, fullSize: true)
-                    }
-                
-                switch controller.descriptionMode {
-                case .allowEntry:
-                    AttachmentDescriptionTextView(
-                        text: $attachment.attachmentDescription,
-                        placeholder: Text("Describe for the visually impaired…"),
-                        minHeight: 80
-                    )
-                    
-                case .recognizingText:
-                    ProgressView()
-                        .progressViewStyle(.circular)
-                }
-            }
-            .alertWithData("Text Recognition Failed", data: $controller.textRecognitionError) { _ in
-                Button("OK") {}
-            } message: { error in
-                Text(error.localizedDescription)
-            }
-        }
-    }
-    
-}
-
-extension AttachmentRowController {
-    enum DescriptionMode {
-        case allowEntry, recognizingText
-    }
-}
-
-private extension View {
-    @available(iOS, obsoleted: 16.0)
-    @ViewBuilder
-    func contextMenu<M: View, P: View>(@ViewBuilder menuItems: () -> M, @ViewBuilder previewIfAvailable preview: () -> P) -> some View {
-        if #available(iOS 16.0, *) {
-            self.contextMenu(menuItems: menuItems, preview: preview)
-        } else {
-            self.contextMenu(menuItems: menuItems)
-        }
-    }
-}

Packages/ComposeUI/Sources/ComposeUI/Controllers/AttachmentsListController.swift

@@ -1,233 +0,0 @@
-//
-//  AttachmentsListController.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 3/8/23.
-//
-
-import SwiftUI
-import PhotosUI
-import PencilKit
-
-class AttachmentsListController: ViewController {
-    
-    unowned let parent: ComposeController
-    var draft: Draft { parent.draft }
-    
-    var isValid: Bool {
-        !requiresAttachmentDescriptions && validAttachmentCombination
-    }
-    
-    private var requiresAttachmentDescriptions: Bool {
-        if parent.config.requireAttachmentDescriptions {
-            return draft.attachments.allSatisfy {
-                !$0.attachmentDescription.isEmpty
-            }
-        } else {
-            return false
-        }
-    }
-    
-    private var validAttachmentCombination: Bool {
-        if !parent.mastodonController.instanceFeatures.mastodonAttachmentRestrictions {
-            return true
-        } else if draft.attachments.contains(where: { $0.data.type == .video }) &&
-                    draft.attachments.count > 1 {
-            return false
-        } else if draft.attachments.count > 4 {
-            return false
-        }
-        return true
-    }
-    
-    init(parent: ComposeController) {
-        self.parent = parent
-    }
-    
-    private var canAddAttachment: Bool {
-        if parent.mastodonController.instanceFeatures.mastodonAttachmentRestrictions {
-            return draft.attachments.count < 4 && draft.attachments.allSatisfy { $0.data.type == .image } && draft.poll == nil
-        } else {
-            return true
-        }
-    }
-    
-    private var canAddPoll: Bool {
-        if parent.mastodonController.instanceFeatures.pollsAndAttachments {
-            return true
-        } else {
-            return draft.attachments.isEmpty
-        }
-    }
-    
-    var view: some View {
-        AttachmentsList()
-    }
-    
-    private func moveAttachments(from source: IndexSet, to destination: Int) {
-        draft.attachments.move(fromOffsets: source, toOffset: destination)
-    }
-    
-    private func deleteAttachments(at indices: IndexSet) {
-        draft.attachments.remove(atOffsets: indices)
-    }
-    
-    @MainActor
-    private func insertAttachments(at offset: Int, itemProviders: [NSItemProvider]) async {
-        for provider in itemProviders where provider.canLoadObject(ofClass: DraftAttachment.self) {
-            provider.loadObject(ofClass: DraftAttachment.self) { object, error in
-                guard let attachment = object as? DraftAttachment else { return }
-                DispatchQueue.main.async {
-                    guard self.canAddAttachment else { return }
-                    self.draft.attachments.append(attachment)
-                }
-            }
-        }
-    }
-    
-    private func addImage() {
-        parent.config.presentAssetPicker?({ results in
-            Task {
-                await self.insertAttachments(at: self.draft.attachments.count, itemProviders: results.map(\.itemProvider))
-            }
-        })
-    }
-    
-    private func addDrawing() {
-        parent.config.presentDrawing?(PKDrawing()) { drawing in
-            self.draft.attachments.append(DraftAttachment(data: .drawing(drawing)))
-        }
-    }
-    
-    private func togglePoll() {
-        UIApplication.shared.sendAction(#selector(UIView.resignFirstResponder), to: nil, from: nil, for: nil)
-        
-        withAnimation {
-            draft.poll = draft.poll == nil ? Draft.Poll() : nil
-        }
-    }
-    
-    struct AttachmentsList: View {
-        private let cellHeight: CGFloat = 80
-        private let cellPadding: CGFloat = 12
-        
-        @EnvironmentObject private var controller: AttachmentsListController
-        @EnvironmentObject private var draft: Draft
-        @Environment(\.colorScheme) private var colorScheme
-        @Environment(\.horizontalSizeClass) private var horizontalSizeClass
-        
-        var body: some View {
-            Group {
-                attachmentsList
-                
-                if controller.parent.config.presentAssetPicker != nil {
-                    addImageButton
-                        .listRowInsets(EdgeInsets(top: cellPadding / 2, leading: cellPadding / 2, bottom: cellPadding / 2, trailing: cellPadding / 2))
-                }
-                
-                if controller.parent.config.presentDrawing != nil {
-                    addDrawingButton
-                        .listRowInsets(EdgeInsets(top: cellPadding / 2, leading: cellPadding / 2, bottom: cellPadding / 2, trailing: cellPadding / 2))
-                }
-                
-                togglePollButton
-                    .listRowInsets(EdgeInsets(top: cellPadding / 2, leading: cellPadding / 2, bottom: cellPadding / 2, trailing: cellPadding / 2))
-            }
-        }
-        
-        private var attachmentsList: some View {
-            ForEach(draft.attachments) { attachment in
-                ControllerView(controller: { AttachmentRowController(parent: controller.parent, attachment: attachment) })
-                    .listRowInsets(EdgeInsets(top: cellPadding / 2, leading: cellPadding / 2, bottom: cellPadding / 2, trailing: cellPadding / 2))
-                    .onDrag {
-                        NSItemProvider(object: attachment)
-                    }
-            }
-            .onMove(perform: controller.moveAttachments)
-            .onDelete(perform: controller.deleteAttachments)
-            .conditionally(controller.canAddAttachment) {
-                $0.onInsert(of: DraftAttachment.readableTypeIdentifiersForItemProvider, perform: { offset, providers in
-                    Task {
-                        await controller.insertAttachments(at: offset, itemProviders: providers)
-                    }
-                })
-            }
-        }
-        
-        private var addImageButton: some View {
-            Button(action: controller.addImage) {
-                Label("Add photo or video", systemImage: colorScheme == .dark ? "photo.fill" : "photo")
-            }
-            .disabled(!controller.canAddAttachment)
-            .foregroundColor(.accentColor)
-            .frame(height: cellHeight / 2)
-        }
-        
-        private var addDrawingButton: some View {
-            Button(action: controller.addDrawing) {
-                Label("Draw something", systemImage: "hand.draw")
-            }
-            .disabled(!controller.canAddAttachment)
-            .foregroundColor(.accentColor)
-            .frame(height: cellHeight / 2)
-        }
-        
-        private var togglePollButton: some View {
-            Button(action: controller.togglePoll) {
-                Label(draft.poll == nil ? "Add a poll" : "Remove poll", systemImage: "chart.bar.doc.horizontal")
-            }
-            .disabled(!controller.canAddPoll)
-            .foregroundColor(.accentColor)
-            .frame(height: cellHeight / 2)
-        }
-    }
-}
-
-fileprivate extension View {
-    @ViewBuilder
-    func conditionally(_ condition: Bool, body: (Self) -> some View) -> some View {
-        if condition {
-            body(self)
-        } else {
-            self
-        }
-    }
-    
-    @available(iOS, obsoleted: 16.0)
-    @ViewBuilder
-    func sheetOrPopover(isPresented: Binding<Bool>, @ViewBuilder content: @escaping () -> some View) -> some View {
-        if #available(iOS 16.0, *) {
-            self.modifier(SheetOrPopover(isPresented: isPresented, view: content))
-        } else {
-            self.popover(isPresented: isPresented, content: content)
-        }
-    }
-    
-    @available(iOS, obsoleted: 16.0)
-    @ViewBuilder
-    func withSheetDetentsIfAvailable() -> some View {
-        if #available(iOS 16.0, *) {
-            self
-                .presentationDetents([.medium, .large])
-                .presentationDragIndicator(.visible)
-        } else {
-            self
-        }
-    }
-}
-
-@available(iOS 16.0, *)
-fileprivate struct SheetOrPopover<V: View>: ViewModifier {
-    @Binding var isPresented: Bool
-    @ViewBuilder let view: () -> V
-    
-    @Environment(\.horizontalSizeClass) var sizeClass
-    
-    func body(content: Content) -> some View {
-        if sizeClass == .compact {
-            content.sheet(isPresented: $isPresented, content: view)
-        } else {
-            content.popover(isPresented: $isPresented, content: view)
-        }
-    }
-}

Packages/ComposeUI/Sources/ComposeUI/Controllers/AutocompleteController.swift

@@ -1,83 +0,0 @@
-//
-//  AutocompleteController.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 3/25/23.
-//
-
-import SwiftUI
-import Combine
-
-class AutocompleteController: ViewController {
-    
-    unowned let parent: ComposeController
-    
-    @Published var mode: Mode?
-    
-    init(parent: ComposeController) {
-        self.parent = parent
-        
-        parent.$currentInput
-            .compactMap { $0 }
-            .flatMap { $0.autocompleteStatePublisher }
-            .map {
-                switch $0 {
-                case .mention(_):
-                    return Mode.mention
-                case .emoji(_):
-                    return Mode.emoji
-                case .hashtag(_):
-                    return Mode.hashtag
-                case nil:
-                    return nil
-                }
-            }
-            .assign(to: &$mode)
-    }
-    
-    var view: some View {
-        AutocompleteView()
-    }
-    
-    struct AutocompleteView: View {
-        @EnvironmentObject private var parent: ComposeController
-        @EnvironmentObject private var controller: AutocompleteController
-        @Environment(\.colorScheme) private var colorScheme: ColorScheme
-        
-        var body: some View {
-            if let mode = controller.mode {
-                VStack(spacing: 0) {
-                    Divider()
-                    suggestionsView(mode: mode)
-                }
-                .background(backgroundColor)
-            }
-        }
-        
-        @ViewBuilder
-        private func suggestionsView(mode: Mode) -> some View {
-            switch mode {
-            case .mention:
-                ControllerView(controller: { AutocompleteMentionsController(composeController: parent) })
-            case .emoji:
-                ControllerView(controller: { AutocompleteEmojisController(composeController: parent) })
-            case .hashtag:
-                ControllerView(controller: { AutocompleteHashtagsController(composeController: parent) })
-            }
-        }
-        
-        private var backgroundColor: Color {
-            Color(white: colorScheme == .light ? 0.98 : 0.15)
-        }
-        
-        private var borderColor: Color {
-            Color(white: colorScheme == .light ? 0.85 : 0.25)
-        }
-    }
-    
-    enum Mode {
-        case mention
-        case emoji
-        case hashtag
-    }
-}

Packages/ComposeUI/Sources/ComposeUI/Controllers/AutocompleteEmojisController.swift

@@ -1,196 +0,0 @@
-//
-//  AutocompleteEmojisController.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 3/26/23.
-//
-
-import SwiftUI
-import Pachyderm
-import Combine
-
-class AutocompleteEmojisController: ViewController {
-    unowned let composeController: ComposeController
-    var mastodonController: ComposeMastodonContext { composeController.mastodonController }
-    
-    private var stateCancellable: AnyCancellable?
-    private var searchTask: Task<Void, Never>?
-    
-    @Published var expanded = false
-    @Published var emojis: [Emoji] = []
-    
-    var emojisBySection: [String: [Emoji]] {
-        var values: [String: [Emoji]] = [:]
-        for emoji in emojis {
-            let key = emoji.category ?? ""
-            if !values.keys.contains(key) {
-                values[key] = [emoji]
-            } else {
-                values[key]!.append(emoji)
-            }
-        }
-        return values
-    }
-    
-    init(composeController: ComposeController) {
-        self.composeController = composeController
-        
-        stateCancellable = composeController.$currentInput
-            .compactMap { $0 }
-            .flatMap { $0.autocompleteStatePublisher }
-            .compactMap {
-                if case .emoji(let s) = $0 {
-                    return s
-                } else {
-                    return nil
-                }
-            }
-            .removeDuplicates()
-            .sink { [unowned self] query in
-                self.searchTask?.cancel()
-                self.searchTask = Task {
-                    await self.queryChanged(query)
-                }
-            }
-    }
-    
-    @MainActor
-    private func queryChanged(_ query: String) async {
-        var emojis = await withCheckedContinuation { continuation in
-            composeController.mastodonController.getCustomEmojis {
-                continuation.resume(returning: $0)
-            }
-        }
-        guard !Task.isCancelled else {
-            return
-        }
-        
-        if !query.isEmpty {
-            emojis =
-            emojis.map { emoji -> (Emoji, (matched: Bool, score: Int)) in
-                (emoji, FuzzyMatcher.match(pattern: query, str: emoji.shortcode))
-            }
-            .filter(\.1.matched)
-            .sorted { $0.1.score > $1.1.score }
-            .map(\.0)
-        }
-        
-        var shortcodes = Set<String>()
-        var newEmojis = [Emoji]()
-        for emoji in emojis where !shortcodes.contains(emoji.shortcode) {
-            newEmojis.append(emoji)
-            shortcodes.insert(emoji.shortcode)
-        }
-        self.emojis = newEmojis
-    }
-    
-    private func toggleExpanded() {
-        withAnimation {
-            expanded.toggle()
-        }
-    }
-    
-    private func autocomplete(with emoji: Emoji) {
-        guard let input = composeController.currentInput else { return }
-        input.autocomplete(with: ":\(emoji.shortcode):")
-    }
-    
-    var view: some View {
-        AutocompleteEmojisView()
-    }
-    
-    struct AutocompleteEmojisView: View {
-        @EnvironmentObject private var composeController: ComposeController
-        @EnvironmentObject private var controller: AutocompleteEmojisController
-        @ScaledMetric private var emojiSize = 30
-        
-        var body: some View {
-            // When exapnded, the toggle button should be at the top. When collapsed, it should be centered.
-            HStack(alignment: controller.expanded ? .top : .center, spacing: 0) {
-                emojiList
-                    .transition(.move(edge: .bottom))
-                
-                toggleExpandedButton
-                    .padding(.trailing, 8)
-                    .padding(.top, controller.expanded ? 8 : 0)
-            }
-        }
-        
-        @ViewBuilder
-        private var emojiList: some View {
-            if controller.expanded {
-                verticalGrid
-                    .frame(height: 150)
-            } else {
-                horizontalScrollView
-            }
-        }
-        
-        private var verticalGrid: some View {
-            ScrollView {
-                LazyVGrid(columns: [GridItem(.adaptive(minimum: emojiSize), spacing: 4)]) {
-                    ForEach(controller.emojisBySection.keys.sorted(), id: \.self) { section in
-                        Section {
-                            ForEach(controller.emojisBySection[section]!, id: \.shortcode) { emoji in
-                                Button(action: { controller.autocomplete(with: emoji) }) {
-                                    composeController.emojiImageView(emoji)
-                                        .frame(height: emojiSize)
-                                }
-                                .accessibilityLabel(emoji.shortcode)
-                            }
-                        } header: {
-                            if !section.isEmpty {
-                                VStack(alignment: .leading, spacing: 2) {
-                                    Text(section)
-                                        .font(.caption)
-                                    
-                                    Divider()
-                                }
-                                .padding(.top, 4)
-                            }
-                        }
-                    }
-                }
-                .padding(.all, 8)
-                // the spacing between the grid sections doesn't seem to be taken into account by the ScrollView?
-                .padding(.bottom, CGFloat(controller.emojisBySection.keys.count) * 4)
-            }
-            .frame(maxWidth: .infinity)
-        }
-        
-        private var horizontalScrollView: some View {
-            ScrollView(.horizontal) {
-                HStack(spacing: 8) {
-                    ForEach(controller.emojis, id: \.shortcode) { emoji in
-                        Button(action: { controller.autocomplete(with: emoji) }) {
-                            HStack(spacing: 4) {
-                                composeController.emojiImageView(emoji)
-                                    .frame(height: emojiSize)
-                                Text(verbatim: ":\(emoji.shortcode):")
-                                    .foregroundColor(.primary)
-                            }
-                        }
-                        .accessibilityLabel(emoji.shortcode)
-                        .frame(height: emojiSize)
-                    }
-                    .animation(.linear(duration: 0.2), value: controller.emojis)
-                    
-                    Spacer(minLength: emojiSize)
-                }
-                .padding(.horizontal, 8)
-                .frame(height: emojiSize + 16)
-            }
-        }
-        
-        private var toggleExpandedButton: some View {
-            Button(action: controller.toggleExpanded) {
-                Image(systemName: "chevron.down")
-                    .resizable()
-                    .aspectRatio(contentMode: .fit)
-                    .rotationEffect(controller.expanded ? .zero : .degrees(180))
-            }
-            .accessibilityLabel(controller.expanded ? "Collapse" : "Expand")
-            .frame(width: 20, height: 20)
-        }
-    }
-}

Packages/ComposeUI/Sources/ComposeUI/Controllers/AutocompleteHashtagsController.swift

@@ -1,124 +0,0 @@
-//
-//  AutocompleteHashtagsController.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 4/1/23.
-//
-
-import SwiftUI
-import Combine
-import Pachyderm
-
-class AutocompleteHashtagsController: ViewController {
-    unowned let composeController: ComposeController
-    var mastodonController: ComposeMastodonContext { composeController.mastodonController }
-    
-    private var stateCancellable: AnyCancellable?
-    private var searchTask: Task<Void, Never>?
-    
-    @Published var hashtags: [Hashtag] = []
-    
-    init(composeController: ComposeController) {
-        self.composeController = composeController
-        
-        stateCancellable = composeController.$currentInput
-            .compactMap { $0 }
-            .flatMap { $0.autocompleteStatePublisher }
-            .compactMap {
-                if case .hashtag(let s) = $0 {
-                    return s
-                } else {
-                    return nil
-                }
-            }
-            .debounce(for: .milliseconds(250), scheduler: DispatchQueue.main)
-            .sink { [unowned self] query in
-                self.searchTask?.cancel()
-                self.searchTask = Task {
-                    await self.queryChanged(query)
-                }
-            }
-    }
-    
-    @MainActor
-    private func queryChanged(_ query: String) async {
-        guard !query.isEmpty else {
-            hashtags = []
-            return
-        }
-        
-        let localHashtags = mastodonController.searchCachedHashtags(query: query)
-        
-        var onlyLocalTagsTask: Task<Void, any Error>?
-        if !localHashtags.isEmpty {
-            onlyLocalTagsTask = Task {
-                // we only want to do the local-only search if the trends API call takes more than .25sec or it fails
-                try await Task.sleep(nanoseconds: 250 * NSEC_PER_MSEC)
-                self.updateHashtags(searchResults: [], trendingTags: [], localHashtags: localHashtags, query: query)
-            }
-        }
-        
-        async let trendingTags = try? mastodonController.run(Client.getTrendingHashtags()).0
-        async let searchResults = try? mastodonController.run(Client.search(query: "#\(query)", types: [.hashtags])).0.hashtags
-        
-        let trends = await trendingTags ?? []
-        let search = await searchResults ?? []
-        
-        onlyLocalTagsTask?.cancel()
-        guard !Task.isCancelled else { return }
-        
-        updateHashtags(searchResults: search, trendingTags: trends, localHashtags: localHashtags, query: query)
-    }
-    
-    @MainActor
-    private func updateHashtags(searchResults: [Hashtag], trendingTags: [Hashtag], localHashtags: [Hashtag], query: String) {
-        var addedHashtags = Set<String>()
-        var hashtags = [(Hashtag, Int)]()
-        for group in [searchResults, trendingTags, localHashtags] {
-            for tag in group where !addedHashtags.contains(tag.name) {
-                let (matched, score) = FuzzyMatcher.match(pattern: query, str: tag.name)
-                if matched {
-                    hashtags.append((tag, score))
-                    addedHashtags.insert(tag.name)
-                }
-            }
-        }
-        self.hashtags = hashtags
-            .sorted { $0.1 > $1.1 }
-            .map(\.0)
-    }
-    
-    private func autocomplete(with hashtag: Hashtag) {
-        guard let currentInput = composeController.currentInput else { return }
-        currentInput.autocomplete(with: "#\(hashtag.name)")
-    }
-    
-    var view: some View {
-        AutocompleteHashtagsView()
-    }
-    
-    struct AutocompleteHashtagsView: View {
-        @EnvironmentObject private var controller: AutocompleteHashtagsController
-        
-        var body: some View {
-            ScrollView(.horizontal) {
-                HStack(spacing: 8) {
-                    ForEach(controller.hashtags, id: \.name) { hashtag in
-                        Button(action: { controller.autocomplete(with: hashtag) }) {
-                            Text(verbatim: "#\(hashtag.name)")
-                                .foregroundColor(Color(uiColor: .label))
-                        }
-                        .frame(height: 30)
-                        .padding(.vertical, 8)
-                    }
-                    
-                    Spacer()
-                }
-                .padding(.horizontal, 8)
-                .animation(.linear(duration: 0.2), value: controller.hashtags)
-            }
-        }
-    }
-    
-    
-}

Packages/ComposeUI/Sources/ComposeUI/Controllers/AutocompleteMentionsController.swift

@@ -1,178 +0,0 @@
-//
-//  AutocompleteMentionsController.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 3/25/23.
-//
-
-import SwiftUI
-import Combine
-import Pachyderm
-import TuskerComponents
-
-class AutocompleteMentionsController: ViewController {
-    
-    unowned let composeController: ComposeController
-    var mastodonController: ComposeMastodonContext { composeController.mastodonController }
-    
-    private var stateCancellable: AnyCancellable?
-    
-    @Published private var accounts: [AnyAccount] = []
-    private var searchTask: Task<Void, Never>?
-    
-    init(composeController: ComposeController) {
-        self.composeController = composeController
-        
-        stateCancellable = composeController.$currentInput
-            .compactMap { $0 }
-            .flatMap { $0.autocompleteStatePublisher }
-            .compactMap {
-                if case .mention(let s) = $0 {
-                    return s
-                } else {
-                    return nil
-                }
-            }
-            .debounce(for: .milliseconds(250), scheduler: DispatchQueue.main)
-            .sink { [unowned self] query in
-                self.searchTask?.cancel()
-                self.searchTask = Task {
-                    await self.queryChanged(query)
-                }
-            }
-    }
-    
-    @MainActor
-    private func queryChanged(_ query: String) async {
-        guard !query.isEmpty else {
-            accounts = []
-            return
-        }
-        
-        let localSearchTask = Task {
-            // we only want to search locally if the search API call takes more than .25sec or it fails
-            try await Task.sleep(nanoseconds: 250 * NSEC_PER_MSEC)
-            
-            let results = self.mastodonController.searchCachedAccounts(query: query)
-            try Task.checkCancellation()
-            
-            if !results.isEmpty {
-                self.loadAccounts(results.map { .init(value: $0) }, query: query)
-            }
-        }
-        
-        let accounts = try? await mastodonController.run(Client.searchForAccount(query: query)).0
-        guard let accounts,
-              !Task.isCancelled else {
-            return
-        }
-        localSearchTask.cancel()
-        
-       loadAccounts(accounts.map { .init(value: $0) }, query: query)
-    }
-    
-    @MainActor
-    private func loadAccounts(_ accounts: [AnyAccount], query: String) {
-        guard case .mention(query) = composeController.currentInput?.autocompleteState else {
-            return
-        }
-        
-        // when sorting account suggestions, ignore the domain component of the acct unless the user is typing it themself
-        let ignoreDomain = !query.contains("@")
-        
-        self.accounts =
-            accounts.map { (account) -> (AnyAccount, (matched: Bool, score: Int)) in
-                let fuzzyStr = ignoreDomain ? String(account.value.acct.split(separator: "@").first!) : account.value.acct
-                let res = (account, FuzzyMatcher.match(pattern: query, str: fuzzyStr))
-                return res
-            }
-            .filter(\.1.matched)
-            .map { (account, res) -> (AnyAccount, Int) in
-                // give higher weight to accounts that the user follows or is followed by
-                var score = res.score
-                if let relationship = mastodonController.cachedRelationship(for: account.value.id) {
-                    if relationship.following {
-                        score += 3
-                    }
-                    if relationship.followedBy {
-                        score += 2
-                    }
-                }
-                return (account, score)
-            }
-            .sorted { $0.1 > $1.1 }
-            .map(\.0)
-    }
-    
-    private func autocomplete(with account: AnyAccount) {
-        guard let input = composeController.currentInput else {
-            return
-        }
-        input.autocomplete(with: "@\(account.value.acct)")
-    }
-    
-    var view: some View {
-        AutocompleteMentionsView()
-    }
-    
-    struct AutocompleteMentionsView: View {
-        @EnvironmentObject private var controller: AutocompleteMentionsController
-        
-        var body: some View {
-            ScrollView(.horizontal) {
-                HStack(spacing: 8) {
-                    ForEach(controller.accounts) { account in
-                        AutocompleteMentionButton(account: account)
-                    }
-                    
-                    Spacer()
-                }
-                .padding(.horizontal, 8)
-                .animation(.linear(duration: 0.2), value: controller.accounts)
-            }
-            .onDisappear {
-                controller.searchTask?.cancel()
-            }
-        }
-    }
-    
-    private struct AutocompleteMentionButton: View {
-        @EnvironmentObject private var composeController: ComposeController
-        @EnvironmentObject private var controller: AutocompleteMentionsController
-        let account: AnyAccount
-        
-        var body: some View {
-            Button(action: { controller.autocomplete(with: account) }) {
-                HStack(spacing: 4) {
-                    AvatarImageView(
-                        url: account.value.avatar,
-                        size: 30,
-                        style: composeController.config.avatarStyle,
-                        fetchAvatar: composeController.fetchAvatar
-                    )
-                    
-                    VStack(alignment: .leading) {
-                        controller.composeController.displayNameLabel(account.value, .subheadline, 14)
-                            .foregroundColor(.primary)
-                        
-                        Text(verbatim: "@\(account.value.acct)")
-                            .font(.caption)
-                            .foregroundColor(.primary)
-                    }
-                }
-            }
-            .frame(height: 30)
-            .padding(.vertical, 8)
-        }
-    }
-}
-
-fileprivate struct AnyAccount: Equatable, Identifiable {
-    let value: any AccountProtocol
-    
-    var id: String { value.id }
-    
-    static func ==(lhs: AnyAccount, rhs: AnyAccount) -> Bool {
-        return lhs.value.id == rhs.value.id
-    }
-}

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

@@ -1,379 +0,0 @@
-//
-//  ComposeController.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 3/4/23.
-//
-
-import SwiftUI
-import Combine
-import Pachyderm
-import TuskerComponents
-
-public final class ComposeController: ViewController {
-    public typealias FetchStatus = (String) -> (any StatusProtocol)?
-    public typealias DisplayNameLabel = (any AccountProtocol, Font.TextStyle, CGFloat) -> AnyView
-    public typealias ReplyContentView = (any StatusProtocol, @escaping (CGFloat) -> Void) -> AnyView
-    public typealias EmojiImageView = (Emoji) -> AnyView
-    
-    @Published public private(set) var draft: Draft
-    @Published public var config: ComposeUIConfig
-    let mastodonController: ComposeMastodonContext
-    let fetchAvatar: AvatarImageView.FetchAvatar
-    let fetchStatus: FetchStatus
-    let displayNameLabel: DisplayNameLabel
-    let replyContentView: ReplyContentView
-    let emojiImageView: EmojiImageView
-    
-    @Published public var currentAccount: (any AccountProtocol)?
-    @Published public var showToolbar = true
-    
-    @Published var autocompleteController: AutocompleteController!
-    @Published var toolbarController: ToolbarController!
-    @Published var attachmentsListController: AttachmentsListController!
-    
-    @Published var contentWarningBecomeFirstResponder = false
-    @Published var mainComposeTextViewBecomeFirstResponder = false
-    @Published var currentInput: (any ComposeInput)? = nil
-    @Published var shouldEmojiAutocompletionBeginExpanded = false
-    @Published var isShowingSaveDraftSheet = false
-    @Published var isShowingDraftsList = false
-    @Published var poster: PostService?
-    @Published var postError: (any Error)?
-    
-    var isPosting: Bool {
-        poster != nil
-    }
-    
-    var charactersRemaining: Int {
-        let instanceFeatures = mastodonController.instanceFeatures
-        let limit = instanceFeatures.maxStatusChars
-        let cwCount = draft.contentWarningEnabled ? draft.contentWarning.count : 0
-        return limit - (cwCount + CharacterCounter.count(text: draft.text, for: instanceFeatures))
-    }
-    
-    var postButtonEnabled: Bool {
-        draft.hasContent
-            && charactersRemaining >= 0
-            && !isPosting
-            && attachmentsListController.isValid
-            && isPollValid
-    }
-    
-    private var isPollValid: Bool {
-        draft.poll == nil || draft.poll!.options.allSatisfy { !$0.text.isEmpty }
-    }
-    
-    public init(
-        draft: Draft,
-        config: ComposeUIConfig,
-        mastodonController: ComposeMastodonContext,
-        fetchAvatar: @escaping AvatarImageView.FetchAvatar,
-        fetchStatus: @escaping FetchStatus,
-        displayNameLabel: @escaping DisplayNameLabel,
-        replyContentView: @escaping ReplyContentView,
-        emojiImageView: @escaping EmojiImageView
-    ) {
-        self.draft = draft
-        self.config = config
-        self.mastodonController = mastodonController
-        self.fetchAvatar = fetchAvatar
-        self.fetchStatus = fetchStatus
-        self.displayNameLabel = displayNameLabel
-        self.replyContentView = replyContentView
-        self.emojiImageView = emojiImageView
-        
-        self.autocompleteController = AutocompleteController(parent: self)
-        self.toolbarController = ToolbarController(parent: self)
-        self.attachmentsListController = AttachmentsListController(parent: self)
-    }
-    
-    public var view: some View {
-        ComposeView(poster: poster)
-            .environmentObject(draft)
-            .environmentObject(mastodonController.instanceFeatures)
-    }
-    
-    public func canPaste(itemProviders: [NSItemProvider]) -> Bool {
-        guard itemProviders.allSatisfy({ $0.canLoadObject(ofClass: DraftAttachment.self) }) else {
-            return false
-        }
-        if mastodonController.instanceFeatures.mastodonAttachmentRestrictions {
-            if draft.attachments.allSatisfy({ $0.data.type == .image }) {
-                // if providers are videos, this technically allows invalid video/image combinations
-                return itemProviders.count + draft.attachments.count <= 4
-            } else {
-                return false
-            }
-        } else {
-            return true
-        }
-    }
-    
-    public func paste(itemProviders: [NSItemProvider]) {
-        for provider in itemProviders where provider.canLoadObject(ofClass: DraftAttachment.self) {
-            provider.loadObject(ofClass: DraftAttachment.self) { object, error in
-                guard let attachment = object as? DraftAttachment else { return }
-                DispatchQueue.main.async {
-                    self.draft.attachments.append(attachment)
-                }
-            }
-        }
-    }
-    
-    @MainActor
-    func cancel() {
-        if config.automaticallySaveDrafts {
-            config.dismiss(.cancel)
-        } else {
-            if draft.hasContent {
-                isShowingSaveDraftSheet = true
-            } else {
-                DraftsManager.shared.remove(draft)
-                config.dismiss(.cancel)
-            }
-        }
-    }
-    
-    func postStatus() {
-        guard !isPosting,
-              draft.hasContent else {
-            return
-        }
-        
-        Task { @MainActor in
-            let poster = PostService(mastodonController: mastodonController, config: config, draft: draft)
-            self.poster = poster
-            
-            // try to resign the first responder, if there is one.
-            // otherwise, the existence of the poster changes the .disabled modifier which causes the keyboard to hide
-            // and the first responder to change during a view update, which in turn triggers a bunch of state changes
-            UIApplication.shared.sendAction(#selector(UIResponder.resignFirstResponder), to: nil, from: nil, for: nil)
-            
-            do {
-                try await poster.post()
-                
-                // wait .25 seconds so the user can see the progress bar has completed
-                try? await Task.sleep(nanoseconds: 250_000_000)
-                
-                config.dismiss(.post)
-                
-                // don't unset the poster, so the ui remains disabled while dismissing
-                
-            } catch let error as PostService.Error {
-                self.postError = error
-                self.poster = nil
-            } catch {
-                fatalError("unreachable")
-            }
-        }
-    }
-    
-    func showDrafts() {
-        isShowingDraftsList = true
-    }
-    
-    func selectDraft(_ draft: Draft) {
-        if !self.draft.hasContent {
-            DraftsManager.shared.remove(self.draft)
-        }
-        DraftsManager.save()
-        
-        self.draft = draft
-    }
-    
-    func onDisappear() {
-        if !draft.hasContent {
-            DraftsManager.shared.remove(draft)
-        }
-        DraftsManager.save()
-    }
-    
-    func toggleContentWarning() {
-        draft.contentWarningEnabled.toggle()
-        if draft.contentWarningEnabled {
-            contentWarningBecomeFirstResponder = true
-        }
-    }
-    
-    struct ComposeView: View {
-        @OptionalObservedObject var poster: PostService?
-        @EnvironmentObject var controller: ComposeController
-        @EnvironmentObject var draft: Draft
-        @StateObject private var keyboardReader = KeyboardReader()
-        @State private var globalFrameOutsideList = CGRect.zero
-        
-        init(poster: PostService?) {
-            self.poster = poster
-        }
-        
-        var config: ComposeUIConfig {
-            controller.config
-        }
-        
-        var body: 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
-                    .edgesIgnoringSafeArea(.all)
-                
-                mainList
-                
-                if let poster = poster {
-                    // can't use SwiftUI.ProgressView because there's no UIProgressView.Style.bar equivalent, see FB8587149
-                    WrappedProgressView(value: poster.currentStep, total: poster.totalSteps)
-                }
-            }
-            .safeAreaInset(edge: .bottom, spacing: 0) {
-                if controller.showToolbar {
-                    VStack(spacing: 0) {
-                        ControllerView(controller: { controller.autocompleteController })
-                            .transition(.move(edge: .bottom))
-                            .animation(.default, value: controller.currentInput?.autocompleteState)
-                        
-                        ControllerView(controller: { controller.toolbarController })
-                    }
-                    // on iPadOS15, the toolbar ends up below the keyboard's toolbar without this
-                    .padding(.bottom, keyboardInset)
-                    .transition(.move(edge: .bottom))
-                }
-            }
-            .toolbar {
-                ToolbarItem(placement: .cancellationAction) { cancelButton }
-                ToolbarItem(placement: .confirmationAction) { postButton }
-            }
-            .background(GeometryReader { proxy in
-                Color.clear
-                    .preference(key: GlobalFrameOutsideListPrefKey.self, value: proxy.frame(in: .global))
-                    .onPreferenceChange(GlobalFrameOutsideListPrefKey.self) { newValue in
-                        globalFrameOutsideList = newValue
-                    }
-            })
-            .sheet(isPresented: $controller.isShowingDraftsList) {
-                ControllerView(controller: { DraftsController(parent: controller, isPresented: $controller.isShowingDraftsList) })
-            }
-            .alertWithData("Error Posting", data: $controller.postError, actions: { _ in
-                Button("OK") {}
-            }, message: { error in
-                Text(error.localizedDescription)
-            })
-            .onDisappear(perform: controller.onDisappear)
-            .navigationTitle(navTitle)
-        }
-        
-        private var navTitle: String {
-            if let id = draft.inReplyToID,
-               let status = controller.fetchStatus(id) {
-                return "Reply to @\(status.account.acct)"
-            } else {
-                return "New Post"
-            }
-        }
-        
-        private var mainList: some View {
-            List {
-                if let id = draft.inReplyToID,
-                   let status = controller.fetchStatus(id) {
-                    ReplyStatusView(
-                        status: status,
-                        rowTopInset: 8,
-                        globalFrameOutsideList: globalFrameOutsideList
-                    )
-                    .listRowInsets(EdgeInsets(top: 8, leading: 8, bottom: 4, trailing: 8))
-                    .listRowSeparator(.hidden)
-                    .listRowBackground(config.backgroundColor)
-                }
-                
-                HeaderView()
-                    .listRowInsets(EdgeInsets(top: draft.inReplyToID == nil ? 8 : 4, leading: 8, bottom: 4, trailing: 8))
-                    .listRowSeparator(.hidden)
-                    .listRowBackground(config.backgroundColor)
-                
-                if draft.contentWarningEnabled {
-                    EmojiTextField(
-                        text: $draft.contentWarning,
-                        placeholder: "Write your warning here",
-                        maxLength: nil,
-                        becomeFirstResponder: $controller.contentWarningBecomeFirstResponder,
-                        focusNextView: $controller.mainComposeTextViewBecomeFirstResponder
-                    )
-                        .listRowInsets(EdgeInsets(top: 4, leading: 8, bottom: 4, trailing: 8))
-                        .listRowSeparator(.hidden)
-                        .listRowBackground(config.backgroundColor)
-                }
-                
-                MainTextView()
-                    .listRowInsets(EdgeInsets(top: 4, leading: 8, bottom: 4, trailing: 8))
-                    .listRowSeparator(.hidden)
-                    .listRowBackground(config.backgroundColor)
-                
-                if let poll = draft.poll {
-                    ControllerView(controller: { PollController(parent: controller, poll: poll) })
-                        .listRowInsets(EdgeInsets(top: 4, leading: 8, bottom: 8, trailing: 8))
-                        .listRowSeparator(.hidden)
-                        .listRowBackground(config.backgroundColor)
-                }
-                
-                ControllerView(controller: { controller.attachmentsListController })
-                    .listRowInsets(EdgeInsets(top: 4, leading: 8, bottom: 8, trailing: 8))
-                    .listRowBackground(config.backgroundColor)
-            }
-            .listStyle(.plain)
-            .scrollDismissesKeyboardInteractivelyIfAvailable()
-            .disabled(controller.isPosting)
-        }
-        
-        private var cancelButton: some View {
-            Button(action: controller.cancel) {
-                Text("Cancel")
-                    // otherwise all Buttons in the nav bar are made semibold
-                    .font(.system(size: 17, weight: .regular))
-            }
-        }
-        
-        @ViewBuilder
-        private var postButton: some View {
-            if draft.hasContent {
-                Button(action: controller.postStatus) {
-                    Text("Post")
-                }
-                .keyboardShortcut(.return, modifiers: .command)
-                .disabled(!controller.postButtonEnabled)
-            } else {
-                Button(action: controller.showDrafts) {
-                    Text("Drafts")
-                }
-            }
-        }
-        
-        @available(iOS, obsoleted: 16.0)
-        private var keyboardInset: CGFloat {
-            if #unavailable(iOS 16.0),
-               UIDevice.current.userInterfaceIdiom == .pad,
-               keyboardReader.isVisible {
-                return ToolbarController.height
-            } else {
-                return 0
-            }
-        }
-    }
-}
-
-private extension View {
-    @available(iOS, obsoleted: 16.0)
-    @ViewBuilder
-    func scrollDismissesKeyboardInteractivelyIfAvailable() -> some View {
-        if #available(iOS 16.0, *) {
-            self.scrollDismissesKeyboard(.interactively)
-        } else {
-            self
-        }
-    }
-}
-
-private struct GlobalFrameOutsideListPrefKey: PreferenceKey {
-    static var defaultValue: CGRect = .zero
-    static func reduce(value: inout CGRect, nextValue: () -> CGRect) {
-        value = nextValue()
-    }
-}

Packages/ComposeUI/Sources/ComposeUI/Controllers/DraftsController.swift

@@ -1,165 +0,0 @@
-//
-//  DraftsController.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 3/7/23.
-//
-
-import SwiftUI
-import TuskerComponents
-
-class DraftsController: ViewController {
-    
-    unowned let parent: ComposeController
-    @Binding var isPresented: Bool
-    
-    @Published var draftForDifferentReply: Draft?
-    
-    init(parent: ComposeController, isPresented: Binding<Bool>) {
-        self.parent = parent
-        self._isPresented = isPresented
-    }
-    
-    var view: some View {
-        DraftsRepresentable()
-    }
-    
-    func maybeSelectDraft(_ draft: Draft) {
-        if draft.inReplyToID != parent.draft.inReplyToID,
-           parent.draft.hasContent {
-            draftForDifferentReply = draft
-        } else {
-            confirmSelectDraft(draft)
-        }
-    }
-    
-    func cancelSelectingDraft() {
-        draftForDifferentReply = nil
-    }
-    
-    func confirmSelectDraft(_ draft: Draft) {
-        parent.selectDraft(draft)
-        closeDrafts()
-    }
-    
-    func deleteDraft(_ draft: Draft) {
-        DraftsManager.shared.remove(draft)
-    }
-    
-    func closeDrafts() {
-        isPresented = false
-        DraftsManager.save()
-    }
-    
-    struct DraftsRepresentable: UIViewControllerRepresentable {
-        typealias UIViewControllerType = UIHostingController<DraftsView>
-        
-        func makeUIViewController(context: Context) -> UIHostingController<DraftsController.DraftsView> {
-            return UIHostingController(rootView: DraftsView())
-        }
-        
-        func updateUIViewController(_ uiViewController: UIHostingController<DraftsController.DraftsView>, context: Context) {
-        }
-    }
-    
-    struct DraftsView: View {
-        @EnvironmentObject private var controller: DraftsController
-        @EnvironmentObject private var currentDraft: Draft
-        @ObservedObject private var draftsManager = DraftsManager.shared
-        
-        private var visibleDrafts: [Draft] {
-            draftsManager.sorted.filter {
-                $0.accountID == controller.parent.mastodonController.accountInfo!.id && $0.id != currentDraft.id
-            }
-        }
-        
-        var body: some View {
-            NavigationView {
-                List {
-                    ForEach(visibleDrafts) { draft in
-                        Button(action: { controller.maybeSelectDraft(draft) }) {
-                            DraftRow(draft: draft)
-                        }
-                        .contextMenu {
-                            Button(role: .destructive, action: { controller.deleteDraft(draft) }) {
-                                Label("Delete Draft", systemImage: "trash")
-                            }
-                        }
-                        .ifLet(controller.parent.config.userActivityForDraft(draft), modify: { view, activity in
-                            view.onDrag { activity }
-                        })
-                    }
-                    .onDelete { indices in
-                        indices.map { visibleDrafts[$0] }.forEach(controller.deleteDraft)
-                    }
-                }
-                .listStyle(.plain)
-                .navigationTitle("Drafts")
-                .navigationBarTitleDisplayMode(.inline)
-                .toolbar {
-                    ToolbarItem(placement: .cancellationAction) { cancelButton }
-                }
-            }
-            .alertWithData("Different Reply", data: $controller.draftForDifferentReply) { draft in
-                Button(role: .cancel, action: controller.cancelSelectingDraft) {
-                    Text("Cancel")
-                }
-                Button(action: { controller.confirmSelectDraft(draft) }) {
-                    Text("Restore Draft")
-                }
-            } message: { _ in
-                Text("The selected draft is a reply to a different post, do you wish to use it?")
-            }
-        }
-        
-        private var cancelButton: some View {
-            Button(action: controller.closeDrafts) {
-                Text("Cancel")
-            }
-        }
-    }
-}
-
-private struct DraftRow: View {
-    @ObservedObject var draft: Draft
-    
-    var body: some View {
-        HStack {
-            VStack(alignment: .leading) {
-                if draft.contentWarningEnabled {
-                    Text(draft.contentWarning)
-                        .font(.body.bold())
-                        .foregroundColor(.secondary)
-                }
-                
-                Text(draft.text)
-                    .font(.body)
-                
-                HStack(spacing: 8) {
-                    ForEach(draft.attachments) { attachment in
-                        AttachmentThumbnailView(attachment: attachment, fullSize: false)
-                            .frame(width: 50, height: 50)
-                            .cornerRadius(5)
-                    }
-                }
-            }
-            
-            Spacer()
-            
-            Text(draft.lastModified.formatted(.abbreviatedTimeAgo))
-                .font(.body)
-                .foregroundColor(.secondary)
-        }
-    }
-}
-
-private extension View {
-    @ViewBuilder
-    func ifLet<T, V: View>(_ value: T?, modify: (Self, T) -> V) -> some View {
-        if let value {
-            modify(self, value)
-        } else {
-            self
-        }
-    }
-}

Packages/ComposeUI/Sources/ComposeUI/Controllers/PlaceholderController.swift

@@ -1,48 +0,0 @@
-//
-//  PlaceholderController.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 3/6/23.
-//
-
-import SwiftUI
-
-final class PlaceholderController: ViewController, PlaceholderViewProvider {
-    
-    private let placeholderView: PlaceholderView = PlaceholderController.makePlaceholderView()
-        
-    static func makePlaceholderView() -> some View {
-        let components = Calendar.current.dateComponents([.month, .day], from: Date())
-        if components.month == 3 && components.day == 14,
-           Date().formatted(date: .numeric, time: .omitted).starts(with: "3") {
-            Text("Happy π day!")
-        } else if components.month == 4 && components.day == 1 {
-            Text("April Fool's!").rotationEffect(.radians(.pi), anchor: .center)
-        } else if components.month == 9 && components.day == 5 {
-            // https://weirder.earth/@noracodes/109276419847254552
-            // https://retrocomputing.stackexchange.com/questions/14763/what-warning-was-given-on-attempting-to-post-to-usenet-circa-1990
-            Text("This program posts news to thousands of machines throughout the entire populated world. Please be sure you know what you are doing.").italic()
-        } else if components.month == 9 && components.day == 21 {
-            Text("Do you remember?")
-        } else if components.month == 10 && components.day == 31 {
-            if .random() {
-                Text("Post something spooky!")
-            } else {
-                Text("Any questions?")
-            }
-        } else {
-            Text("What's on your mind?")
-        }
-    }
-    
-    var view: some View {
-        placeholderView
-    }
-}
-
-// exists to provide access to the type alias since the @State property needs it to be explicit
-private protocol PlaceholderViewProvider {
-    associatedtype PlaceholderView: View
-    @ViewBuilder
-    static func makePlaceholderView() -> PlaceholderView
-}

Packages/ComposeUI/Sources/ComposeUI/Controllers/PollController.swift

@@ -1,182 +0,0 @@
-//
-//  PollController.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 3/25/23.
-//
-
-import SwiftUI
-import TuskerComponents
-
-class PollController: ViewController {
-    
-    unowned let parent: ComposeController
-    var draft: Draft { parent.draft }
-    let poll: Draft.Poll
-    
-    @Published var duration: Duration
-    
-    init(parent: ComposeController, poll: Draft.Poll) {
-        self.parent = parent
-        self.poll = poll
-        self.duration = .fromTimeInterval(poll.duration) ?? .oneDay
-    }
-    
-    var view: some View {
-        PollView()
-            .environmentObject(poll)
-    }
-    
-    private func removePoll() {
-        withAnimation {
-            draft.poll = nil
-        }
-    }
-    
-    private func moveOptions(indices: IndexSet, newIndex: Int) {
-        poll.options.move(fromOffsets: indices, toOffset: newIndex)
-    }
-    
-    private func removeOption(_ option: Draft.Poll.Option) {
-        poll.options.removeAll(where: { $0.id == option.id })
-    }
-    
-    private var canAddOption: Bool {
-        if let max = parent.mastodonController.instanceFeatures.maxPollOptionsCount {
-            return poll.options.count < max
-        } else {
-            return true
-        }
-    }
-    
-    private func addOption() {
-        poll.options.append(.init(""))
-    }
-    
-    struct PollView: View {
-        @EnvironmentObject private var controller: PollController
-        @EnvironmentObject private var poll: Draft.Poll
-        @Environment(\.colorScheme) private var colorScheme
-        
-        var body: some View {
-            VStack {
-                HStack {
-                    Text("Poll")
-                        .font(.headline)
-                    
-                    Spacer()
-                    
-                    Button(action: controller.removePoll) {
-                        Image(systemName: "xmark")
-                            .imageScale(.small)
-                            .padding(4)
-                    }
-                    .accessibilityLabel("Remove poll")
-                    .buttonStyle(.plain)
-                    .accentColor(buttonForegroundColor)
-                    .background(Circle().foregroundColor(buttonBackgroundColor))
-                    .hoverEffect()
-                }
-                
-                List {
-                    ForEach(poll.options) { option in
-                        PollOptionView(option: option, remove: { controller.removeOption(option) })
-                            .frame(height: 36)
-                            .listRowInsets(EdgeInsets(top: 4, leading: 0, bottom: 4, trailing: 0))
-                            .listRowSeparator(.hidden)
-                            .listRowBackground(Color.clear)
-                    }
-                    .onMove(perform: controller.moveOptions)
-                }
-                .listStyle(.plain)
-                .scrollDisabledIfAvailable(true)
-                .frame(height: 44 * CGFloat(poll.options.count))
-                
-                Button(action: controller.addOption) {
-                    Label {
-                        Text("Add Option")
-                    } icon: {
-                        Image(systemName: "plus")
-                            .foregroundColor(.accentColor)
-                    }
-                }
-                .buttonStyle(.borderless)
-                .disabled(!controller.canAddOption)
-                
-                HStack {
-                    MenuPicker(selection: $poll.multiple, options: [
-                        .init(value: true, title: "Allow multiple"),
-                        .init(value: false, title: "Single choice"),
-                    ])
-                    .frame(maxWidth: .infinity)
-                    
-                    MenuPicker(selection: $controller.duration, options: Duration.allCases.map {
-                        .init(value: $0, title: Duration.formatter.string(from: $0.timeInterval)!)
-                    })
-                    .frame(maxWidth: .infinity)
-                }
-            }
-            .padding(8)
-            .background(
-                backgroundColor
-                    .cornerRadius(10)
-            )
-            .onChange(of: controller.duration) { newValue in
-                poll.duration = newValue.timeInterval
-            }
-        }
-        
-        private var backgroundColor: Color {
-            // in light mode, .secondarySystemBackground has a blue-ish hue, which we don't want
-            colorScheme == .dark ? controller.parent.config.fillColor : Color(white: 0.95)
-        }
-        
-        private var buttonForegroundColor: Color {
-            Color(uiColor: .label)
-        }
-        
-        private var buttonBackgroundColor: Color {
-            Color(white: colorScheme == .dark ? 0.1 : 0.8)
-        }
-    }
-}
-
-extension PollController {
-    enum Duration: Hashable, Equatable, CaseIterable {
-        case fiveMinutes, thirtyMinutes, oneHour, sixHours, oneDay, threeDays, sevenDays
-        
-        static let formatter: DateComponentsFormatter = {
-            let f = DateComponentsFormatter()
-            f.maximumUnitCount = 1
-            f.unitsStyle = .full
-            f.allowedUnits = [.weekOfMonth, .day, .hour, .minute]
-            return f
-        }()
-        
-        static func fromTimeInterval(_ ti: TimeInterval) -> Duration? {
-            for it in allCases where it.timeInterval == ti {
-                return it
-            }
-            return nil
-        }
-        
-        var timeInterval: TimeInterval {
-            switch self {
-            case .fiveMinutes:
-                return 5 * 60
-            case .thirtyMinutes:
-                return 30 * 60
-            case .oneHour:
-                return 60 * 60
-            case .sixHours:
-                return 6 * 60 * 60
-            case .oneDay:
-                return 24 * 60 * 60
-            case .threeDays:
-                return 3 * 24 * 60 * 60
-            case .sevenDays:
-                return 7 * 24 * 60 * 60
-            }
-        }
-    }
-}

Packages/ComposeUI/Sources/ComposeUI/Controllers/ToolbarController.swift

@@ -1,160 +0,0 @@
-//
-//  ToolbarController.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 3/7/23.
-//
-
-import SwiftUI
-import Pachyderm
-import TuskerComponents
-
-class ToolbarController: ViewController {
-    static let height: CGFloat = 44
-    private static let visibilityOptions: [MenuPicker<Pachyderm.Visibility>.Option] = Pachyderm.Visibility.allCases.map { vis in
-            .init(value: vis, title: vis.displayName, subtitle: vis.subtitle, image: UIImage(systemName: vis.unfilledImageName), accessibilityLabel: "Visibility: \(vis.displayName)")
-    }
-    
-    unowned let parent: ComposeController
-    
-    @Published var minWidth: CGFloat?
-    @Published var realWidth: CGFloat?
-    
-    init(parent: ComposeController) {
-        self.parent = parent
-    }
-    
-    var view: some View {
-        ToolbarView()
-    }
-    
-    func showEmojiPicker() {
-        guard parent.currentInput?.autocompleteState == nil else {
-            return
-        }
-        parent.shouldEmojiAutocompletionBeginExpanded = true
-        parent.currentInput?.beginAutocompletingEmoji()
-    }
-    
-    func formatAction(_ format: StatusFormat) -> () -> Void {
-        { [weak self] in
-            self?.parent.currentInput?.applyFormat(format)
-        }
-    }
-    
-    struct ToolbarView: View {
-        @EnvironmentObject private var draft: Draft
-        @EnvironmentObject private var controller: ToolbarController
-        @EnvironmentObject private var composeController: ComposeController
-        @ScaledMetric(relativeTo: .body) private var imageSize: CGFloat = 22
-        
-        @State private var minWidth: CGFloat?
-        @State private var realWidth: CGFloat?
-        
-        var body: some View {
-            ScrollView(.horizontal, showsIndicators: false) {
-                HStack(spacing: 0) {
-                    cwButton
-                    
-                    MenuPicker(selection: $draft.visibility, options: ToolbarController.visibilityOptions, buttonStyle: .iconOnly)
-                    // the button has a bunch of extra space by default, but combined with what we add it's too much
-                        .padding(.horizontal, -8)
-                    
-                    if composeController.mastodonController.instanceFeatures.localOnlyPosts {
-                        localOnlyPicker
-                            .padding(.horizontal, -8)
-                    }
-                    
-                    if let currentInput = composeController.currentInput,
-                       currentInput.toolbarElements.contains(.emojiPicker) {
-                        customEmojiButton
-                    }
-                    
-                    if let currentInput = composeController.currentInput,
-                       currentInput.toolbarElements.contains(.formattingButtons),
-                       composeController.config.contentType != .plain {
-                        
-                        Spacer()
-                        formatButtons
-                    }
-                    
-                    Spacer()
-                }
-                .padding(.horizontal, 16)
-                .frame(minWidth: minWidth)
-                .background(GeometryReader { proxy in
-                    Color.clear
-                        .preference(key: ToolbarWidthPrefKey.self, value: proxy.size.width)
-                        .onPreferenceChange(ToolbarWidthPrefKey.self) { width in
-                            realWidth = width
-                        }
-                })
-            }
-            .scrollDisabledIfAvailable(realWidth ?? 0 <= minWidth ?? 0)
-            .frame(height: ToolbarController.height)
-            .frame(maxWidth: .infinity)
-            .background(.regularMaterial, ignoresSafeAreaEdges: .bottom)
-            .overlay(alignment: .top) {
-                Divider()
-            }
-            .background(GeometryReader { proxy in
-                Color.clear
-                    .preference(key: ToolbarWidthPrefKey.self, value: proxy.size.width)
-                    .onPreferenceChange(ToolbarWidthPrefKey.self) { width in
-                        minWidth = width
-                    }
-            })
-        }
-        
-        private var cwButton: some View {
-            Button("CW", action: controller.parent.toggleContentWarning)
-                .accessibilityLabel(draft.contentWarningEnabled ? "Remove content warning" : "Add content warning")
-                .padding(5)
-                .hoverEffect()
-        }
-        
-        private var localOnlyPicker: some View {
-            let domain = composeController.mastodonController.accountInfo!.instanceURL.host!
-            return MenuPicker(selection: $draft.localOnly, options: [
-                .init(value: true, title: "Local-only", subtitle: "Only \(domain)", image: UIImage(named: "link.broken")),
-                .init(value: false, title: "Federated", image: UIImage(systemName: "link")),
-            ], buttonStyle: .iconOnly)
-        }
-        
-        private var customEmojiButton: some View {
-            Button(action: controller.showEmojiPicker) {
-                Label("Insert custom emoji", systemImage: "face.smiling")
-            }
-            .labelStyle(.iconOnly)
-            .font(.system(size: imageSize))
-            .padding(5)
-            .hoverEffect()
-            .transition(.opacity.animation(.linear(duration: 0.2)))
-        }
-        
-        private var formatButtons: some View {
-            ForEach(StatusFormat.allCases, id: \.rawValue) { format in
-                Button(action: controller.formatAction(format)) {
-                    if let imageName = format.imageName {
-                        Image(systemName: imageName)
-                            .font(.system(size: imageSize))
-                    } else if let (str, attrs) = format.title {
-                        let container = try! AttributeContainer(attrs, including: \.uiKit)
-                        Text(AttributedString(str, attributes: container))
-                    }
-                }
-                .accessibilityLabel(format.accessibilityLabel)
-                .padding(5)
-                .hoverEffect()
-                .transition(.opacity.animation(.linear(duration: 0.2)))
-            }
-        }
-    }
-}
-
-private struct ToolbarWidthPrefKey: PreferenceKey {
-    static var defaultValue: CGFloat? = nil
-    static func reduce(value: inout CGFloat?, nextValue: () -> CGFloat?) {
-        value = nextValue()
-    }
-}

Packages/ComposeUI/Sources/ComposeUI/FuzzyMatcher.swift

@@ -1,62 +0,0 @@
-//
-//  FuzzyMatcher.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 10/10/20.
-//  Copyright © 2020 Shadowfacts. All rights reserved.
-//
-
-import Foundation
-
-struct FuzzyMatcher {
-    
-    private init() {}
-    
-    /// Rudimentary string fuzzy matching algorithm.
-    ///
-    /// Operates on UTF-8 code points, so attempting to match strings which include characters composed of
-    /// multiple code points may produce unexpected results.
-    ///
-    /// Scoring is as follows:
-    /// +2 points for every char in `pattern` that occurs in `str` sequentially
-    /// -2 points for every char in `pattern` that does not occur in `str` sequentially
-    /// -1 point for every char in `str` skipped between matching chars from the `pattern`
-    static func match(pattern: String, str: String) -> (matched: Bool, score: Int) {
-        let pattern = pattern.lowercased()
-        let str = str.lowercased()
-        
-        var patternIndex = pattern.utf8.startIndex
-        var lastStrMatchIndex: String.UTF8View.Index?
-        var strIndex = str.utf8.startIndex
-        
-        var score = 0
-        
-        while patternIndex < pattern.utf8.endIndex && strIndex < str.utf8.endIndex {
-            let patternChar = pattern.utf8[patternIndex]
-            let strChar = str.utf8[strIndex]
-            if patternChar == strChar {
-                let distance = str.utf8.distance(from: lastStrMatchIndex ?? str.utf8.startIndex, to: strIndex)
-                if distance > 1 {
-                    score -= distance - 1
-                }
-                
-                patternIndex = pattern.utf8.index(after: patternIndex)
-                lastStrMatchIndex = strIndex
-                strIndex = str.utf8.index(after: strIndex)
-                
-                score += 2
-            } else {
-                strIndex = str.utf8.index(after: strIndex)
-                
-                if strIndex >= str.utf8.endIndex {
-                    patternIndex = pattern.utf8.index(after: patternIndex)
-                    strIndex = str.utf8.index(after: lastStrMatchIndex ?? str.utf8.startIndex)
-                    score -= 2
-                }
-            }
-        }
-        
-        return (score > 0, score)
-    }
-    
-}

Packages/ComposeUI/Sources/ComposeUI/KeyboardReader.swift

@@ -1,29 +0,0 @@
-//
-//  KeyboardReader.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 3/7/23.
-//
-
-import UIKit
-import Combine
-
-@available(iOS, obsoleted: 16.0)
-class KeyboardReader: ObservableObject {
-    @Published var isVisible = false
-    
-    init() {
-        NotificationCenter.default.addObserver(self, selector: #selector(willShow), name: UIResponder.keyboardWillShowNotification, object: nil)
-        NotificationCenter.default.addObserver(self, selector: #selector(willHide), name: UIResponder.keyboardWillHideNotification, object: nil)
-    }
-    
-    @objc func willShow(_ notification: Foundation.Notification) {
-        // when a hardware keyboard is connected, the height is very short, so we don't consider that being "visible"
-        let endFrame = notification.userInfo![UIResponder.keyboardFrameEndUserInfoKey] as! CGRect
-        isVisible = endFrame.height > 72
-    }
-    
-    @objc func willHide() {
-        isVisible = false
-    }
-}

Packages/ComposeUI/Sources/ComposeUI/Model/DismissMode.swift

@@ -1,12 +0,0 @@
-//
-//  DismissMode.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 3/7/23.
-//
-
-import Foundation
-
-public enum DismissMode {
-    case cancel, post
-}

Packages/ComposeUI/Sources/ComposeUI/Model/DraftsManager.swift

@@ -1,104 +0,0 @@
-//
-//  DraftsManager.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 10/22/18.
-//  Copyright © 2018 Shadowfacts. All rights reserved.
-//
-
-import Foundation
-import Combine
-
-public class DraftsManager: Codable, ObservableObject {
-
-    public private(set) static var shared: DraftsManager = load()
-    
-    private static var appGroupDirectory = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: "group.space.vaccor.Tusker")!
-    private static var archiveURL = appGroupDirectory.appendingPathComponent("drafts").appendingPathExtension("plist")
-    
-    private static let saveQueue = DispatchQueue(label: "DraftsManager", qos: .utility)
-    
-    public static func save() {
-        saveQueue.async {
-            let encoder = PropertyListEncoder()
-            let data = try? encoder.encode(shared)
-            try? data?.write(to: archiveURL, options: .noFileProtection)
-        }
-    }
-    
-    static func load() -> DraftsManager {
-        let decoder = PropertyListDecoder()
-        if let data = try? Data(contentsOf: archiveURL),
-            let draftsManager = try? decoder.decode(DraftsManager.self, from: data) {
-            return draftsManager
-        }
-        return DraftsManager()
-    }
-    
-    public static func migrate(from url: URL) -> Result<Void, any Error> {
-        do {
-            try? FileManager.default.removeItem(at: archiveURL)
-            try FileManager.default.moveItem(at: url, to: archiveURL)
-        } catch {
-            return .failure(error)
-        }
-        shared = load()
-        return .success(())
-    }
-    
-    private init() {}
-    
-    public required init(from decoder: Decoder) throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        
-        if let dict = try? container.decode([UUID: SafeDraft].self, forKey: .drafts) {
-            self.drafts = dict.compactMapValues { $0.draft }
-        } else if let array = try? container.decode([SafeDraft].self, forKey: .drafts) {
-            self.drafts = array.reduce(into: [:], { partialResult, safeDraft in
-                if let draft = safeDraft.draft {
-                    partialResult[draft.id] = draft
-                }
-            })
-        } else {
-            throw DecodingError.dataCorruptedError(forKey: .drafts, in: container, debugDescription: "expected drafts to be a dict or array of drafts")
-        }
-    }
-    
-    public func encode(to encoder: Encoder) throws {
-        var container = encoder.container(keyedBy: CodingKeys.self)
-        try container.encode(drafts, forKey: .drafts)
-    }
-    
-    @Published private var drafts: [UUID: Draft] = [:]
-    var sorted: [Draft] {
-        return drafts.values.sorted(by: { $0.lastModified > $1.lastModified })
-    }
-    
-    public func add(_ draft: Draft) {
-        drafts[draft.id] = draft
-    }
-    
-    public func remove(_ draft: Draft) {
-        drafts.removeValue(forKey: draft.id)
-    }
-    
-    public func getBy(id: UUID) -> Draft? {
-        return drafts[id]
-    }
-    
-    enum CodingKeys: String, CodingKey {
-        case drafts
-    }
-    
-    // a container that always succeeds at decoding
-    // so if a single draft can't be decoded, we don't lose all drafts
-    struct SafeDraft: Decodable {
-        let draft: Draft?
-        
-        init(from decoder: Decoder) throws {
-            let container = try decoder.singleValueContainer()
-            self.draft = try? container.decode(Draft.self)
-        }
-    }
-    
-}

Packages/ComposeUI/Sources/ComposeUI/OptionalObservedObject.swift

@@ -1,33 +0,0 @@
-//
-//  OptionalObservedObject.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 4/15/23.
-//
-
-import SwiftUI
-import Combine
-
-@propertyWrapper
-struct OptionalObservedObject<T: ObservableObject>: DynamicProperty {
-    private class Republisher: ObservableObject {
-        var cancellable: AnyCancellable?
-        var wrapped: T? {
-            didSet {
-                cancellable?.cancel()
-                cancellable = wrapped?.objectWillChange
-                    .receive(on: RunLoop.main)
-                    .sink { [unowned self] _ in
-                        self.objectWillChange.send()
-                    }
-            }
-        }
-    }
-    
-    @StateObject private var republisher = Republisher()
-    var wrappedValue: T?
-    
-    func update() {
-        republisher.wrapped = wrappedValue
-    }
-}

Packages/ComposeUI/Sources/ComposeUI/PKDrawing+Render.swift

@@ -1,33 +0,0 @@
-//
-//  PKDrawing+Render.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 5/9/20.
-//  Copyright © 2020 Shadowfacts. All rights reserved.
-//
-
-import UIKit
-import PencilKit
-
-extension PKDrawing {
-    
-    func imageInLightMode(from rect: CGRect, scale: CGFloat = UIScreen.main.scale) -> UIImage {
-        let lightTraitCollection = UITraitCollection(userInterfaceStyle: .light)
-        var drawingImage: UIImage!
-        lightTraitCollection.performAsCurrent {
-            drawingImage = self.image(from: rect, scale: scale)
-        }
-        
-        let imageRect = CGRect(origin: .zero, size: rect.size)
-        let format = UIGraphicsImageRendererFormat()
-        format.opaque = false
-        format.scale = scale
-        let renderer = UIGraphicsImageRenderer(size: rect.size, format: format)
-        return renderer.image { (context) in
-            UIColor.white.setFill()
-            context.fill(imageRect)
-            drawingImage.draw(in: imageRect)
-        }
-    }
-    
-}

Packages/ComposeUI/Sources/ComposeUI/UITextInput+Autocomplete.swift

@@ -1,183 +0,0 @@
-//
-//  UITextInput+Autocomplete.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 3/5/23.
-//
-
-import UIKit
-import SwiftUI
-
-extension UITextInput {
-    func autocomplete(with string: String, permittedModes: AutocompleteModes, autocompleteState: inout AutocompleteState?) {
-        guard let selectedTextRange,
-              let wholeDocumentRange = self.textRange(from: self.beginningOfDocument, to: self.endOfDocument),
-              let text = self.text(in: wholeDocumentRange),
-              let (lastWordStartIndex, _) = findAutocompleteLastWord() else {
-            return
-        }
-        
-        let distanceToEnd = self.offset(from: selectedTextRange.start, to: self.endOfDocument)
-        
-        let selectedRangeStartUTF16 = self.offset(from: self.beginningOfDocument, to: selectedTextRange.start)
-        let characterBeforeCursorIndex = text.utf16.index(text.startIndex, offsetBy: selectedRangeStartUTF16)
-        
-        let insertSpace: Bool
-        if distanceToEnd > 0 {
-            let charAfterCursor = text[characterBeforeCursorIndex]
-            insertSpace = charAfterCursor != " " && charAfterCursor != "\n"
-        } else {
-            insertSpace = true
-        }
-        let string = insertSpace ? string + " " : string
-        
-        let startPosition = self.position(from: self.beginningOfDocument, offset: text.utf16.distance(from: text.startIndex, to: lastWordStartIndex))!
-        let lastWordRange = self.textRange(from: startPosition, to: selectedTextRange.start)!
-        replace(lastWordRange, withText: string)
-        
-        autocompleteState = updateAutocompleteState(permittedModes: permittedModes)
-        
-        // keep the cursor at the same position in the text, immediately after what was inserted
-        // if we inserted a space, move the cursor 1 farther so it's immediately after the pre-existing space
-        let insertSpaceOffset = insertSpace ? 0 : 1
-        let newCursorPosition = self.position(from: self.endOfDocument, offset: -distanceToEnd + insertSpaceOffset)!
-        self.selectedTextRange = self.textRange(from: newCursorPosition, to: newCursorPosition)
-    }
-    
-    func updateAutocompleteState(permittedModes: AutocompleteModes) -> AutocompleteState? {
-        guard let selectedTextRange,
-            let wholeDocumentRange = self.textRange(from: self.beginningOfDocument, to: self.endOfDocument),
-              let text = self.text(in: wholeDocumentRange),
-              !text.isEmpty,
-              let (lastWordStartIndex, foundFirstAtSign) = findAutocompleteLastWord() else {
-            return nil
-        }
-        
-        let triggerChars = permittedModes.triggerChars
-        
-        if lastWordStartIndex > text.startIndex {
-            // if the character before the "word" beginning is a valid part of a "word",
-            // we aren't able to autocomplete
-            let c = text[text.index(before: lastWordStartIndex)]
-            if isPermittedForAutocomplete(c) || triggerChars.contains(c) {
-                return nil
-            }
-        }
-        
-        let characterBeforeCursorIndex = text.utf16.index(text.startIndex, offsetBy: self.offset(from: self.beginningOfDocument, to: selectedTextRange.start))
-        
-        if lastWordStartIndex >= text.startIndex {
-            let lastWord = text[lastWordStartIndex..<characterBeforeCursorIndex]
-            let exceptFirst = lastWord[lastWord.index(after: lastWord.startIndex)...]
-            
-            // periods are only allowed in mentions in the domain part
-            if lastWord.contains(".") {
-                if lastWord.first == "@" && foundFirstAtSign && permittedModes.contains(.mentions) {
-                    return .mention(String(exceptFirst))
-                } else {
-                    return nil
-                }
-            }
-            
-            switch lastWord.first {
-            case "@" where permittedModes.contains(.mentions):
-                return .mention(String(exceptFirst))
-            case ":" where permittedModes.contains(.emojis):
-                return .emoji(String(exceptFirst))
-            case "#" where permittedModes.contains(.hashtags):
-                return .hashtag(String(exceptFirst))
-            default:
-                return nil
-            }
-        } else {
-            return nil
-        }
-    }
-    
-    private func findAutocompleteLastWord() -> (index: String.Index, foundFirstAtSign: Bool)? {
-        guard (self as? UIView)?.isFirstResponder == true,
-              let selectedTextRange,
-              selectedTextRange.isEmpty,
-              let wholeDocumentRange = self.textRange(from: self.beginningOfDocument, to: self.endOfDocument),
-              let text = self.text(in: wholeDocumentRange),
-              !text.isEmpty else {
-            return nil
-        }
-        
-        let selectedRangeStartUTF16 = self.offset(from: self.beginningOfDocument, to: selectedTextRange.start)
-        let cursorIndex = text.utf16.index(text.startIndex, offsetBy: selectedRangeStartUTF16)
-        
-        guard cursorIndex != text.startIndex else {
-            return nil
-        }
-        
-        var lastWordStartIndex = text.index(before: cursorIndex)
-        var foundFirstAtSign = false
-        while true {
-            let c = text[lastWordStartIndex]
-            
-            if !isPermittedForAutocomplete(c) {
-                if foundFirstAtSign {
-                    if c != "@" {
-                        // move the index forward by 1, so that the first char of the substring is the 1st @ instead of whatever comes before it
-                        lastWordStartIndex = text.index(after: lastWordStartIndex)
-                    }
-                    break
-                } else {
-                    if c == "@" {
-                        foundFirstAtSign = true
-                    } else if c != "." {
-                        // periods are allowed for domain names in mentions
-                        break
-                    }
-                }
-            }
-            
-            guard lastWordStartIndex > text.startIndex else {
-                break
-            }
-            
-            lastWordStartIndex = text.index(before: lastWordStartIndex)
-        }
-        
-        return (lastWordStartIndex, foundFirstAtSign)
-    }
-}
-
-enum AutocompleteState: Equatable {
-    case mention(String)
-    case emoji(String)
-    case hashtag(String)
-}
-
-struct AutocompleteModes: OptionSet {
-    static let mentions = AutocompleteModes(rawValue: 1 << 0)
-    static let hashtags = AutocompleteModes(rawValue: 1 << 2)
-    static let emojis   = AutocompleteModes(rawValue: 1 << 3)
-    
-    static let all: AutocompleteModes = [
-        .mentions,
-        .hashtags,
-        .emojis,
-    ]
-    
-    let rawValue: Int
-    
-    var triggerChars: [Character] {
-        var chars: [Character] = []
-        if contains(.mentions) {
-            chars.append("@")
-        }
-        if contains(.hashtags) {
-            chars.append("#")
-        }
-        if contains(.emojis) {
-            chars.append(":")
-        }
-        return chars
-    }
-}
-
-private func isPermittedForAutocomplete(_ c: Character) -> Bool {
-    return (c >= "a" && c <= "z") || (c >= "A" && c <= "Z") || (c >= "0" && c <= "9") || c == "_"
-}

Packages/ComposeUI/Sources/ComposeUI/View+ForwardsCompat.swift

@@ -1,20 +0,0 @@
-//
-//  View+ForwardsCompat.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 3/25/23.
-//
-
-import SwiftUI
-
-extension View {
-    @available(iOS, obsoleted: 16.0)
-    @ViewBuilder
-    func scrollDisabledIfAvailable(_ disabled: Bool) -> some View {
-        if #available(iOS 16.0, *) {
-            self.scrollDisabled(disabled)
-        } else {
-            self
-        }
-    }
-}

Packages/ComposeUI/Sources/ComposeUI/ViewController.swift

@@ -1,29 +0,0 @@
-//
-//  ViewController.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 3/4/23.
-//
-
-import SwiftUI
-import Combine
-
-public protocol ViewController: ObservableObject {
-    associatedtype ContentView: View
-    
-    @ViewBuilder
-    var view: ContentView { get }
-}
-
-public struct ControllerView<Controller: ViewController>: View {
-    @StateObject private var controller: Controller
-    
-    public init(controller: @escaping () -> Controller) {
-        self._controller = StateObject(wrappedValue: controller())
-    }
-    
-    public var body: some View {
-        controller.view
-            .environmentObject(controller)
-    }
-}

Packages/ComposeUI/Sources/ComposeUI/Views/CurrentAccountView.swift

@@ -1,41 +0,0 @@
-//
-//  CurrentAccountView.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 3/4/23.
-//
-
-import SwiftUI
-import Pachyderm
-import TuskerComponents
-
-struct CurrentAccountView: View {
-    let account: (any AccountProtocol)?
-    @EnvironmentObject private var controller: ComposeController
-    
-    var body: some View {
-        HStack(alignment: .top) {
-            AvatarImageView(
-                url: account?.avatar,
-                size: 50,
-                style: controller.config.avatarStyle,
-                fetchAvatar: controller.fetchAvatar
-            )
-            .accessibilityHidden(true)
-            
-            if let account {
-                VStack(alignment: .leading) {
-                    controller.displayNameLabel(account, .title2, 24)
-                        .lineLimit(1)
-                    
-                    Text(verbatim: "@\(account.acct)")
-                        .font(.body.weight(.light))
-                        .foregroundColor(.secondary)
-                        .lineLimit(1)
-                }
-            }
-            
-            Spacer()
-        }
-    }
-}

Packages/ComposeUI/Sources/ComposeUI/Views/EmojiTextField.swift

@@ -1,137 +0,0 @@
-//
-//  EmojiTextField.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 3/5/23.
-//
-
-import SwiftUI
-
-struct EmojiTextField: UIViewRepresentable {
-    typealias UIViewType = UITextField
-    
-    @EnvironmentObject private var controller: ComposeController
-    @Environment(\.colorScheme) private var colorScheme
-    
-    @Binding var text: String
-    let placeholder: String
-    let maxLength: Int?
-    let becomeFirstResponder: Binding<Bool>?
-    let focusNextView: Binding<Bool>?
-    
-    init(text: Binding<String>, placeholder: String, maxLength: Int?, becomeFirstResponder: Binding<Bool>? = nil, focusNextView: Binding<Bool>? = nil) {
-        self._text = text
-        self.placeholder = placeholder
-        self.maxLength = maxLength
-        self.becomeFirstResponder = becomeFirstResponder
-        self.focusNextView = focusNextView
-    }
-    
-    func makeUIView(context: Context) -> UITextField {
-        let view = UITextField()
-        view.borderStyle = .roundedRect
-        view.font = .preferredFont(forTextStyle: .body)
-        view.adjustsFontForContentSizeCategory = true
-        view.attributedPlaceholder = NSAttributedString(string: placeholder, attributes: [
-            .foregroundColor: UIColor.secondaryLabel,
-        ])
-        
-        context.coordinator.textField = view
-        
-        view.delegate = context.coordinator
-        view.addTarget(context.coordinator, action: #selector(Coordinator.didChange(_:)), for: .editingChanged)
-        view.addTarget(context.coordinator, action: #selector(Coordinator.returnKeyPressed), for: .primaryActionTriggered)
-        
-        // otherwise when the text gets too wide it starts expanding the ComposeView
-        view.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
-        
-        return view
-    }
-    
-    func updateUIView(_ uiView: UITextField, context: Context) {
-        if text != uiView.text {
-            uiView.text = text
-        }
-        
-        context.coordinator.text = $text
-        context.coordinator.maxLength = maxLength
-        context.coordinator.focusNextView = focusNextView
-        
-        uiView.backgroundColor = colorScheme == .dark ? UIColor(controller.config.fillColor) : .secondarySystemBackground
-        
-        if becomeFirstResponder?.wrappedValue == true {
-            DispatchQueue.main.async {
-                uiView.becomeFirstResponder()
-                becomeFirstResponder!.wrappedValue = false
-            }
-        }
-    }
-    
-    func makeCoordinator() -> Coordinator {
-        Coordinator(controller: controller, text: $text, focusNextView: focusNextView)
-    }
-    
-    class Coordinator: NSObject, UITextFieldDelegate, ComposeInput {
-        let controller: ComposeController
-        var text: Binding<String>
-        var focusNextView: Binding<Bool>?
-        var maxLength: Int?
-        
-        @Published var autocompleteState: AutocompleteState?
-        var autocompleteStatePublisher: Published<AutocompleteState?>.Publisher { $autocompleteState }
-        
-        weak var textField: UITextField?
-        
-        init(controller: ComposeController, text: Binding<String>, focusNextView: Binding<Bool>?, maxLength: Int? = nil) {
-            self.controller = controller
-            self.text = text
-            self.focusNextView = focusNextView
-            self.maxLength = maxLength
-        }
-        
-        @objc func didChange(_ textField: UITextField) {
-            text.wrappedValue = textField.text ?? ""
-        }
-        
-        @objc func returnKeyPressed() {
-            focusNextView?.wrappedValue = true
-        }
-        
-        func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
-            if let maxLength {
-                return ((textField.text ?? "") as NSString).replacingCharacters(in: range, with: string).count <= maxLength
-            } else {
-                return true
-            }
-        }
-        
-        func textFieldDidBeginEditing(_ textField: UITextField) {
-            controller.currentInput = self
-            autocompleteState = textField.updateAutocompleteState(permittedModes: .emojis)
-        }
-        
-        func textFieldDidEndEditing(_ textField: UITextField) {
-            controller.currentInput = nil
-            autocompleteState = textField.updateAutocompleteState(permittedModes: .emojis)
-        }
-        
-        func textFieldDidChangeSelection(_ textField: UITextField) {
-            autocompleteState = textField.updateAutocompleteState(permittedModes: .emojis)
-        }
-        
-        // MARK: ComposeInput
-        
-        var toolbarElements: [ToolbarElement] { [.emojiPicker] }
-        
-        func applyFormat(_ format: StatusFormat) {
-        }
-        
-        func beginAutocompletingEmoji() {
-            textField?.insertText(":")
-        }
-        
-        func autocomplete(with string: String) {
-            textField?.autocomplete(with: string, permittedModes: .emojis, autocompleteState: &autocompleteState)
-        }
-    }
-}

Packages/ComposeUI/Sources/ComposeUI/Views/HeaderView.swift

@@ -1,34 +0,0 @@
-//
-//  HeaderView.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 3/4/23.
-//
-
-import SwiftUI
-import Pachyderm
-import InstanceFeatures
-
-struct HeaderView: View {
-    @EnvironmentObject private var controller: ComposeController
-    @EnvironmentObject private var draft: Draft
-    @EnvironmentObject private var instanceFeatures: InstanceFeatures
-    
-    private var charsRemaining: Int { controller.charactersRemaining }
-    
-    var body: some View {
-        HStack(alignment: .top) {
-            CurrentAccountView(account: controller.currentAccount)
-                .accessibilitySortPriority(1)
-            
-            Spacer()
-            
-            Text(verbatim: charsRemaining.description)
-                .foregroundColor(charsRemaining < 0 ? .red : .secondary)
-                .font(Font.body.monospacedDigit())
-                .accessibility(label: Text(charsRemaining < 0 ? "\(-charsRemaining) characters too many" : "\(charsRemaining) characters remaining"))
-                // this should come first, so VO users can back to it from the main compose text view
-                .accessibilitySortPriority(0)
-        }.frame(height: 50)
-    }
-}

Packages/ComposeUI/Sources/ComposeUI/Views/MainTextView.swift

@@ -1,293 +0,0 @@
-//
-//  MainTextView.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 3/6/23.
-//
-
-import SwiftUI
-
-struct MainTextView: View {
-    @EnvironmentObject private var controller: ComposeController
-    @EnvironmentObject private var draft: Draft
-    @Environment(\.colorScheme) private var colorScheme
-    @ScaledMetric private var fontSize = 20
-    
-    @State private var hasFirstAppeared = false
-    @State private var height: CGFloat?
-    private let minHeight: CGFloat = 150
-    private var effectiveHeight: CGFloat { height ?? minHeight }
-    
-    var config: ComposeUIConfig {
-        controller.config
-    }
-    
-    var body: some View {
-        ZStack(alignment: .topLeading) {
-            colorScheme == .dark ? config.fillColor : Color(uiColor: .secondarySystemBackground)
-            
-            if draft.text.isEmpty {
-                ControllerView(controller: { PlaceholderController() })
-                    .font(.system(size: fontSize))
-                    .foregroundColor(.secondary)
-                    .offset(x: 4, y: 8)
-                    .accessibilityHidden(true)
-            }
-            
-            MainWrappedTextViewRepresentable(text: $draft.text, becomeFirstResponder: $controller.mainComposeTextViewBecomeFirstResponder, textDidChange: textDidChange)
-        }
-        .frame(height: effectiveHeight)
-        .onAppear(perform: becomeFirstResponderOnFirstAppearance)
-    }
-    
-    private func becomeFirstResponderOnFirstAppearance() {
-        if !hasFirstAppeared {
-            hasFirstAppeared = true
-            controller.mainComposeTextViewBecomeFirstResponder = true
-        }
-    }
-    
-    private func textDidChange(textView: UITextView) {
-        height = max(textView.contentSize.height, minHeight)
-    }
-}
-
-fileprivate struct MainWrappedTextViewRepresentable: UIViewRepresentable {
-    typealias UIViewType = UITextView
-    
-    @Binding var text: String
-    @Binding var becomeFirstResponder: Bool
-    let textDidChange: (UITextView) -> Void
-    
-    @EnvironmentObject private var controller: ComposeController
-    @Environment(\.isEnabled) private var isEnabled: Bool
-    
-    func makeUIView(context: Context) -> UITextView {
-        let textView = WrappedTextView(composeController: controller)
-        context.coordinator.textView = textView
-        textView.delegate = context.coordinator
-        textView.isEditable = true
-        textView.backgroundColor = .clear
-        textView.font = UIFontMetrics.default.scaledFont(for: .systemFont(ofSize: 20))
-        textView.adjustsFontForContentSizeCategory = true
-        textView.textContainer.lineBreakMode = .byWordWrapping
-        return textView
-    }
-    
-    func updateUIView(_ uiView: UITextView, context: Context) {
-        if text != uiView.text {
-            context.coordinator.skipNextSelectionChangedAutocompleteUpdate = true
-            uiView.text = text
-        }
-        
-        uiView.isEditable = isEnabled
-        uiView.keyboardType = controller.config.useTwitterKeyboard ? .twitter : .default
-        
-        context.coordinator.text = $text
-        
-        // wait until the next runloop iteration so that SwiftUI view updates have finished and
-        // the text view knows its new content size
-        DispatchQueue.main.async {
-            textDidChange(uiView)
-            
-            if becomeFirstResponder {
-                // calling becomeFirstResponder during the SwiftUI update causes a crash on iOS 13
-                uiView.becomeFirstResponder()
-                // can't update @State vars during the SwiftUI update
-                becomeFirstResponder = false
-            }
-        }
-    }
-    
-    func makeCoordinator() -> Coordinator {
-        Coordinator(controller: controller, text: $text, textDidChange: textDidChange)
-    }
-    
-    class WrappedTextView: UITextView {
-        private let formattingActions = [#selector(toggleBoldface(_:)), #selector(toggleItalics(_:))]
-        private let composeController: ComposeController
-        
-        init(composeController: ComposeController) {
-            self.composeController = composeController
-            super.init(frame: .zero, textContainer: nil)
-        }
-        
-        required init?(coder: NSCoder) {
-            fatalError()
-        }
-        
-        override func canPerformAction(_ action: Selector, withSender sender: Any?) -> Bool {
-            if formattingActions.contains(action) {
-                return composeController.config.contentType != .plain
-            }
-            return super.canPerformAction(action, withSender: sender)
-        }
-        
-        override func toggleBoldface(_ sender: Any?) {
-            (delegate as! Coordinator).applyFormat(.bold)
-        }
-        
-        override func toggleItalics(_ sender: Any?) {
-            (delegate as! Coordinator).applyFormat(.italics)
-        }
-        
-        override func validate(_ command: UICommand) {
-            super.validate(command)
-            
-            if formattingActions.contains(command.action),
-               composeController.config.contentType != .plain {
-                command.attributes.remove(.disabled)
-            }
-        }
-        
-        override func paste(_ sender: Any?) {
-            // we deliberately exclude the other CompositionAttachment readable type identifiers, because that's too overzealous with the conversion
-            // and things like URLs end up pasting as attachments
-            if UIPasteboard.general.contains(pasteboardTypes: UIImage.readableTypeIdentifiersForItemProvider) {
-                composeController.paste(itemProviders: UIPasteboard.general.itemProviders)
-            } else {
-                super.paste(sender)
-            }
-        }
-    }
-    
-    class Coordinator: NSObject, UITextViewDelegate, ComposeInput, TextViewCaretScrolling {
-        weak var textView: UITextView?
-        
-        let controller: ComposeController
-        var text: Binding<String>
-        let textDidChange: (UITextView) -> Void
-        
-        var caretScrollPositionAnimator: UIViewPropertyAnimator?
-        
-        @Published var autocompleteState: AutocompleteState?
-        var autocompleteStatePublisher: Published<AutocompleteState?>.Publisher { $autocompleteState }
-        var skipNextSelectionChangedAutocompleteUpdate = false
-        
-        init(controller: ComposeController, text: Binding<String>, textDidChange: @escaping (UITextView) -> Void) {
-            self.controller = controller
-            self.text = text
-            self.textDidChange = textDidChange
-            
-            super.init()
-            
-            NotificationCenter.default.addObserver(self, selector: #selector(keyboardDidShow), name: UIResponder.keyboardDidShowNotification, object: nil)
-        }
-        
-        @objc private func keyboardDidShow() {
-            guard let textView,
-                  textView.isFirstResponder else {
-                return
-            }
-            ensureCursorVisible(textView: textView)
-        }
-        
-        // MARK: UITextViewDelegate
-        
-        func textViewDidChange(_ textView: UITextView) {
-            text.wrappedValue = textView.text
-            textDidChange(textView)
-            
-            ensureCursorVisible(textView: textView)
-        }
-        
-        func textViewDidBeginEditing(_ textView: UITextView) {
-            controller.currentInput = self
-            updateAutocompleteState()
-        }
-        
-        func textViewDidEndEditing(_ textView: UITextView) {
-            controller.currentInput = nil
-            updateAutocompleteState()
-        }
-        
-        func textViewDidChangeSelection(_ textView: UITextView) {
-            if skipNextSelectionChangedAutocompleteUpdate {
-                skipNextSelectionChangedAutocompleteUpdate = false
-            } else {
-                updateAutocompleteState()
-            }
-        }
-        
-        func textView(_ textView: UITextView, editMenuForTextIn range: NSRange, suggestedActions: [UIMenuElement]) -> UIMenu? {
-            var actions = suggestedActions
-            if controller.config.contentType != .plain,
-               let index = suggestedActions.firstIndex(where: { ($0 as? UIMenu)?.identifier.rawValue == "com.apple.menu.format" }) {
-                if range.length > 0 {
-                    let formatMenu = suggestedActions[index] as! UIMenu
-                    let newFormatMenu = formatMenu.replacingChildren(StatusFormat.allCases.map { fmt in
-                        var image: UIImage?
-                        if let imageName = fmt.imageName {
-                            image = UIImage(systemName: imageName)
-                        }
-                        return UIAction(title: fmt.accessibilityLabel, image: image) { [weak self] _ in
-                            self?.applyFormat(fmt)
-                        }
-                    })
-                    actions[index] = newFormatMenu
-                } else {
-                    actions.remove(at: index)
-                }
-            }
-            if range.length == 0 {
-                actions.append(UIAction(title: "Insert Emoji", image: UIImage(systemName: "face.smiling"), handler: { [weak self] _ in
-                    self?.controller.shouldEmojiAutocompletionBeginExpanded = true
-                    self?.beginAutocompletingEmoji()
-                }))
-            }
-            return UIMenu(children: actions)
-        }
-        
-        // MARK: ComposeInput
-        
-        var toolbarElements: [ToolbarElement] {
-            [.emojiPicker, .formattingButtons]
-        }
-        
-        func autocomplete(with string: String) {
-            textView?.autocomplete(with: string, permittedModes: .all, autocompleteState: &autocompleteState)
-        }
-        
-        func applyFormat(_ format: StatusFormat) {
-            guard let textView,
-                  textView.isFirstResponder,
-                  let insertionResult = format.insertionResult(for: controller.config.contentType) else {
-                return
-            }
-            
-            let currentSelectedRange = textView.selectedRange
-            if currentSelectedRange.length == 0 {
-                textView.insertText(insertionResult.prefix + insertionResult.suffix)
-                textView.selectedRange = NSRange(location: currentSelectedRange.location + insertionResult.insertionPoint, length: 0)
-            } else {
-                let start = textView.text.utf16.index(textView.text.utf16.startIndex, offsetBy: currentSelectedRange.lowerBound)
-                let end = textView.text.utf16.index(textView.text.utf16.startIndex, offsetBy: currentSelectedRange.upperBound)
-                let selectedText = textView.text.utf16[start..<end]
-                textView.insertText(insertionResult.prefix + String(Substring(selectedText)) + insertionResult.suffix)
-                textView.selectedRange = NSRange(location: currentSelectedRange.location + insertionResult.insertionPoint, length: currentSelectedRange.length)
-            }
-        }
-        
-        func beginAutocompletingEmoji() {
-            guard let textView else {
-                return
-            }
-            var insertSpace = false
-            if let text = textView.text,
-               textView.selectedRange.upperBound > 0 {
-                let characterBeforeCursorIndex = text.utf16.index(before: text.utf16.index(text.startIndex, offsetBy: textView.selectedRange.upperBound))
-                insertSpace = !text[characterBeforeCursorIndex].isWhitespace
-            }
-            textView.insertText((insertSpace ? " " : "") + ":")
-        }
-        
-        private func updateAutocompleteState() {
-            guard let textView else {
-                autocompleteState = nil
-                return
-            }
-            autocompleteState = textView.updateAutocompleteState(permittedModes: .all)
-        }
-        
-    }
-}

Packages/ComposeUI/Sources/ComposeUI/Views/PollOptionView.swift

@@ -1,75 +0,0 @@
-//
-//  PollOptionView.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 3/25/23.
-//
-
-import SwiftUI
-
-struct PollOptionView: View {
-    @EnvironmentObject private var controller: PollController
-    @EnvironmentObject private var poll: Draft.Poll
-    @ObservedObject private var option: Draft.Poll.Option
-    let remove: () -> Void
-    
-    init(option: Draft.Poll.Option, remove: @escaping () -> Void) {
-        self.option = option
-        self.remove = remove
-    }
-    
-    private var optionIndex: Int {
-        poll.options.firstIndex(where: { $0.id == option.id }) ?? 0
-    }
-    
-    var body: some View {
-        HStack(spacing: 4) {
-            Checkbox(radiusFraction: poll.multiple ? 0.1 : 0.5, background: controller.parent.config.backgroundColor)
-                .animation(.default, value: poll.multiple)
-            
-            textField
-            
-            Button(action: remove) {
-                Image(systemName: "minus.circle.fill")
-            }
-            .accessibilityLabel("Remove option")
-            .buttonStyle(.plain)
-            .foregroundColor(poll.options.count == 1 ? .gray : .red)
-            .disabled(poll.options.count == 1)
-            .hoverEffect()
-        }
-    }
-    
-    private var textField: some View {
-        let placeholder = "Option \(optionIndex + 1)"
-        let maxLength = controller.parent.mastodonController.instanceFeatures.maxPollOptionChars
-        return EmojiTextField(text: $option.text, placeholder: placeholder, maxLength: maxLength)
-    }
-    
-    struct Checkbox: View {
-        private let radiusFraction: CGFloat
-        private let size: CGFloat = 20
-        private let innerSize: CGFloat
-        private let background: Color
-        
-        init(radiusFraction: CGFloat, background: Color) {
-            self.radiusFraction = radiusFraction
-            self.innerSize = self.size - 4
-            self.background = background
-        }
-        
-        var body: some View {
-            ZStack {
-                Rectangle()
-                    .foregroundColor(.gray)
-                    .frame(width: size, height: size)
-                    .cornerRadius(radiusFraction * size)
-                
-                Rectangle()
-                    .foregroundColor(background)
-                    .frame(width: innerSize, height: innerSize)
-                    .cornerRadius(radiusFraction * innerSize)
-            }
-        }
-    }
-}

Packages/ComposeUI/Sources/ComposeUI/Views/WrappedProgressView.swift

@@ -1,29 +0,0 @@
-//
-//  WrappedProgressView.swift
-//  Tusker
-//
-//  Created by Shadowfacts on 8/30/20.
-//  Copyright © 2020 Shadowfacts. All rights reserved.
-//
-
-import SwiftUI
-
-struct WrappedProgressView: UIViewRepresentable {
-    typealias UIViewType = UIProgressView
-    
-    let value: Int
-    let total: Int
-    
-    func makeUIView(context: Context) -> UIProgressView {
-        return UIProgressView(progressViewStyle: .bar)
-    }
-    
-    func updateUIView(_ uiView: UIProgressView, context: Context) {
-        if total > 0 {
-            let progress = Float(value) / Float(total)
-            uiView.setProgress(progress, animated: true)
-        } else {
-            uiView.setProgress(0, animated: true)
-        }
-    }
-}

Packages/ComposeUI/Tests/ComposeUITests/FuzzyMatcherTests.swift

@@ -1,25 +0,0 @@
-//
-//  FuzzyMatcherTests.swift
-//  ComposeUITests
-//
-//  Created by Shadowfacts on 10/11/20.
-//  Copyright © 2020 Shadowfacts. All rights reserved.
-//
-
-import XCTest
-@testable import ComposeUI
-
-class FuzzyMatcherTests: XCTestCase {
-
-    func testExample() throws {
-        XCTAssertEqual(FuzzyMatcher.match(pattern: "foo", str: "foo").score, 6)
-        XCTAssertEqual(FuzzyMatcher.match(pattern: "foo", str: "faoao").score, 4)
-        XCTAssertEqual(FuzzyMatcher.match(pattern: "foo", str: "aaa").score, -6)
-        
-        XCTAssertEqual(FuzzyMatcher.match(pattern: "bar", str: "baz").score, 2)
-        XCTAssertEqual(FuzzyMatcher.match(pattern: "bar", str: "bur").score, 1)
-        
-        XCTAssertGreaterThan(FuzzyMatcher.match(pattern: "sir", str: "sir").score, FuzzyMatcher.match(pattern: "sir", str: "georgespolitzer").score)
-    }
-
-}

Packages/InstanceFeatures/.gitignore

@@ -1,9 +0,0 @@
-.DS_Store
-/.build
-/Packages
-/*.xcodeproj
-xcuserdata/
-DerivedData/
-.swiftpm/config/registries.json
-.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
-.netrc

Packages/InstanceFeatures/Package.resolved

@@ -1,23 +0,0 @@
-{
-  "pins" : [
-    {
-      "identity" : "swift-system",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-system.git",
-      "state" : {
-        "revision" : "025bcb1165deab2e20d4eaba79967ce73013f496",
-        "version" : "1.2.1"
-      }
-    },
-    {
-      "identity" : "swift-url",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/karwa/swift-url.git",
-      "state" : {
-        "branch" : "main",
-        "revision" : "220f6ab9d8a7e0742f85eb9f21b745942e001ae6"
-      }
-    }
-  ],
-  "version" : 2
-}

Packages/InstanceFeatures/Package.swift

@@ -1,31 +0,0 @@
-// swift-tools-version: 5.7
-// The swift-tools-version declares the minimum version of Swift required to build this package.
-
-import PackageDescription
-
-let package = Package(
-    name: "InstanceFeatures",
-    platforms: [
-        .iOS(.v15),
-    ],
-    products: [
-        // Products define the executables and libraries a package produces, and make them visible to other packages.
-        .library(
-            name: "InstanceFeatures",
-            targets: ["InstanceFeatures"]),
-    ],
-    dependencies: [
-        // Dependencies declare other packages that this package depends on.
-        .package(path: "../Pachyderm"),
-    ],
-    targets: [
-        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
-        // Targets can depend on other targets in this package, and on products in packages this package depends on.
-        .target(
-            name: "InstanceFeatures",
-            dependencies: ["Pachyderm"]),
-        .testTarget(
-            name: "InstanceFeaturesTests",
-            dependencies: ["InstanceFeatures"]),
-    ]
-)

Packages/InstanceFeatures/README.md

@@ -1,3 +0,0 @@
-# InstanceFeatures
-
-A description of this package.

Packages/Pachyderm/Sources/Pachyderm/Client.swift

@@ -139,14 +139,13 @@ public class Client {
         }
     }
     
-    public func getAccessToken(authorizationCode: String, redirectURI: String, scopes: [Scope], completion: @escaping Callback<LoginSettings>) {
+    public func getAccessToken(authorizationCode: String, redirectURI: String, completion: @escaping Callback<LoginSettings>) {
         let request = Request<LoginSettings>(method: .post, path: "/oauth/token", body: ParametersBody([
                 "client_id" => clientID,
                 "client_secret" => clientSecret,
                 "grant_type" => "authorization_code",
                 "code" => authorizationCode,
-                "redirect_uri" => redirectURI,
-                "scope" => scopes.scopeString,
+                "redirect_uri" => redirectURI
             ]))
         run(request) { result in
             defer { completion(result) }
@@ -384,7 +383,7 @@ public class Client {
                                     media: [Attachment]? = nil,
                                     sensitive: Bool? = nil,
                                     spoilerText: String? = nil,
-                                    visibility: Visibility? = nil,
+                                    visibility: Status.Visibility? = nil,
                                     language: String? = nil,
                                     pollOptions: [String]? = nil,
                                     pollExpiresIn: Int? = nil,

Packages/Pachyderm/Sources/Pachyderm/Model/Hashtag.swift

@@ -64,6 +64,6 @@ extension Hashtag: Equatable, Hashable {
     }
     
     public func hash(into hasher: inout Hasher) {
-        hasher.combine(name)
+        hasher.combine(url)
     }
 }

Packages/Pachyderm/Sources/Pachyderm/Model/Protocols/AccountProtocol.swift

@@ -9,6 +9,7 @@
 import Foundation
 
 public protocol AccountProtocol {
+    associatedtype Account: AccountProtocol
     
     var id: String { get }
     var username: String { get }
@@ -26,7 +27,7 @@ public protocol AccountProtocol {
     var moved: Bool? { get }
     var bot: Bool? { get }
 
-    var movedTo: Self? { get }
+    var movedTo: Account? { get }
     var emojis: [Emoji] { get }
     var fields: [Pachyderm.Account.Field] { get }
 }

Packages/Pachyderm/Sources/Pachyderm/Model/Protocols/RelationshipProtocol.swift

@@ -1,21 +0,0 @@
-//
-//  RelationshipProtocol.swift
-//  Pachyderm
-//
-//  Created by Shadowfacts on 3/26/23.
-//
-
-import Foundation
-
-public protocol RelationshipProtocol {
-    var accountID: String { get }
-    var following: Bool { get }
-    var followedBy: Bool { get }
-    var blocking: Bool { get }
-    var muting: Bool { get }
-    var mutingNotifications: Bool { get }
-    var followRequested: Bool { get }
-    var domainBlocking: Bool { get }
-    var showingReblogs: Bool { get }
-    var endorsed: Bool { get }
-}

Packages/Pachyderm/Sources/Pachyderm/Model/Protocols/StatusProtocol.swift

@@ -25,7 +25,7 @@ public protocol StatusProtocol {
 //    var favourited: Bool { get }
     var sensitive: Bool { get }
     var spoilerText: String { get }
-    var visibility: Visibility { get }
+    var visibility: Pachyderm.Status.Visibility { get }
     var applicationName: String? { get }
     var pinned: Bool? { get }
     var bookmarked: Bool? { get }

Packages/Pachyderm/Sources/Pachyderm/Model/Relationship.swift

@@ -8,8 +8,8 @@
 
 import Foundation
 
-public struct Relationship: RelationshipProtocol, Decodable, Sendable {
-    public let accountID: String
+public struct Relationship: Decodable, Sendable {
+    public let id: String
     public let following: Bool
     public let followedBy: Bool
     public let blocking: Bool
@@ -18,21 +18,7 @@ public struct Relationship: RelationshipProtocol, Decodable, Sendable {
     public let followRequested: Bool
     public let domainBlocking: Bool
     public let showingReblogs: Bool
-    public let endorsed: Bool
-    
-    public init(from decoder: Decoder) throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        self.accountID = try container.decode(String.self, forKey: .id)
-        self.following = try container.decode(Bool.self, forKey: .following)
-        self.followedBy = try container.decode(Bool.self, forKey: .followedBy)
-        self.blocking = try container.decode(Bool.self, forKey: .blocking)
-        self.muting = try container.decode(Bool.self, forKey: .muting)
-        self.mutingNotifications = try container.decode(Bool.self, forKey: .mutingNotifications)
-        self.followRequested = try container.decode(Bool.self, forKey: .followRequested)
-        self.domainBlocking = try container.decode(Bool.self, forKey: .domainBlocking)
-        self.showingReblogs = try container.decode(Bool.self, forKey: .showingReblogs)
-        self.endorsed = try container.decodeIfPresent(Bool.self, forKey: .endorsed) ?? false
-    }
+    public let endorsed: Bool?
     
     private enum CodingKeys: String, CodingKey {
         case id

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

@@ -63,7 +63,7 @@ public final class Status: StatusProtocol, Decodable, Sendable {
         self.muted = try container.decodeIfPresent(Bool.self, forKey: .muted)
         self.sensitive = try container.decode(Bool.self, forKey: .sensitive)
         self.spoilerText = try container.decode(String.self, forKey: .spoilerText)
-        if let visibility = try? container.decode(Visibility.self, forKey: .visibility) {
+        if let visibility = try? container.decode(Status.Visibility.self, forKey: .visibility) {
             self.visibility = visibility
             self.localOnly = try container.decodeIfPresent(Bool.self, forKey: .localOnly)
         } else if let s = try? container.decode(String.self, forKey: .visibility),
@@ -187,4 +187,13 @@ public final class Status: StatusProtocol, Decodable, Sendable {
     }
 }
 
+extension Status {
+    public enum Visibility: String, Codable, CaseIterable, Sendable {
+        case `public`
+        case unlisted
+        case `private`
+        case direct
+    }
+}
+
 extension Status: Identifiable {}

Packages/Pachyderm/Sources/Pachyderm/Request/Endpoint.swift

@@ -33,13 +33,8 @@ public struct Endpoint: ExpressibleByStringInterpolation, CustomStringConvertibl
             switch $0 {
             case .literal(let s):
                 return s
-            #if DEBUG
-            case .interpolated(let s):
-                return s
-            #else
             case .interpolated(_):
                 return "<redacted>"
-            #endif
             }
         }.joined(separator: "")
     }

Packages/Pachyderm/Sources/Pachyderm/Utilities/CharacterCounter.swift

@@ -1,25 +1,24 @@
 //
 //  CharacterCounter.swift
-//  ComposeUI
+//  Pachyderm
 //
 //  Created by Shadowfacts on 9/29/18.
 //  Copyright © 2018 Shadowfacts. All rights reserved.
 //
 
 import Foundation
-import InstanceFeatures
 
 public struct CharacterCounter {
     
-    private static let linkDetector = try! NSDataDetector(types: NSTextCheckingResult.CheckingType.link.rawValue)
-    private static let mention = try! NSRegularExpression(pattern: "(@[a-z0-9_]+)(?:@[a-z0-9\\-\\.]+[a-z0-9]+)?", options: .caseInsensitive)
+    static let linkDetector = try! NSDataDetector(types: NSTextCheckingResult.CheckingType.link.rawValue)
+    static let mention = try! NSRegularExpression(pattern: "(@[a-z0-9_]+)(?:@[a-z0-9\\-\\.]+[a-z0-9]+)?", options: .caseInsensitive)
     
-    public static func count(text: String, for instanceFeatures: InstanceFeatures) -> Int {
+    public static func count(text: String, for instance: Instance? = nil) -> Int {
         let mentionsRemoved = removeMentions(in: text)
         var count = mentionsRemoved.count
         for match in linkDetector.matches(in: mentionsRemoved, options: [], range: NSRange(location: 0, length: mentionsRemoved.utf16.count)) {
             count -= match.range.length
-            count += instanceFeatures.charsReservedPerURL
+            count += instance?.configuration?.statuses.charactersReservedPerURL ?? 23 // default Mastodon link length
         }
         return count
     }

Packages/TuskerComponents/.gitignore

@@ -1,9 +0,0 @@
-.DS_Store
-/.build
-/Packages
-/*.xcodeproj
-xcuserdata/
-DerivedData/
-.swiftpm/config/registries.json
-.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
-.netrc

Packages/TuskerComponents/Package.swift

@@ -1,31 +0,0 @@
-// swift-tools-version: 5.7
-// The swift-tools-version declares the minimum version of Swift required to build this package.
-
-import PackageDescription
-
-let package = Package(
-    name: "TuskerComponents",
-    platforms: [
-        .iOS(.v15),
-    ],
-    products: [
-        // Products define the executables and libraries a package produces, and make them visible to other packages.
-        .library(
-            name: "TuskerComponents",
-            targets: ["TuskerComponents"]),
-    ],
-    dependencies: [
-        // Dependencies declare other packages that this package depends on.
-        // .package(url: /* package url */, from: "1.0.0"),
-    ],
-    targets: [
-        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
-        // Targets can depend on other targets in this package, and on products in packages this package depends on.
-        .target(
-            name: "TuskerComponents",
-            dependencies: []),
-        .testTarget(
-            name: "TuskerComponentsTests",
-            dependencies: ["TuskerComponents"]),
-    ]
-)

Packages/TuskerComponents/README.md

@@ -1,3 +0,0 @@
-# TuskerComponents
-
-A description of this package.

Packages/TuskerComponents/Sources/TuskerComponents/AbbreviatedTimeAgoFormatStyle.swift

@@ -1,70 +0,0 @@
-//
-//  AbbreviatedTimeAgoFormatStyle.swift
-//  
-//
-//  Created by Shadowfacts on 4/9/23.
-//
-
-import Foundation
-
-public struct AbbreviatedTimeAgoFormatStyle: FormatStyle {
-    public typealias FormatInput = Date
-    public typealias FormatOutput = String
-    
-    public func format(_ value: Date) -> String {
-        let (amount, component) = timeAgo(value: value)
-        
-        switch component {
-        case .year:
-            return "\(amount)y"
-        case .month:
-            return "\(amount)mo"
-        case .weekOfYear:
-            return "\(amount)w"
-        case .day:
-            return "\(amount)d"
-        case .hour:
-            return "\(amount)h"
-        case .minute:
-            return "\(amount)m"
-        case .second:
-            if amount >= 3 {
-                return "\(amount)s"
-            } else {
-                return "Now"
-            }
-        default:
-            fatalError("Unexpected component: \(component)")
-        }
-    }
-    
-    private static let unitFlags = Set<Calendar.Component>([.second, .minute, .hour, .day, .weekOfYear, .month, .year])
-    
-    private func timeAgo(value: Date) -> (Int, Calendar.Component) {
-        let calendar = NSCalendar.current
-        let components = calendar.dateComponents(Self.unitFlags, from: value, to: Date())
-        
-        if components.year! >= 1 {
-            return (components.year!, .year)
-        } else if components.month! >= 1 {
-            return (components.month!, .month)
-        } else if components.weekOfYear! >= 1 {
-            return (components.weekOfYear!, .weekOfYear)
-        } else if components.day! >= 1 {
-            return (components.day!, .day)
-        } else if components.hour! >= 1 {
-            return (components.hour!, .hour)
-        } else if components.minute! >= 1 {
-            return (components.minute!, .minute)
-        } else {
-            return (components.second!, .second)
-        }
-    }
-
-}
-
-public extension FormatStyle where Self == AbbreviatedTimeAgoFormatStyle {
-    static var abbreviatedTimeAgo: Self {
-        Self()
-    }
-}

Packages/TuskerComponents/Sources/TuskerComponents/AvatarImageView.swift

@@ -1,65 +0,0 @@
-//
-//  AvatarImageView.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 3/4/23.
-//
-
-import SwiftUI
-
-public struct AvatarImageView: View {
-    public typealias FetchAvatar = (URL) async -> UIImage?
-    
-    let url: URL?
-    let size: CGFloat
-    let style: Style
-    let fetchAvatar: FetchAvatar
-    @State private var image: UIImage?
-    
-    public init(url: URL?, size: CGFloat, style: Style, fetchAvatar: @escaping FetchAvatar) {
-        self.url = url
-        self.size = size
-        self.style = style
-        self.fetchAvatar = fetchAvatar
-    }
-    
-    public var body: some View {
-        imageView
-            .resizable()
-            .frame(width: size, height: size)
-            .cornerRadius(style.cornerRadiusFraction * size)
-            .task {
-                if let url {
-                    image = await fetchAvatar(url)
-                }
-            }
-            // tell swiftui that this view has changed (and therefore the task needs to re-run) when the url changes
-            .id(url)
-        
-    }
-    
-    private var imageView: Image {
-        if let image {
-            return Image(uiImage: image)
-        } else {
-            return placeholder
-        }
-    }
-    
-    private var placeholder: Image {
-        Image(systemName: style == .roundRect ? "person.crop.square" : "person.crop.circle")
-    }
-    
-    public enum Style: Equatable {
-        case roundRect, circle
-        
-        var cornerRadiusFraction: CGFloat {
-            switch self {
-            case .roundRect:
-                return 0.1
-            case .circle:
-                return 0.5
-            }
-        }
-    }
-}

Packages/UserAccounts/.gitignore

@@ -1,9 +0,0 @@
-.DS_Store
-/.build
-/Packages
-/*.xcodeproj
-xcuserdata/
-DerivedData/
-.swiftpm/config/registries.json
-.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
-.netrc

Packages/UserAccounts/Package.resolved

@@ -1,23 +0,0 @@
-{
-  "pins" : [
-    {
-      "identity" : "swift-system",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-system.git",
-      "state" : {
-        "revision" : "025bcb1165deab2e20d4eaba79967ce73013f496",
-        "version" : "1.2.1"
-      }
-    },
-    {
-      "identity" : "swift-url",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/karwa/swift-url.git",
-      "state" : {
-        "branch" : "main",
-        "revision" : "220f6ab9d8a7e0742f85eb9f21b745942e001ae6"
-      }
-    }
-  ],
-  "version" : 2
-}

Packages/UserAccounts/Package.swift

@@ -1,31 +0,0 @@
-// swift-tools-version: 5.7
-// The swift-tools-version declares the minimum version of Swift required to build this package.
-
-import PackageDescription
-
-let package = Package(
-    name: "UserAccounts",
-    platforms: [
-        .iOS(.v15),
-    ],
-    products: [
-        // Products define the executables and libraries a package produces, and make them visible to other packages.
-        .library(
-            name: "UserAccounts",
-            targets: ["UserAccounts"]),
-    ],
-    dependencies: [
-        // Dependencies declare other packages that this package depends on.
-        .package(path: "../Pachyderm"),
-    ],
-    targets: [
-        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
-        // Targets can depend on other targets in this package, and on products in packages this package depends on.
-        .target(
-            name: "UserAccounts",
-            dependencies: ["Pachyderm"]),
-        .testTarget(
-            name: "UserAccountsTests",
-            dependencies: ["UserAccounts"]),
-    ]
-)

Packages/UserAccounts/README.md

@@ -1,3 +0,0 @@
-# UserAccounts
-
-A description of this package.

Packages/UserAccounts/Sources/UserAccounts/UserAccountInfo.swift

@@ -1,80 +0,0 @@
-//
-//  UserAccountInfo.swift
-//  UserAccounts
-//
-//  Created by Shadowfacts on 3/5/23.
-//
-
-import Foundation
-import CryptoKit
-
-public struct UserAccountInfo: Equatable, Hashable {
-    public let id: String
-    public let instanceURL: URL
-    public let clientID: String
-    public let clientSecret: String
-    public private(set) var username: String!
-    public let accessToken: String
-    
-    fileprivate static let tempAccountID = "temp"
-    
-    static func id(instanceURL: URL, username: String?) -> String {
-        // We hash the instance host and username to form the account ID
-        // so that account IDs will match across devices, allowing for data syncing and handoff.
-        var hasher = SHA256()
-        hasher.update(data: instanceURL.host!.data(using: .utf8)!)
-        if let username {
-            hasher.update(data: username.data(using: .utf8)!)
-        }
-        return Data(hasher.finalize()).base64EncodedString()
-    }
-    
-    /// Only to be used for temporary MastodonController needed to fetch own account info and create final UserAccountInfo with real username
-    public init(tempInstanceURL instanceURL: URL, clientID: String, clientSecret: String, accessToken: String) {
-        self.id = UserAccountInfo.tempAccountID
-        self.instanceURL = instanceURL
-        self.clientID = clientID
-        self.clientSecret = clientSecret
-        self.accessToken = accessToken
-    }
-    
-    init(instanceURL: URL, clientID: String, clientSecret: String, username: String? = nil, accessToken: String) {
-        self.id = UserAccountInfo.id(instanceURL: instanceURL, username: username)
-        self.instanceURL = instanceURL
-        self.clientID = clientID
-        self.clientSecret = clientSecret
-        self.username = username
-        self.accessToken = accessToken
-    }
-    
-    init?(userDefaultsDict dict: [String: String]) {
-        guard let id = dict["id"],
-            let instanceURL = dict["instanceURL"],
-            let url = URL(string: instanceURL),
-            let clientID = dict["clientID"],
-            let secret = dict["clientSecret"],
-            let accessToken = dict["accessToken"] else {
-                return nil
-        }
-        self.id = id
-        self.instanceURL = url
-        self.clientID = clientID
-        self.clientSecret = secret
-        self.username = dict["username"]
-        self.accessToken = accessToken
-    }
-    
-    /// A filename-safe string for this account
-    public var persistenceKey: String {
-        // slashes are not allowed in the persistent store coordinator name
-        id.replacingOccurrences(of: "/", with: "_")
-    }
-    
-    public func hash(into hasher: inout Hasher) {
-        hasher.combine(id)
-    }
-    
-    public static func ==(lhs: UserAccountInfo, rhs: UserAccountInfo) -> Bool {
-        return lhs.id == rhs.id
-    }
-}

Tusker.xcodeproj/project.pbxproj

@@ -40,6 +40,7 @@
 		D6114E0D27F7FEB30080E273 /* TrendingStatusesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6114E0C27F7FEB30080E273 /* TrendingStatusesViewController.swift */; };
 		D6114E1127F899B30080E273 /* TrendingLinksViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6114E1027F899B30080E273 /* TrendingLinksViewController.swift */; };
 		D6114E1327F89B440080E273 /* TrendingLinkTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6114E1227F89B440080E273 /* TrendingLinkTableViewCell.swift */; };
+		D6114E1727F8BB210080E273 /* VersionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6114E1627F8BB210080E273 /* VersionTests.swift */; };
 		D61A45E628DC0F2F002BE511 /* ConfirmLoadMoreCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61A45E528DC0F2F002BE511 /* ConfirmLoadMoreCollectionViewCell.swift */; };
 		D61A45E828DF477D002BE511 /* LoadingCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61A45E728DF477D002BE511 /* LoadingCollectionViewCell.swift */; };
 		D61A45EA28DF51EE002BE511 /* TimelineLikeCollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61A45E928DF51EE002BE511 /* TimelineLikeCollectionViewController.swift */; };
@@ -81,28 +82,42 @@
 		D620483623D38075008A63EF /* ContentTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D620483523D38075008A63EF /* ContentTextView.swift */; };
 		D620483823D38190008A63EF /* StatusContentTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D620483723D38190008A63EF /* StatusContentTextView.swift */; };
 		D621733328F1D5ED004C7DB1 /* ReblogService.swift in Sources */ = {isa = PBXBuildFile; fileRef = D621733228F1D5ED004C7DB1 /* ReblogService.swift */; };
+		D622757424EDF1CD00B82A16 /* ComposeAttachmentsList.swift in Sources */ = {isa = PBXBuildFile; fileRef = D622757324EDF1CD00B82A16 /* ComposeAttachmentsList.swift */; };
+		D622757824EE133700B82A16 /* ComposeAssetPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = D622757724EE133700B82A16 /* ComposeAssetPicker.swift */; };
+		D622757A24EE21D900B82A16 /* ComposeAttachmentRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = D622757924EE21D900B82A16 /* ComposeAttachmentRow.swift */; };
+		D62275A024F1677200B82A16 /* ComposeHostingController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D622759F24F1677200B82A16 /* ComposeHostingController.swift */; };
+		D62275A624F1C81800B82A16 /* ComposeReplyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62275A524F1C81800B82A16 /* ComposeReplyView.swift */; };
 		D62275A824F1CA2800B82A16 /* ComposeReplyContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62275A724F1CA2800B82A16 /* ComposeReplyContentView.swift */; };
+		D62275AA24F1E01C00B82A16 /* ComposeTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62275A924F1E01C00B82A16 /* ComposeTextView.swift */; };
 		D623A53D2635F5590095BD04 /* StatusPollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D623A53C2635F5590095BD04 /* StatusPollView.swift */; };
 		D623A5412635FB3C0095BD04 /* PollOptionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D623A5402635FB3C0095BD04 /* PollOptionView.swift */; };
 		D623A543263634100095BD04 /* PollOptionCheckboxView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D623A542263634100095BD04 /* PollOptionCheckboxView.swift */; };
 		D625E4822588262A0074BB2B /* DraggableTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D625E4812588262A0074BB2B /* DraggableTableViewCell.swift */; };
 		D6262C9A28D01C4B00390C1F /* LoadingTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6262C9928D01C4B00390C1F /* LoadingTableViewCell.swift */; };
+		D626493523BD94CE00612E6E /* CompositionAttachmentData.swift in Sources */ = {isa = PBXBuildFile; fileRef = D626493423BD94CE00612E6E /* CompositionAttachmentData.swift */; };
+		D626493823C0FD0000612E6E /* AllPhotosTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D626493623C0FD0000612E6E /* AllPhotosTableViewCell.swift */; };
+		D626493923C0FD0000612E6E /* AllPhotosTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D626493723C0FD0000612E6E /* AllPhotosTableViewCell.xib */; };
+		D626493C23C1000300612E6E /* AlbumTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D626493A23C1000300612E6E /* AlbumTableViewCell.swift */; };
+		D626493D23C1000300612E6E /* AlbumTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D626493B23C1000300612E6E /* AlbumTableViewCell.xib */; };
+		D626493F23C101C500612E6E /* AlbumAssetCollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D626493E23C101C500612E6E /* AlbumAssetCollectionViewController.swift */; };
 		D627943223A5466600D38C68 /* SelectableTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D627943123A5466600D38C68 /* SelectableTableViewCell.swift */; };
 		D627943B23A55BA600D38C68 /* NavigableTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D627943A23A55BA600D38C68 /* NavigableTableViewCell.swift */; };
 		D627944723A6AC9300D38C68 /* BasicTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D627944623A6AC9300D38C68 /* BasicTableViewCell.xib */; };
 		D627944D23A9A03D00D38C68 /* ListTimelineViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D627944C23A9A03D00D38C68 /* ListTimelineViewController.swift */; };
 		D627944F23A9C99800D38C68 /* EditListAccountsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D627944E23A9C99800D38C68 /* EditListAccountsViewController.swift */; };
+		D627FF76217E923E00CC0648 /* DraftsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = D627FF75217E923E00CC0648 /* DraftsManager.swift */; };
+		D6285B5321EA708700FE4B39 /* StatusFormat.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6285B5221EA708700FE4B39 /* StatusFormat.swift */; };
 		D6289E84217B795D0003D1D7 /* LargeImageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D6289E83217B795D0003D1D7 /* LargeImageViewController.xib */; };
 		D62D2422217AA7E1005076CC /* UserActivityManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62D2421217AA7E1005076CC /* UserActivityManager.swift */; };
 		D62D2424217ABF3F005076CC /* NSUserActivity+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62D2423217ABF3F005076CC /* NSUserActivity+Extensions.swift */; };
 		D62D2426217ABF63005076CC /* UserActivityType.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62D2425217ABF63005076CC /* UserActivityType.swift */; };
 		D62E9985279CA23900C26176 /* URLSession+Development.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62E9984279CA23900C26176 /* URLSession+Development.swift */; };
 		D62E9987279D094F00C26176 /* StatusMetaIndicatorsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62E9986279D094F00C26176 /* StatusMetaIndicatorsView.swift */; };
+		D62E9989279DB2D100C26176 /* InstanceFeatures.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62E9988279DB2D100C26176 /* InstanceFeatures.swift */; };
 		D62FF04823D7CDD700909D6E /* AttributedStringHelperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62FF04723D7CDD700909D6E /* AttributedStringHelperTests.swift */; };
 		D6311C5025B3765B00B27539 /* ImageDataCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6311C4F25B3765B00B27539 /* ImageDataCache.swift */; };
 		D6333B372137838300CE884A /* AttributedString+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6333B362137838300CE884A /* AttributedString+Helpers.swift */; };
 		D6333B792139AEFD00CE884A /* Date+TimeAgo.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6333B782139AEFD00CE884A /* Date+TimeAgo.swift */; };
-		D635237129B78A7D009ED5E7 /* TuskerComponents in Frameworks */ = {isa = PBXBuildFile; productRef = D635237029B78A7D009ED5E7 /* TuskerComponents */; };
 		D63661C02381C144004B9E16 /* PreferencesNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D63661BF2381C144004B9E16 /* PreferencesNavigationController.swift */; };
 		D6370B9C24421FF30092A7FF /* Tusker.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = D6370B9A24421FF30092A7FF /* Tusker.xcdatamodeld */; };
 		D63CC702290EC0B8000E19DE /* Sentry in Frameworks */ = {isa = PBXBuildFile; productRef = D63CC701290EC0B8000E19DE /* Sentry */; };
@@ -110,6 +125,7 @@
 		D63CC7102911F1E4000E19DE /* UIScrollView+Top.swift in Sources */ = {isa = PBXBuildFile; fileRef = D63CC70F2911F1E4000E19DE /* UIScrollView+Top.swift */; };
 		D63CC7122911F57C000E19DE /* StatusBarTappableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D63CC7112911F57C000E19DE /* StatusBarTappableViewController.swift */; };
 		D63D8DF42850FE7A008D95E1 /* ViewTags.swift in Sources */ = {isa = PBXBuildFile; fileRef = D63D8DF32850FE7A008D95E1 /* ViewTags.swift */; };
+		D63F9C6E241D2D85004C03CF /* CompositionAttachment.swift in Sources */ = {isa = PBXBuildFile; fileRef = D63F9C6D241D2D85004C03CF /* CompositionAttachment.swift */; };
 		D640D76922BAF5E6004FBE69 /* DomainBlocks.plist in Resources */ = {isa = PBXBuildFile; fileRef = D640D76822BAF5E6004FBE69 /* DomainBlocks.plist */; };
 		D6412B0324AFF6A600F5412E /* TabBarScrollableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6412B0224AFF6A600F5412E /* TabBarScrollableViewController.swift */; };
 		D6412B0924B0291E00F5412E /* MyProfileViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6412B0824B0291E00F5412E /* MyProfileViewController.swift */; };
@@ -123,8 +139,10 @@
 		D64AAE9126C80DC600FC57FB /* ToastView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64AAE9026C80DC600FC57FB /* ToastView.swift */; };
 		D64AAE9526C88C5000FC57FB /* ToastableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64AAE9426C88C5000FC57FB /* ToastableViewController.swift */; };
 		D64AAE9726C88DC400FC57FB /* ToastConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64AAE9626C88DC400FC57FB /* ToastConfiguration.swift */; };
+		D64BC18623C1253A000D0238 /* AssetPreviewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64BC18523C1253A000D0238 /* AssetPreviewViewController.swift */; };
 		D64BC18F23C18B9D000D0238 /* FollowRequestNotificationTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64BC18D23C18B9D000D0238 /* FollowRequestNotificationTableViewCell.swift */; };
 		D64BC19023C18B9D000D0238 /* FollowRequestNotificationTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D64BC18E23C18B9D000D0238 /* FollowRequestNotificationTableViewCell.xib */; };
+		D64D0AAD2128D88B005A6F37 /* LocalData.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64D0AAC2128D88B005A6F37 /* LocalData.swift */; };
 		D64D0AB12128D9AE005A6F37 /* OnboardingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64D0AB02128D9AE005A6F37 /* OnboardingViewController.swift */; };
 		D64D8CA92463B494006B0BAA /* MultiThreadDictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64D8CA82463B494006B0BAA /* MultiThreadDictionary.swift */; };
 		D651C5B42915B00400236EF6 /* ProfileFieldsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D651C5B32915B00400236EF6 /* ProfileFieldsView.swift */; };
@@ -152,9 +170,11 @@
 		D6620ACE2511A0ED00312CA0 /* StatusStateResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6620ACD2511A0ED00312CA0 /* StatusStateResolver.swift */; };
 		D662AEEF263A3B880082A153 /* PollFinishedTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D662AEED263A3B880082A153 /* PollFinishedTableViewCell.swift */; };
 		D662AEF0263A3B880082A153 /* PollFinishedTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D662AEEE263A3B880082A153 /* PollFinishedTableViewCell.xib */; };
+		D662AEF2263A4BE10082A153 /* ComposePollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D662AEF1263A4BE10082A153 /* ComposePollView.swift */; };
 		D663626221360B1900C9CBA2 /* Preferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = D663626121360B1900C9CBA2 /* Preferences.swift */; };
 		D663626421360D2300C9CBA2 /* AvatarStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D663626321360D2300C9CBA2 /* AvatarStyle.swift */; };
 		D663626C21361C6700C9CBA2 /* Account+Preferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = D663626B21361C6700C9CBA2 /* Account+Preferences.swift */; };
+		D66362752137068A00C9CBA2 /* Visibility+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = D66362742137068A00C9CBA2 /* Visibility+Helpers.swift */; };
 		D6674AEA23341F7600E8DF94 /* AppShortcutItems.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6674AE923341F7600E8DF94 /* AppShortcutItems.swift */; };
 		D6676CA527A8D0020052936B /* WebURLFoundationExtras in Frameworks */ = {isa = PBXBuildFile; productRef = D6676CA427A8D0020052936B /* WebURLFoundationExtras */; };
 		D667E5E12134937B0057A976 /* TimelineStatusTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D667E5E02134937B0057A976 /* TimelineStatusTableViewCell.xib */; };
@@ -162,7 +182,12 @@
 		D667E5F82135C3040057A976 /* Mastodon+Equatable.swift in Sources */ = {isa = PBXBuildFile; fileRef = D667E5F72135C3040057A976 /* Mastodon+Equatable.swift */; };
 		D66A77BB233838DC0058F1EC /* UIFont+Traits.swift in Sources */ = {isa = PBXBuildFile; fileRef = D66A77BA233838DC0058F1EC /* UIFont+Traits.swift */; };
 		D66C900B28DAB7FD00217BF2 /* TimelineViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D66C900A28DAB7FD00217BF2 /* TimelineViewController.swift */; };
+		D673ACCE2919E74200D6F8B0 /* MenuPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = D673ACCD2919E74200D6F8B0 /* MenuPicker.swift */; };
 		D674A50927F9128D00BA03AC /* Pachyderm in Frameworks */ = {isa = PBXBuildFile; productRef = D674A50827F9128D00BA03AC /* Pachyderm */; };
+		D677284824ECBCB100C732D3 /* ComposeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D677284724ECBCB100C732D3 /* ComposeView.swift */; };
+		D677284A24ECBDF400C732D3 /* ComposeCurrentAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = D677284924ECBDF400C732D3 /* ComposeCurrentAccount.swift */; };
+		D677284C24ECBE9100C732D3 /* ComposeAvatarImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D677284B24ECBE9100C732D3 /* ComposeAvatarImageView.swift */; };
+		D677284E24ECC01D00C732D3 /* Draft.swift in Sources */ = {isa = PBXBuildFile; fileRef = D677284D24ECC01D00C732D3 /* Draft.swift */; };
 		D67895BC24671E6D00D4CD9E /* PKDrawing+Render.swift in Sources */ = {isa = PBXBuildFile; fileRef = D67895BB24671E6D00D4CD9E /* PKDrawing+Render.swift */; };
 		D67895C0246870DE00D4CD9E /* LocalAccountAvatarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D67895BF246870DE00D4CD9E /* LocalAccountAvatarView.swift */; };
 		D67B506D250B291200FAECFB /* BlurHashDecode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D67B506C250B291200FAECFB /* BlurHashDecode.swift */; };
@@ -187,6 +212,7 @@
 		D68A76EC295369A8001DA1B3 /* AboutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D68A76EB295369A8001DA1B3 /* AboutView.swift */; };
 		D68A76EE295369C7001DA1B3 /* AcknowledgementsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D68A76ED295369C7001DA1B3 /* AcknowledgementsView.swift */; };
 		D68A76F129539116001DA1B3 /* FlipView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D68A76F029539116001DA1B3 /* FlipView.swift */; };
+		D68ACE5D279B1ABA001CE8EB /* AssetPickerControlCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D68ACE5C279B1ABA001CE8EB /* AssetPickerControlCollectionViewCell.swift */; };
 		D68C2AE325869BAB00548EFF /* AuxiliarySceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D68C2AE225869BAB00548EFF /* AuxiliarySceneDelegate.swift */; };
 		D68E525B24A3D77E0054355A /* TuskerRootViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D68E525A24A3D77E0054355A /* TuskerRootViewController.swift */; };
 		D68E525D24A3E8F00054355A /* InlineTrendsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D68E525C24A3E8F00054355A /* InlineTrendsViewController.swift */; };
@@ -226,6 +252,7 @@
 		D6A4DCCC2553667800D9DE31 /* FastAccountSwitcherViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A4DCCA2553667800D9DE31 /* FastAccountSwitcherViewController.swift */; };
 		D6A4DCCD2553667800D9DE31 /* FastAccountSwitcherViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D6A4DCCB2553667800D9DE31 /* FastAccountSwitcherViewController.xib */; };
 		D6A4DCE525537C7A00D9DE31 /* FastSwitchingAccountView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A4DCE425537C7A00D9DE31 /* FastSwitchingAccountView.swift */; };
+		D6A57408255C53EC00674551 /* ComposeTextViewCaretScrolling.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A57407255C53EC00674551 /* ComposeTextViewCaretScrolling.swift */; };
 		D6A5BB2B23BAEF61003BF21D /* APIMocks.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A5BB2A23BAEF61003BF21D /* APIMocks.swift */; };
 		D6A5BB2D23BBA9C4003BF21D /* MyProfileTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A5BB2C23BBA9C4003BF21D /* MyProfileTests.swift */; };
 		D6A5BB2F23BBAC97003BF21D /* DelegatingResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A5BB2E23BBAC97003BF21D /* DelegatingResponse.swift */; };
@@ -241,7 +268,11 @@
 		D6ADB6F028ED1F25009924AB /* CachedImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6ADB6EF28ED1F25009924AB /* CachedImageView.swift */; };
 		D6AEBB3E2321638100E5038B /* UIActivity+Types.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6AEBB3D2321638100E5038B /* UIActivity+Types.swift */; };
 		D6AEBB432321685E00E5038B /* OpenInSafariActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6AEBB422321685E00E5038B /* OpenInSafariActivity.swift */; };
-		D6B0026E29B5248800C70BE2 /* UserAccounts in Frameworks */ = {isa = PBXBuildFile; productRef = D6B0026D29B5248800C70BE2 /* UserAccounts */; };
+		D6B053A223BD2C0600A066FA /* AssetPickerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6B053A123BD2C0600A066FA /* AssetPickerViewController.swift */; };
+		D6B053A423BD2C8100A066FA /* AssetCollectionsListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6B053A323BD2C8100A066FA /* AssetCollectionsListViewController.swift */; };
+		D6B053A623BD2D0C00A066FA /* AssetCollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6B053A523BD2D0C00A066FA /* AssetCollectionViewController.swift */; };
+		D6B053AB23BD2F1400A066FA /* AssetCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6B053A923BD2F1400A066FA /* AssetCollectionViewCell.swift */; };
+		D6B053AC23BD2F1400A066FA /* AssetCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D6B053AA23BD2F1400A066FA /* AssetCollectionViewCell.xib */; };
 		D6B17255254F88B800128392 /* OppositeCollapseKeywordsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6B17254254F88B800128392 /* OppositeCollapseKeywordsView.swift */; };
 		D6B22A0F2560D52D004D82EF /* TabbedPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6B22A0E2560D52D004D82EF /* TabbedPageViewController.swift */; };
 		D6B30E09254BAF63009CAEE5 /* ImageGrayscalifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6B30E08254BAF63009CAEE5 /* ImageGrayscalifier.swift */; };
@@ -260,11 +291,12 @@
 		D6BC9DB5232D4CE3002CA326 /* NotificationsMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6BC9DB4232D4CE3002CA326 /* NotificationsMode.swift */; };
 		D6BC9DD7232D7811002CA326 /* TimelinesPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6BC9DD6232D7811002CA326 /* TimelinesPageViewController.swift */; };
 		D6BC9DDA232D8BE5002CA326 /* SearchResultsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6BC9DD9232D8BE5002CA326 /* SearchResultsViewController.swift */; };
-		D6BD395929B64426005FFD2B /* ComposeUI in Frameworks */ = {isa = PBXBuildFile; productRef = D6BD395829B64426005FFD2B /* ComposeUI */; };
-		D6BD395B29B64441005FFD2B /* ComposeHostingController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6BD395A29B64441005FFD2B /* ComposeHostingController.swift */; };
 		D6BEA245291A0EDE002F4D01 /* Duckable in Frameworks */ = {isa = PBXBuildFile; productRef = D6BEA244291A0EDE002F4D01 /* Duckable */; };
 		D6BEA247291A0F2D002F4D01 /* Duckable+Root.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6BEA246291A0F2D002F4D01 /* Duckable+Root.swift */; };
+		D6BEA249291C6118002F4D01 /* DraftsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6BEA248291C6118002F4D01 /* DraftsView.swift */; };
+		D6BEA24B291C6A2B002F4D01 /* AlertWithData.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6BEA24A291C6A2B002F4D01 /* AlertWithData.swift */; };
 		D6BED174212667E900F02DA0 /* TimelineStatusTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6BED173212667E900F02DA0 /* TimelineStatusTableViewCell.swift */; };
+		D6C143DA253510F4007DC240 /* ComposeEmojiTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C143D9253510F4007DC240 /* ComposeEmojiTextField.swift */; };
 		D6C1B2082545D1EC00DAAA66 /* StatusCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C1B2072545D1EC00DAAA66 /* StatusCardView.swift */; };
 		D6C3F4F5298ED0890009FCFF /* LocalPredicateStatusesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C3F4F4298ED0890009FCFF /* LocalPredicateStatusesViewController.swift */; };
 		D6C3F4F7298ED7F70009FCFF /* FavoritesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C3F4F6298ED7F70009FCFF /* FavoritesViewController.swift */; };
@@ -279,6 +311,7 @@
 		D6C82B4125C5BB7E0017F1E6 /* ExploreViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C82B4025C5BB7E0017F1E6 /* ExploreViewController.swift */; };
 		D6C94D872139E62700CB5196 /* LargeImageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C94D862139E62700CB5196 /* LargeImageViewController.swift */; };
 		D6C94D892139E6EC00CB5196 /* AttachmentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C94D882139E6EC00CB5196 /* AttachmentView.swift */; };
+		D6C99FCB24FADC91005C74D3 /* MainComposeTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C99FCA24FADC91005C74D3 /* MainComposeTextView.swift */; };
 		D6CA6A92249FAD8900AD45C1 /* AudioSessionHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6CA6A91249FAD8900AD45C1 /* AudioSessionHelper.swift */; };
 		D6CA6A94249FADE700AD45C1 /* GalleryPlayerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6CA6A93249FADE700AD45C1 /* GalleryPlayerViewController.swift */; };
 		D6CA8CDA2962231F0050C433 /* ArrayUniqueTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6CA8CD92962231F0050C433 /* ArrayUniqueTests.swift */; };
@@ -288,6 +321,7 @@
 		D6D12B58292D5B2C00D528E1 /* StatusActionAccountListCollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6D12B57292D5B2C00D528E1 /* StatusActionAccountListCollectionViewController.swift */; };
 		D6D12B5A292D684600D528E1 /* AccountListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6D12B59292D684600D528E1 /* AccountListViewController.swift */; };
 		D6D3F4C424FDB6B700EC4A6A /* View+ConditionalModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6D3F4C324FDB6B700EC4A6A /* View+ConditionalModifier.swift */; };
+		D6D3FDE224F46A8D00FF50A5 /* ComposeUIState.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6D3FDE124F46A8D00FF50A5 /* ComposeUIState.swift */; };
 		D6D4CC94250DB86A00FCCF8D /* ComposeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6D4CC93250DB86A00FCCF8D /* ComposeTests.swift */; };
 		D6D4DDD0212518A000E1C4BB /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6D4DDCF212518A000E1C4BB /* AppDelegate.swift */; };
 		D6D4DDD7212518A200E1C4BB /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D6D4DDD6212518A200E1C4BB /* Assets.xcassets */; };
@@ -299,6 +333,8 @@
 		D6D94955298963A900C59229 /* Colors.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6D94954298963A900C59229 /* Colors.swift */; };
 		D6D9498D298CBB4000C59229 /* TrendingStatusCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6D9498C298CBB4000C59229 /* TrendingStatusCollectionViewCell.swift */; };
 		D6D9498F298EB79400C59229 /* CopyableLable.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6D9498E298EB79400C59229 /* CopyableLable.swift */; };
+		D6DD2A3F273C1F4900386A6C /* ComposeAttachmentImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6DD2A3E273C1F4900386A6C /* ComposeAttachmentImage.swift */; };
+		D6DD2A45273D6C5700386A6C /* GIFImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6DD2A44273D6C5700386A6C /* GIFImageView.swift */; };
 		D6DD353D22F28CD000A9563A /* ContentWarningCopyMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6DD353C22F28CD000A9563A /* ContentWarningCopyMode.swift */; };
 		D6DD353F22F502EC00A9563A /* Preferences+Notification.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6DD353E22F502EC00A9563A /* Preferences+Notification.swift */; };
 		D6DD8FFD298495A8002AD3FD /* LogoutService.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6DD8FFC298495A8002AD3FD /* LogoutService.swift */; };
@@ -313,6 +349,7 @@
 		D6E343B0265AAD6B00C4AA01 /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D6E343AE265AAD6B00C4AA01 /* MainInterface.storyboard */; };
 		D6E343B4265AAD6B00C4AA01 /* OpenInTusker.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = D6E343A8265AAD6B00C4AA01 /* OpenInTusker.appex */; platformFilter = ios; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		D6E343BA265AAD8C00C4AA01 /* Action.js in Resources */ = {isa = PBXBuildFile; fileRef = D6E343B9265AAD8C00C4AA01 /* Action.js */; };
+		D6E4267725327FB400C02E1C /* ComposeAutocompleteView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E4267625327FB400C02E1C /* ComposeAutocompleteView.swift */; };
 		D6E4269D2532A3E100C02E1C /* FuzzyMatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E4269C2532A3E100C02E1C /* FuzzyMatcher.swift */; };
 		D6E426AD25334DA500C02E1C /* FuzzyMatcherTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E426AC25334DA500C02E1C /* FuzzyMatcherTests.swift */; };
 		D6E426B325337C7000C02E1C /* CustomEmojiImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E426B225337C7000C02E1C /* CustomEmojiImageView.swift */; };
@@ -321,6 +358,7 @@
 		D6E77D0B286D426E00D8B732 /* TrendingLinkCardCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E77D0A286D426E00D8B732 /* TrendingLinkCardCollectionViewCell.swift */; };
 		D6E77D0D286E6B7300D8B732 /* TrendingLinkCardCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D6E77D0C286E6B7300D8B732 /* TrendingLinkCardCollectionViewCell.xib */; };
 		D6E77D0F286F773900D8B732 /* SplitNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E77D0E286F773900D8B732 /* SplitNavigationController.swift */; };
+		D6E9CDA8281A427800BBC98E /* PostService.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E9CDA7281A427800BBC98E /* PostService.swift */; };
 		D6EAE0DB2550CC8A002DB0AC /* FocusableTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6EAE0DA2550CC8A002DB0AC /* FocusableTextField.swift */; };
 		D6EBF01523C55C0900AE061B /* UIApplication+Scenes.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6EBF01423C55C0900AE061B /* UIApplication+Scenes.swift */; };
 		D6EBF01723C55E0D00AE061B /* UISceneSession+MastodonController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6EBF01623C55E0D00AE061B /* UISceneSession+MastodonController.swift */; };
@@ -329,13 +367,12 @@
 		D6F0B17524A3A1AA001E48C3 /* MainSidebarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6F0B17424A3A1AA001E48C3 /* MainSidebarViewController.swift */; };
 		D6F2E965249E8BFD005846BB /* IssueReporterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6F2E963249E8BFD005846BB /* IssueReporterViewController.swift */; };
 		D6F2E966249E8BFD005846BB /* IssueReporterViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D6F2E964249E8BFD005846BB /* IssueReporterViewController.xib */; };
-		D6F4D79429ECB0AF00351B87 /* UIBackgroundConfiguration+AppColors.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6F4D79329ECB0AF00351B87 /* UIBackgroundConfiguration+AppColors.swift */; };
 		D6F6A550291F058600F496A8 /* CreateListService.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6F6A54F291F058600F496A8 /* CreateListService.swift */; };
 		D6F6A552291F098700F496A8 /* RenameListService.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6F6A551291F098700F496A8 /* RenameListService.swift */; };
 		D6F6A554291F0D9600F496A8 /* DeleteListService.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6F6A553291F0D9600F496A8 /* DeleteListService.swift */; };
 		D6F6A557291F4F1600F496A8 /* MuteAccountView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6F6A556291F4F1600F496A8 /* MuteAccountView.swift */; };
+		D6F6A5592920676800F496A8 /* ComposeToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6F6A5582920676800F496A8 /* ComposeToolbar.swift */; };
 		D6F953F021251A2900CF0F2B /* MastodonController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6F953EF21251A2900CF0F2B /* MastodonController.swift */; };
-		D6FA94E129B52898006AAC51 /* InstanceFeatures in Frameworks */ = {isa = PBXBuildFile; productRef = D6FA94E029B52898006AAC51 /* InstanceFeatures */; };
 		D6FF9860255C717400845181 /* AccountSwitchingContainerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6FF985F255C717400845181 /* AccountSwitchingContainerViewController.swift */; };
 /* End PBXBuildFile section */
 
@@ -421,6 +458,7 @@
 		D6114E0C27F7FEB30080E273 /* TrendingStatusesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrendingStatusesViewController.swift; sourceTree = "<group>"; };
 		D6114E1027F899B30080E273 /* TrendingLinksViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrendingLinksViewController.swift; sourceTree = "<group>"; };
 		D6114E1227F89B440080E273 /* TrendingLinkTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrendingLinkTableViewCell.swift; sourceTree = "<group>"; };
+		D6114E1627F8BB210080E273 /* VersionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VersionTests.swift; sourceTree = "<group>"; };
 		D61A45E528DC0F2F002BE511 /* ConfirmLoadMoreCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfirmLoadMoreCollectionViewCell.swift; sourceTree = "<group>"; };
 		D61A45E728DF477D002BE511 /* LoadingCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingCollectionViewCell.swift; sourceTree = "<group>"; };
 		D61A45E928DF51EE002BE511 /* TimelineLikeCollectionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineLikeCollectionViewController.swift; sourceTree = "<group>"; };
@@ -461,23 +499,38 @@
 		D620483523D38075008A63EF /* ContentTextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentTextView.swift; sourceTree = "<group>"; };
 		D620483723D38190008A63EF /* StatusContentTextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusContentTextView.swift; sourceTree = "<group>"; };
 		D621733228F1D5ED004C7DB1 /* ReblogService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReblogService.swift; sourceTree = "<group>"; };
+		D622757324EDF1CD00B82A16 /* ComposeAttachmentsList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeAttachmentsList.swift; sourceTree = "<group>"; };
+		D622757724EE133700B82A16 /* ComposeAssetPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeAssetPicker.swift; sourceTree = "<group>"; };
+		D622757924EE21D900B82A16 /* ComposeAttachmentRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeAttachmentRow.swift; sourceTree = "<group>"; };
+		D622759F24F1677200B82A16 /* ComposeHostingController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeHostingController.swift; sourceTree = "<group>"; };
+		D62275A524F1C81800B82A16 /* ComposeReplyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeReplyView.swift; sourceTree = "<group>"; };
 		D62275A724F1CA2800B82A16 /* ComposeReplyContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeReplyContentView.swift; sourceTree = "<group>"; };
+		D62275A924F1E01C00B82A16 /* ComposeTextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeTextView.swift; sourceTree = "<group>"; };
 		D623A53C2635F5590095BD04 /* StatusPollView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusPollView.swift; sourceTree = "<group>"; };
 		D623A5402635FB3C0095BD04 /* PollOptionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PollOptionView.swift; sourceTree = "<group>"; };
 		D623A542263634100095BD04 /* PollOptionCheckboxView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PollOptionCheckboxView.swift; sourceTree = "<group>"; };
 		D625E4812588262A0074BB2B /* DraggableTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DraggableTableViewCell.swift; sourceTree = "<group>"; };
 		D6262C9928D01C4B00390C1F /* LoadingTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingTableViewCell.swift; sourceTree = "<group>"; };
+		D626493423BD94CE00612E6E /* CompositionAttachmentData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompositionAttachmentData.swift; sourceTree = "<group>"; };
+		D626493623C0FD0000612E6E /* AllPhotosTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AllPhotosTableViewCell.swift; sourceTree = "<group>"; };
+		D626493723C0FD0000612E6E /* AllPhotosTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AllPhotosTableViewCell.xib; sourceTree = "<group>"; };
+		D626493A23C1000300612E6E /* AlbumTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlbumTableViewCell.swift; sourceTree = "<group>"; };
+		D626493B23C1000300612E6E /* AlbumTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AlbumTableViewCell.xib; sourceTree = "<group>"; };
+		D626493E23C101C500612E6E /* AlbumAssetCollectionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlbumAssetCollectionViewController.swift; sourceTree = "<group>"; };
 		D627943123A5466600D38C68 /* SelectableTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectableTableViewCell.swift; sourceTree = "<group>"; };
 		D627943A23A55BA600D38C68 /* NavigableTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigableTableViewCell.swift; sourceTree = "<group>"; };
 		D627944623A6AC9300D38C68 /* BasicTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BasicTableViewCell.xib; sourceTree = "<group>"; };
 		D627944C23A9A03D00D38C68 /* ListTimelineViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListTimelineViewController.swift; sourceTree = "<group>"; };
 		D627944E23A9C99800D38C68 /* EditListAccountsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditListAccountsViewController.swift; sourceTree = "<group>"; };
+		D627FF75217E923E00CC0648 /* DraftsManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DraftsManager.swift; sourceTree = "<group>"; };
+		D6285B5221EA708700FE4B39 /* StatusFormat.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusFormat.swift; sourceTree = "<group>"; };
 		D6289E83217B795D0003D1D7 /* LargeImageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = LargeImageViewController.xib; sourceTree = "<group>"; };
 		D62D2421217AA7E1005076CC /* UserActivityManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserActivityManager.swift; sourceTree = "<group>"; };
 		D62D2423217ABF3F005076CC /* NSUserActivity+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSUserActivity+Extensions.swift"; sourceTree = "<group>"; };
 		D62D2425217ABF63005076CC /* UserActivityType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserActivityType.swift; sourceTree = "<group>"; };
 		D62E9984279CA23900C26176 /* URLSession+Development.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URLSession+Development.swift"; sourceTree = "<group>"; };
 		D62E9986279D094F00C26176 /* StatusMetaIndicatorsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusMetaIndicatorsView.swift; sourceTree = "<group>"; };
+		D62E9988279DB2D100C26176 /* InstanceFeatures.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InstanceFeatures.swift; sourceTree = "<group>"; };
 		D62FF04723D7CDD700909D6E /* AttributedStringHelperTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttributedStringHelperTests.swift; sourceTree = "<group>"; };
 		D6311C4F25B3765B00B27539 /* ImageDataCache.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageDataCache.swift; sourceTree = "<group>"; };
 		D6333B362137838300CE884A /* AttributedString+Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AttributedString+Helpers.swift"; sourceTree = "<group>"; };
@@ -489,6 +542,7 @@
 		D63CC70F2911F1E4000E19DE /* UIScrollView+Top.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIScrollView+Top.swift"; sourceTree = "<group>"; };
 		D63CC7112911F57C000E19DE /* StatusBarTappableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusBarTappableViewController.swift; sourceTree = "<group>"; };
 		D63D8DF32850FE7A008D95E1 /* ViewTags.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewTags.swift; sourceTree = "<group>"; };
+		D63F9C6D241D2D85004C03CF /* CompositionAttachment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompositionAttachment.swift; sourceTree = "<group>"; };
 		D640D76822BAF5E6004FBE69 /* DomainBlocks.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = DomainBlocks.plist; sourceTree = "<group>"; };
 		D6412B0224AFF6A600F5412E /* TabBarScrollableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabBarScrollableViewController.swift; sourceTree = "<group>"; };
 		D6412B0824B0291E00F5412E /* MyProfileViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyProfileViewController.swift; sourceTree = "<group>"; };
@@ -502,8 +556,10 @@
 		D64AAE9026C80DC600FC57FB /* ToastView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToastView.swift; sourceTree = "<group>"; };
 		D64AAE9426C88C5000FC57FB /* ToastableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToastableViewController.swift; sourceTree = "<group>"; };
 		D64AAE9626C88DC400FC57FB /* ToastConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToastConfiguration.swift; sourceTree = "<group>"; };
+		D64BC18523C1253A000D0238 /* AssetPreviewViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AssetPreviewViewController.swift; sourceTree = "<group>"; };
 		D64BC18D23C18B9D000D0238 /* FollowRequestNotificationTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FollowRequestNotificationTableViewCell.swift; sourceTree = "<group>"; };
 		D64BC18E23C18B9D000D0238 /* FollowRequestNotificationTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FollowRequestNotificationTableViewCell.xib; sourceTree = "<group>"; };
+		D64D0AAC2128D88B005A6F37 /* LocalData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalData.swift; sourceTree = "<group>"; };
 		D64D0AB02128D9AE005A6F37 /* OnboardingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingViewController.swift; sourceTree = "<group>"; };
 		D64D8CA82463B494006B0BAA /* MultiThreadDictionary.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultiThreadDictionary.swift; sourceTree = "<group>"; };
 		D651C5B32915B00400236EF6 /* ProfileFieldsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileFieldsView.swift; sourceTree = "<group>"; };
@@ -533,9 +589,11 @@
 		D6620ACD2511A0ED00312CA0 /* StatusStateResolver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusStateResolver.swift; sourceTree = "<group>"; };
 		D662AEED263A3B880082A153 /* PollFinishedTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PollFinishedTableViewCell.swift; sourceTree = "<group>"; };
 		D662AEEE263A3B880082A153 /* PollFinishedTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PollFinishedTableViewCell.xib; sourceTree = "<group>"; };
+		D662AEF1263A4BE10082A153 /* ComposePollView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposePollView.swift; sourceTree = "<group>"; };
 		D663626121360B1900C9CBA2 /* Preferences.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Preferences.swift; sourceTree = "<group>"; };
 		D663626321360D2300C9CBA2 /* AvatarStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AvatarStyle.swift; sourceTree = "<group>"; };
 		D663626B21361C6700C9CBA2 /* Account+Preferences.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Account+Preferences.swift"; sourceTree = "<group>"; };
+		D66362742137068A00C9CBA2 /* Visibility+Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Visibility+Helpers.swift"; sourceTree = "<group>"; };
 		D6674AE923341F7600E8DF94 /* AppShortcutItems.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppShortcutItems.swift; sourceTree = "<group>"; };
 		D667E5E02134937B0057A976 /* TimelineStatusTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TimelineStatusTableViewCell.xib; sourceTree = "<group>"; };
 		D667E5F02134D5050057A976 /* UIViewController+Delegates.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+Delegates.swift"; sourceTree = "<group>"; };
@@ -543,7 +601,12 @@
 		D66A77BA233838DC0058F1EC /* UIFont+Traits.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIFont+Traits.swift"; sourceTree = "<group>"; };
 		D66C900A28DAB7FD00217BF2 /* TimelineViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineViewController.swift; sourceTree = "<group>"; };
 		D671A6BE299DA96100A81FEA /* Tusker-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Tusker-Bridging-Header.h"; sourceTree = "<group>"; };
+		D673ACCD2919E74200D6F8B0 /* MenuPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuPicker.swift; sourceTree = "<group>"; };
 		D674A50727F910F300BA03AC /* Pachyderm */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = Pachyderm; path = Packages/Pachyderm; sourceTree = "<group>"; };
+		D677284724ECBCB100C732D3 /* ComposeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeView.swift; sourceTree = "<group>"; };
+		D677284924ECBDF400C732D3 /* ComposeCurrentAccount.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeCurrentAccount.swift; sourceTree = "<group>"; };
+		D677284B24ECBE9100C732D3 /* ComposeAvatarImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeAvatarImageView.swift; sourceTree = "<group>"; };
+		D677284D24ECC01D00C732D3 /* Draft.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Draft.swift; sourceTree = "<group>"; };
 		D67895BB24671E6D00D4CD9E /* PKDrawing+Render.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PKDrawing+Render.swift"; sourceTree = "<group>"; };
 		D67895BF246870DE00D4CD9E /* LocalAccountAvatarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalAccountAvatarView.swift; sourceTree = "<group>"; };
 		D67B506C250B291200FAECFB /* BlurHashDecode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlurHashDecode.swift; sourceTree = "<group>"; };
@@ -569,6 +632,7 @@
 		D68A76ED295369C7001DA1B3 /* AcknowledgementsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AcknowledgementsView.swift; sourceTree = "<group>"; };
 		D68A76F029539116001DA1B3 /* FlipView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlipView.swift; sourceTree = "<group>"; };
 		D68A76F22953915C001DA1B3 /* TTTKit */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = TTTKit; path = Packages/TTTKit; sourceTree = "<group>"; };
+		D68ACE5C279B1ABA001CE8EB /* AssetPickerControlCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AssetPickerControlCollectionViewCell.swift; sourceTree = "<group>"; };
 		D68C2AE225869BAB00548EFF /* AuxiliarySceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuxiliarySceneDelegate.swift; sourceTree = "<group>"; };
 		D68E525A24A3D77E0054355A /* TuskerRootViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TuskerRootViewController.swift; sourceTree = "<group>"; };
 		D68E525C24A3E8F00054355A /* InlineTrendsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InlineTrendsViewController.swift; sourceTree = "<group>"; };
@@ -608,6 +672,7 @@
 		D6A4DCCA2553667800D9DE31 /* FastAccountSwitcherViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FastAccountSwitcherViewController.swift; sourceTree = "<group>"; };
 		D6A4DCCB2553667800D9DE31 /* FastAccountSwitcherViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FastAccountSwitcherViewController.xib; sourceTree = "<group>"; };
 		D6A4DCE425537C7A00D9DE31 /* FastSwitchingAccountView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FastSwitchingAccountView.swift; sourceTree = "<group>"; };
+		D6A57407255C53EC00674551 /* ComposeTextViewCaretScrolling.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeTextViewCaretScrolling.swift; sourceTree = "<group>"; };
 		D6A5BB2A23BAEF61003BF21D /* APIMocks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIMocks.swift; sourceTree = "<group>"; };
 		D6A5BB2C23BBA9C4003BF21D /* MyProfileTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyProfileTests.swift; sourceTree = "<group>"; };
 		D6A5BB2E23BBAC97003BF21D /* DelegatingResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DelegatingResponse.swift; sourceTree = "<group>"; };
@@ -623,7 +688,11 @@
 		D6ADB6EF28ED1F25009924AB /* CachedImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CachedImageView.swift; sourceTree = "<group>"; };
 		D6AEBB3D2321638100E5038B /* UIActivity+Types.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIActivity+Types.swift"; sourceTree = "<group>"; };
 		D6AEBB422321685E00E5038B /* OpenInSafariActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenInSafariActivity.swift; sourceTree = "<group>"; };
-		D6B0026C29B5245400C70BE2 /* UserAccounts */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = UserAccounts; path = Packages/UserAccounts; sourceTree = "<group>"; };
+		D6B053A123BD2C0600A066FA /* AssetPickerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AssetPickerViewController.swift; sourceTree = "<group>"; };
+		D6B053A323BD2C8100A066FA /* AssetCollectionsListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AssetCollectionsListViewController.swift; sourceTree = "<group>"; };
+		D6B053A523BD2D0C00A066FA /* AssetCollectionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AssetCollectionViewController.swift; sourceTree = "<group>"; };
+		D6B053A923BD2F1400A066FA /* AssetCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AssetCollectionViewCell.swift; sourceTree = "<group>"; };
+		D6B053AA23BD2F1400A066FA /* AssetCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AssetCollectionViewCell.xib; sourceTree = "<group>"; };
 		D6B17254254F88B800128392 /* OppositeCollapseKeywordsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OppositeCollapseKeywordsView.swift; sourceTree = "<group>"; };
 		D6B22A0E2560D52D004D82EF /* TabbedPageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabbedPageViewController.swift; sourceTree = "<group>"; };
 		D6B30E08254BAF63009CAEE5 /* ImageGrayscalifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageGrayscalifier.swift; sourceTree = "<group>"; };
@@ -642,12 +711,12 @@
 		D6BC9DB4232D4CE3002CA326 /* NotificationsMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationsMode.swift; sourceTree = "<group>"; };
 		D6BC9DD6232D7811002CA326 /* TimelinesPageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelinesPageViewController.swift; sourceTree = "<group>"; };
 		D6BC9DD9232D8BE5002CA326 /* SearchResultsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchResultsViewController.swift; sourceTree = "<group>"; };
-		D6BD395729B6441F005FFD2B /* ComposeUI */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = ComposeUI; path = Packages/ComposeUI; sourceTree = "<group>"; };
-		D6BD395A29B64441005FFD2B /* ComposeHostingController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeHostingController.swift; sourceTree = "<group>"; };
-		D6BD395C29B789D5005FFD2B /* TuskerComponents */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = TuskerComponents; path = Packages/TuskerComponents; sourceTree = "<group>"; };
 		D6BEA243291A0C83002F4D01 /* Duckable */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = Duckable; path = Packages/Duckable; sourceTree = "<group>"; };
 		D6BEA246291A0F2D002F4D01 /* Duckable+Root.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Duckable+Root.swift"; sourceTree = "<group>"; };
+		D6BEA248291C6118002F4D01 /* DraftsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DraftsView.swift; sourceTree = "<group>"; };
+		D6BEA24A291C6A2B002F4D01 /* AlertWithData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlertWithData.swift; sourceTree = "<group>"; };
 		D6BED173212667E900F02DA0 /* TimelineStatusTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineStatusTableViewCell.swift; sourceTree = "<group>"; };
+		D6C143D9253510F4007DC240 /* ComposeEmojiTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeEmojiTextField.swift; sourceTree = "<group>"; };
 		D6C1B2072545D1EC00DAAA66 /* StatusCardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusCardView.swift; sourceTree = "<group>"; };
 		D6C3F4F4298ED0890009FCFF /* LocalPredicateStatusesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalPredicateStatusesViewController.swift; sourceTree = "<group>"; };
 		D6C3F4F6298ED7F70009FCFF /* FavoritesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FavoritesViewController.swift; sourceTree = "<group>"; };
@@ -662,6 +731,7 @@
 		D6C82B4025C5BB7E0017F1E6 /* ExploreViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExploreViewController.swift; sourceTree = "<group>"; };
 		D6C94D862139E62700CB5196 /* LargeImageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LargeImageViewController.swift; sourceTree = "<group>"; };
 		D6C94D882139E6EC00CB5196 /* AttachmentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttachmentView.swift; sourceTree = "<group>"; };
+		D6C99FCA24FADC91005C74D3 /* MainComposeTextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainComposeTextView.swift; sourceTree = "<group>"; };
 		D6CA6A91249FAD8900AD45C1 /* AudioSessionHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioSessionHelper.swift; sourceTree = "<group>"; };
 		D6CA6A93249FADE700AD45C1 /* GalleryPlayerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GalleryPlayerViewController.swift; sourceTree = "<group>"; };
 		D6CA8CD92962231F0050C433 /* ArrayUniqueTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrayUniqueTests.swift; sourceTree = "<group>"; };
@@ -671,6 +741,7 @@
 		D6D12B57292D5B2C00D528E1 /* StatusActionAccountListCollectionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusActionAccountListCollectionViewController.swift; sourceTree = "<group>"; };
 		D6D12B59292D684600D528E1 /* AccountListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountListViewController.swift; sourceTree = "<group>"; };
 		D6D3F4C324FDB6B700EC4A6A /* View+ConditionalModifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+ConditionalModifier.swift"; sourceTree = "<group>"; };
+		D6D3FDE124F46A8D00FF50A5 /* ComposeUIState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeUIState.swift; sourceTree = "<group>"; };
 		D6D4CC93250DB86A00FCCF8D /* ComposeTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeTests.swift; sourceTree = "<group>"; };
 		D6D4DDCC212518A000E1C4BB /* Tusker.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Tusker.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		D6D4DDCF212518A000E1C4BB /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -689,6 +760,8 @@
 		D6D94954298963A900C59229 /* Colors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Colors.swift; sourceTree = "<group>"; };
 		D6D9498C298CBB4000C59229 /* TrendingStatusCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrendingStatusCollectionViewCell.swift; sourceTree = "<group>"; };
 		D6D9498E298EB79400C59229 /* CopyableLable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CopyableLable.swift; sourceTree = "<group>"; };
+		D6DD2A3E273C1F4900386A6C /* ComposeAttachmentImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeAttachmentImage.swift; sourceTree = "<group>"; };
+		D6DD2A44273D6C5700386A6C /* GIFImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GIFImageView.swift; sourceTree = "<group>"; };
 		D6DD353C22F28CD000A9563A /* ContentWarningCopyMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentWarningCopyMode.swift; sourceTree = "<group>"; };
 		D6DD353E22F502EC00A9563A /* Preferences+Notification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Preferences+Notification.swift"; sourceTree = "<group>"; };
 		D6DD8FFC298495A8002AD3FD /* LogoutService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogoutService.swift; sourceTree = "<group>"; };
@@ -705,6 +778,7 @@
 		D6E343B1265AAD6B00C4AA01 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		D6E343B5265AAD6B00C4AA01 /* OpenInTusker.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = OpenInTusker.entitlements; sourceTree = "<group>"; };
 		D6E343B9265AAD8C00C4AA01 /* Action.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = Action.js; sourceTree = "<group>"; };
+		D6E4267625327FB400C02E1C /* ComposeAutocompleteView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeAutocompleteView.swift; sourceTree = "<group>"; };
 		D6E4269C2532A3E100C02E1C /* FuzzyMatcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FuzzyMatcher.swift; sourceTree = "<group>"; };
 		D6E426AC25334DA500C02E1C /* FuzzyMatcherTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FuzzyMatcherTests.swift; sourceTree = "<group>"; };
 		D6E426B225337C7000C02E1C /* CustomEmojiImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomEmojiImageView.swift; sourceTree = "<group>"; };
@@ -714,6 +788,7 @@
 		D6E77D0A286D426E00D8B732 /* TrendingLinkCardCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrendingLinkCardCollectionViewCell.swift; sourceTree = "<group>"; };
 		D6E77D0C286E6B7300D8B732 /* TrendingLinkCardCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TrendingLinkCardCollectionViewCell.xib; sourceTree = "<group>"; };
 		D6E77D0E286F773900D8B732 /* SplitNavigationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplitNavigationController.swift; sourceTree = "<group>"; };
+		D6E9CDA7281A427800BBC98E /* PostService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostService.swift; sourceTree = "<group>"; };
 		D6EAE0DA2550CC8A002DB0AC /* FocusableTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FocusableTextField.swift; sourceTree = "<group>"; };
 		D6EBF01423C55C0900AE061B /* UIApplication+Scenes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIApplication+Scenes.swift"; sourceTree = "<group>"; };
 		D6EBF01623C55E0D00AE061B /* UISceneSession+MastodonController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UISceneSession+MastodonController.swift"; sourceTree = "<group>"; };
@@ -722,13 +797,12 @@
 		D6F0B17424A3A1AA001E48C3 /* MainSidebarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainSidebarViewController.swift; sourceTree = "<group>"; };
 		D6F2E963249E8BFD005846BB /* IssueReporterViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IssueReporterViewController.swift; sourceTree = "<group>"; };
 		D6F2E964249E8BFD005846BB /* IssueReporterViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = IssueReporterViewController.xib; sourceTree = "<group>"; };
-		D6F4D79329ECB0AF00351B87 /* UIBackgroundConfiguration+AppColors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIBackgroundConfiguration+AppColors.swift"; sourceTree = "<group>"; };
 		D6F6A54F291F058600F496A8 /* CreateListService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateListService.swift; sourceTree = "<group>"; };
 		D6F6A551291F098700F496A8 /* RenameListService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RenameListService.swift; sourceTree = "<group>"; };
 		D6F6A553291F0D9600F496A8 /* DeleteListService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeleteListService.swift; sourceTree = "<group>"; };
 		D6F6A556291F4F1600F496A8 /* MuteAccountView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MuteAccountView.swift; sourceTree = "<group>"; };
+		D6F6A5582920676800F496A8 /* ComposeToolbar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeToolbar.swift; sourceTree = "<group>"; };
 		D6F953EF21251A2900CF0F2B /* MastodonController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MastodonController.swift; sourceTree = "<group>"; };
-		D6FA94DF29B52891006AAC51 /* InstanceFeatures */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = InstanceFeatures; path = Packages/InstanceFeatures; sourceTree = "<group>"; };
 		D6FF985F255C717400845181 /* AccountSwitchingContainerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountSwitchingContainerViewController.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -737,12 +811,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D6BD395929B64426005FFD2B /* ComposeUI in Frameworks */,
-				D6FA94E129B52898006AAC51 /* InstanceFeatures in Frameworks */,
-				D635237129B78A7D009ED5E7 /* TuskerComponents in Frameworks */,
 				D674A50927F9128D00BA03AC /* Pachyderm in Frameworks */,
 				D659F35E2953A212002D944A /* TTTKit in Frameworks */,
-				D6B0026E29B5248800C70BE2 /* UserAccounts in Frameworks */,
 				D60CFFDB24A290BA00D00083 /* SwiftSoup in Frameworks */,
 				D60088EF2980D8B5005B4D00 /* StoreKit.framework in Frameworks */,
 				D6552367289870790048A653 /* ScreenCorners in Frameworks */,
@@ -808,6 +878,11 @@
 		D61959D2241E846D00A37B8E /* Models */ = {
 			isa = PBXGroup;
 			children = (
+				D6285B5221EA708700FE4B39 /* StatusFormat.swift */,
+				D63F9C6D241D2D85004C03CF /* CompositionAttachment.swift */,
+				D626493423BD94CE00612E6E /* CompositionAttachmentData.swift */,
+				D677284D24ECC01D00C732D3 /* Draft.swift */,
+				D627FF75217E923E00CC0648 /* DraftsManager.swift */,
 				D61F75AE293AF50C00C0B37F /* EditedFilter.swift */,
 				D65B4B532971F71D00DABDFB /* EditedReport.swift */,
 				D600891A29848289005B4D00 /* PinnedTimeline.swift */,
@@ -849,6 +924,20 @@
 			path = Poll;
 			sourceTree = "<group>";
 		};
+		D626494023C122C800612E6E /* Asset Picker */ = {
+			isa = PBXGroup;
+			children = (
+				D6B053A923BD2F1400A066FA /* AssetCollectionViewCell.swift */,
+				D6B053AA23BD2F1400A066FA /* AssetCollectionViewCell.xib */,
+				D626493623C0FD0000612E6E /* AllPhotosTableViewCell.swift */,
+				D626493723C0FD0000612E6E /* AllPhotosTableViewCell.xib */,
+				D626493A23C1000300612E6E /* AlbumTableViewCell.swift */,
+				D626493B23C1000300612E6E /* AlbumTableViewCell.xib */,
+				D68ACE5C279B1ABA001CE8EB /* AssetPickerControlCollectionViewCell.swift */,
+			);
+			path = "Asset Picker";
+			sourceTree = "<group>";
+		};
 		D627943C23A5635D00D38C68 /* Explore */ = {
 			isa = PBXGroup;
 			children = (
@@ -944,13 +1033,14 @@
 			children = (
 				D65B4B89297879DE00DABDFB /* Account Follows */,
 				D6A3BC822321F69400FD64D5 /* Account List */,
+				D6B053A023BD2BED00A066FA /* Asset Picker */,
 				0411610522B457290030A9B7 /* Attachment Gallery */,
 				D641C787213DD862004B4513 /* Compose */,
 				D641C785213DD83B004B4513 /* Conversation */,
 				D6F2E960249E772F005846BB /* Crash Reporter */,
-				D61F759729384D4200C0B37F /* Customize Timelines */,
 				D627943C23A5635D00D38C68 /* Explore */,
 				D6A4DCC92553666600D9DE31 /* Fast Account Switcher */,
+				D61F759729384D4200C0B37F /* Customize Timelines */,
 				D641C788213DD86D004B4513 /* Large Image */,
 				D627944B23A9A02400D38C68 /* Lists */,
 				D627944823A6AD5100D38C68 /* Local Predicate Statuses List */,
@@ -1042,8 +1132,25 @@
 			isa = PBXGroup;
 			children = (
 				D68232F62464F4FD00325FB8 /* ComposeDrawingViewController.swift */,
+				D6D3FDE124F46A8D00FF50A5 /* ComposeUIState.swift */,
+				D622759F24F1677200B82A16 /* ComposeHostingController.swift */,
+				D677284724ECBCB100C732D3 /* ComposeView.swift */,
+				D677284924ECBDF400C732D3 /* ComposeCurrentAccount.swift */,
+				D677284B24ECBE9100C732D3 /* ComposeAvatarImageView.swift */,
+				D6A57407255C53EC00674551 /* ComposeTextViewCaretScrolling.swift */,
+				D62275A924F1E01C00B82A16 /* ComposeTextView.swift */,
+				D6C99FCA24FADC91005C74D3 /* MainComposeTextView.swift */,
+				D662AEF1263A4BE10082A153 /* ComposePollView.swift */,
+				D622757324EDF1CD00B82A16 /* ComposeAttachmentsList.swift */,
+				D622757924EE21D900B82A16 /* ComposeAttachmentRow.swift */,
+				D6DD2A3E273C1F4900386A6C /* ComposeAttachmentImage.swift */,
+				D622757724EE133700B82A16 /* ComposeAssetPicker.swift */,
+				D62275A524F1C81800B82A16 /* ComposeReplyView.swift */,
 				D62275A724F1CA2800B82A16 /* ComposeReplyContentView.swift */,
-				D6BD395A29B64441005FFD2B /* ComposeHostingController.swift */,
+				D6E4267625327FB400C02E1C /* ComposeAutocompleteView.swift */,
+				D6C143D9253510F4007DC240 /* ComposeEmojiTextField.swift */,
+				D6F6A5582920676800F496A8 /* ComposeToolbar.swift */,
+				D6BEA248291C6118002F4D01 /* DraftsView.swift */,
 			);
 			path = Compose;
 			sourceTree = "<group>";
@@ -1200,7 +1307,7 @@
 				D667E5F02134D5050057A976 /* UIViewController+Delegates.swift */,
 				D667E5F72135C3040057A976 /* Mastodon+Equatable.swift */,
 				D663626B21361C6700C9CBA2 /* Account+Preferences.swift */,
-				D6F4D79329ECB0AF00351B87 /* UIBackgroundConfiguration+AppColors.swift */,
+				D66362742137068A00C9CBA2 /* Visibility+Helpers.swift */,
 				D6333B362137838300CE884A /* AttributedString+Helpers.swift */,
 				D6333B782139AEFD00CE884A /* Date+TimeAgo.swift */,
 				D67C57AE21E28EAD00C3118B /* Array+Uniques.swift */,
@@ -1317,6 +1424,18 @@
 			path = Activities;
 			sourceTree = "<group>";
 		};
+		D6B053A023BD2BED00A066FA /* Asset Picker */ = {
+			isa = PBXGroup;
+			children = (
+				D6B053A123BD2C0600A066FA /* AssetPickerViewController.swift */,
+				D6B053A323BD2C8100A066FA /* AssetCollectionsListViewController.swift */,
+				D6B053A523BD2D0C00A066FA /* AssetCollectionViewController.swift */,
+				D626493E23C101C500612E6E /* AlbumAssetCollectionViewController.swift */,
+				D64BC18523C1253A000D0238 /* AssetPreviewViewController.swift */,
+			);
+			path = "Asset Picker";
+			sourceTree = "<group>";
+		};
 		D6BC9DD8232D8BCA002CA326 /* Search */ = {
 			isa = PBXGroup;
 			children = (
@@ -1329,6 +1448,7 @@
 			isa = PBXGroup;
 			children = (
 				D6B4A4FE2506B81A000C81C1 /* AccountDisplayNameLabel.swift */,
+				D6BEA24A291C6A2B002F4D01 /* AlertWithData.swift */,
 				D68E6F5E253C9B2D001A1B4C /* BaseEmojiLabel.swift */,
 				D6ADB6EF28ED1F25009924AB /* CachedImageView.swift */,
 				D6895DC328D65342006341DA /* ConfirmReblogStatusPreviewView.swift */,
@@ -1339,10 +1459,12 @@
 				D61F75B8293C15A000C0B37F /* ZeroHeightCollectionViewCell.swift */,
 				D67C1794266D57D10070F250 /* FastAccountSwitcherIndicatorView.swift */,
 				D6EAE0DA2550CC8A002DB0AC /* FocusableTextField.swift */,
+				D6DD2A44273D6C5700386A6C /* GIFImageView.swift */,
 				D641C77E213DC78A004B4513 /* InlineTextAttachment.swift */,
 				D620483323D3801D008A63EF /* LinkTextView.swift */,
 				D61A45E728DF477D002BE511 /* LoadingCollectionViewCell.swift */,
 				D6262C9928D01C4B00390C1F /* LoadingTableViewCell.swift */,
+				D673ACCD2919E74200D6F8B0 /* MenuPicker.swift */,
 				D68E6F58253C9969001A1B4C /* MultiSourceEmojiLabel.swift */,
 				D627943A23A55BA600D38C68 /* NavigableTableViewCell.swift */,
 				D6D7069F29466649000827ED /* ScrollingSegmentedControl.swift */,
@@ -1355,6 +1477,7 @@
 				D627944623A6AC9300D38C68 /* BasicTableViewCell.xib */,
 				D6A3BC872321F78000FD64D5 /* Account Cell */,
 				D67C57A721E2649B00C3118B /* Account Detail */,
+				D626494023C122C800612E6E /* Asset Picker */,
 				D6C7D27B22B6EBE200071952 /* Attachments */,
 				D6DEA0DB268400AF00FE896A /* Confirm Load More Cell */,
 				D611C2CC232DC5FC00C86A49 /* Hashtag Cell */,
@@ -1414,10 +1537,6 @@
 				D674A50727F910F300BA03AC /* Pachyderm */,
 				D6BEA243291A0C83002F4D01 /* Duckable */,
 				D68A76F22953915C001DA1B3 /* TTTKit */,
-				D6B0026C29B5245400C70BE2 /* UserAccounts */,
-				D6FA94DF29B52891006AAC51 /* InstanceFeatures */,
-				D6BD395C29B789D5005FFD2B /* TuskerComponents */,
-				D6BD395729B6441F005FFD2B /* ComposeUI */,
 				D6D4DDCE212518A000E1C4BB /* Tusker */,
 				D6D4DDE3212518A200E1C4BB /* TuskerTests */,
 				D6D4DDEE212518A200E1C4BB /* TuskerUITests */,
@@ -1454,6 +1573,7 @@
 				D6B30E08254BAF63009CAEE5 /* ImageGrayscalifier.swift */,
 				D61F75BC293D099600C0B37F /* Lazy.swift */,
 				D60E2F2B24423EAD005F8713 /* LazilyDecoding.swift */,
+				D64D0AAC2128D88B005A6F37 /* LocalData.swift */,
 				D61DC84528F498F200B82C6E /* Logging.swift */,
 				D6B81F432560390300F6E31D /* MenuController.swift */,
 				D64D8CA82463B494006B0BAA /* MultiThreadDictionary.swift */,
@@ -1489,6 +1609,7 @@
 				D6D4DDE4212518A200E1C4BB /* TuskerTests.swift */,
 				D62FF04723D7CDD700909D6E /* AttributedStringHelperTests.swift */,
 				D6E426AC25334DA500C02E1C /* FuzzyMatcherTests.swift */,
+				D6114E1627F8BB210080E273 /* VersionTests.swift */,
 				D61F75A029396DE200C0B37F /* SemiCaseSensitiveComparatorTests.swift */,
 				D6CA8CD92962231F0050C433 /* ArrayUniqueTests.swift */,
 				D600891C298482F0005B4D00 /* PinnedTimelineTests.swift */,
@@ -1572,7 +1693,9 @@
 		D6F953F121251A2F00CF0F2B /* API */ = {
 			isa = PBXGroup;
 			children = (
+				D62E9988279DB2D100C26176 /* InstanceFeatures.swift */,
 				D6F953EF21251A2900CF0F2B /* MastodonController.swift */,
+				D6E9CDA7281A427800BBC98E /* PostService.swift */,
 				D61ABEFD28F1C92600B29151 /* FavoriteService.swift */,
 				D621733228F1D5ED004C7DB1 /* ReblogService.swift */,
 				D6F6A54F291F058600F496A8 /* CreateListService.swift */,
@@ -1618,10 +1741,6 @@
 				D63CC701290EC0B8000E19DE /* Sentry */,
 				D6BEA244291A0EDE002F4D01 /* Duckable */,
 				D659F35D2953A212002D944A /* TTTKit */,
-				D6B0026D29B5248800C70BE2 /* UserAccounts */,
-				D6FA94E029B52898006AAC51 /* InstanceFeatures */,
-				D635237029B78A7D009ED5E7 /* TuskerComponents */,
-				D6BD395829B64426005FFD2B /* ComposeUI */,
 			);
 			productName = Tusker;
 			productReference = D6D4DDCC212518A000E1C4BB /* Tusker.app */;
@@ -1753,14 +1872,17 @@
 				D6E77D0D286E6B7300D8B732 /* TrendingLinkCardCollectionViewCell.xib in Resources */,
 				D693A73025CF91C6003A14E2 /* FeaturedProfileCollectionViewCell.xib in Resources */,
 				D61AC1D9232EA42D00C54D2D /* InstanceTableViewCell.xib in Resources */,
+				D626493923C0FD0000612E6E /* AllPhotosTableViewCell.xib in Resources */,
 				D6A3BC8B2321F79B00FD64D5 /* AccountTableViewCell.xib in Resources */,
 				D6A3BC7D232195C600FD64D5 /* ActionNotificationGroupTableViewCell.xib in Resources */,
 				D6412B0B24B0D4C600F5412E /* ProfileHeaderView.xib in Resources */,
 				D6D4DDDA212518A200E1C4BB /* LaunchScreen.storyboard in Resources */,
 				D6E57FA325C26FAB00341037 /* Localizable.stringsdict in Resources */,
+				D6B053AC23BD2F1400A066FA /* AssetCollectionViewCell.xib in Resources */,
 				D6D4DDD7212518A200E1C4BB /* Assets.xcassets in Resources */,
 				D640D76922BAF5E6004FBE69 /* DomainBlocks.plist in Resources */,
 				D6289E84217B795D0003D1D7 /* LargeImageViewController.xib in Resources */,
+				D626493D23C1000300612E6E /* AlbumTableViewCell.xib in Resources */,
 				D627944723A6AC9300D38C68 /* BasicTableViewCell.xib in Resources */,
 				D601FA84297EEC3F00A8E8B5 /* SuggestedProfileCardCollectionViewCell.xib in Resources */,
 				D64BC19023C18B9D000D0238 /* FollowRequestNotificationTableViewCell.xib in Resources */,
@@ -1849,17 +1971,20 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				D626493523BD94CE00612E6E /* CompositionAttachmentData.swift in Sources */,
 				D6531DF0246B867E000F9538 /* GifvAttachmentViewController.swift in Sources */,
+				D6285B5321EA708700FE4B39 /* StatusFormat.swift in Sources */,
 				D6DD353D22F28CD000A9563A /* ContentWarningCopyMode.swift in Sources */,
 				0427033A22B31269000D31B6 /* AdvancedPrefsView.swift in Sources */,
 				D6C3F4F5298ED0890009FCFF /* LocalPredicateStatusesViewController.swift in Sources */,
 				D662AEEF263A3B880082A153 /* PollFinishedTableViewCell.swift in Sources */,
 				D691771729A710520054D7EF /* ProfileNoContentCollectionViewCell.swift in Sources */,
+				D626493C23C1000300612E6E /* AlbumTableViewCell.swift in Sources */,
+				D62275A624F1C81800B82A16 /* ComposeReplyView.swift in Sources */,
 				D60E2F292442372B005F8713 /* AccountMO.swift in Sources */,
 				D6412B0324AFF6A600F5412E /* TabBarScrollableViewController.swift in Sources */,
 				D6093FB725BE0CF3004811E6 /* TrendHistoryView.swift in Sources */,
 				D6EBF01723C55E0D00AE061B /* UISceneSession+MastodonController.swift in Sources */,
-				D6BD395B29B64441005FFD2B /* ComposeHostingController.swift in Sources */,
 				D61F759229365C6C00C0B37F /* CollectionViewController.swift in Sources */,
 				D6DD996B2998611A0015C962 /* SuggestedProfilesViewController.swift in Sources */,
 				D6DD8FFD298495A8002AD3FD /* LogoutService.swift in Sources */,
@@ -1872,6 +1997,7 @@
 				D6969E9E240C81B9002843CE /* NSTextAttachment+Emoji.swift in Sources */,
 				D6BC9DB3232D4C07002CA326 /* WellnessPrefsView.swift in Sources */,
 				D64BC18F23C18B9D000D0238 /* FollowRequestNotificationTableViewCell.swift in Sources */,
+				D62E9989279DB2D100C26176 /* InstanceFeatures.swift in Sources */,
 				D6ADB6F028ED1F25009924AB /* CachedImageView.swift in Sources */,
 				D693DE5923FE24310061E07D /* InteractivePushTransition.swift in Sources */,
 				D69693FA25859A8000F4E116 /* ComposeSceneDelegate.swift in Sources */,
@@ -1881,11 +2007,13 @@
 				D61F759B29384F9C00C0B37F /* FilterMO.swift in Sources */,
 				D68FEC4F232C5BC300C84F23 /* SegmentedPageViewController.swift in Sources */,
 				D64AAE9126C80DC600FC57FB /* ToastView.swift in Sources */,
+				D62275AA24F1E01C00B82A16 /* ComposeTextView.swift in Sources */,
 				0450531F22B0097E00100BA2 /* Timline+UI.swift in Sources */,
 				D6C7D27D22B6EBF800071952 /* AttachmentsContainerView.swift in Sources */,
 				D61F75942936F0DA00C0B37F /* FollowedHashtag.swift in Sources */,
 				D63CC7122911F57C000E19DE /* StatusBarTappableViewController.swift in Sources */,
 				D620483823D38190008A63EF /* StatusContentTextView.swift in Sources */,
+				D6D3FDE224F46A8D00FF50A5 /* ComposeUIState.swift in Sources */,
 				D6B22A0F2560D52D004D82EF /* TabbedPageViewController.swift in Sources */,
 				D6895DC228D65274006341DA /* CustomAlertController.swift in Sources */,
 				D6F953F021251A2900CF0F2B /* MastodonController.swift in Sources */,
@@ -1895,6 +2023,7 @@
 				D627944F23A9C99800D38C68 /* EditListAccountsViewController.swift in Sources */,
 				D6945C3423AC6431005C403C /* AddSavedHashtagViewController.swift in Sources */,
 				D6F6A552291F098700F496A8 /* RenameListService.swift in Sources */,
+				D68ACE5D279B1ABA001CE8EB /* AssetPickerControlCollectionViewCell.swift in Sources */,
 				D62D2426217ABF63005076CC /* UserActivityType.swift in Sources */,
 				D6AC956723C4347E008C9946 /* MainSceneDelegate.swift in Sources */,
 				D6311C5025B3765B00B27539 /* ImageDataCache.swift in Sources */,
@@ -1904,6 +2033,7 @@
 				D620483623D38075008A63EF /* ContentTextView.swift in Sources */,
 				D651C5B42915B00400236EF6 /* ProfileFieldsView.swift in Sources */,
 				D6F2E965249E8BFD005846BB /* IssueReporterViewController.swift in Sources */,
+				D6A57408255C53EC00674551 /* ComposeTextViewCaretScrolling.swift in Sources */,
 				D6CA6A94249FADE700AD45C1 /* GalleryPlayerViewController.swift in Sources */,
 				D6A3BC802321B7E600FD64D5 /* FollowNotificationGroupTableViewCell.swift in Sources */,
 				D627944D23A9A03D00D38C68 /* ListTimelineViewController.swift in Sources */,
@@ -1923,6 +2053,8 @@
 				D60E2F272442372B005F8713 /* StatusMO.swift in Sources */,
 				D61F758A2932E1FC00C0B37F /* SwipeActionsPrefsView.swift in Sources */,
 				D60E2F2C24423EAD005F8713 /* LazilyDecoding.swift in Sources */,
+				D662AEF2263A4BE10082A153 /* ComposePollView.swift in Sources */,
+				D677284A24ECBDF400C732D3 /* ComposeCurrentAccount.swift in Sources */,
 				D62D2424217ABF3F005076CC /* NSUserActivity+Extensions.swift in Sources */,
 				D6E77D0F286F773900D8B732 /* SplitNavigationController.swift in Sources */,
 				D6B30E09254BAF63009CAEE5 /* ImageGrayscalifier.swift in Sources */,
@@ -1937,16 +2069,21 @@
 				D6B4A4FF2506B81A000C81C1 /* AccountDisplayNameLabel.swift in Sources */,
 				D63D8DF42850FE7A008D95E1 /* ViewTags.swift in Sources */,
 				D61DC84B28F4FD2000B82C6E /* ProfileHeaderCollectionViewCell.swift in Sources */,
+				D6B053A623BD2D0C00A066FA /* AssetCollectionViewController.swift in Sources */,
 				D61A45E828DF477D002BE511 /* LoadingCollectionViewCell.swift in Sources */,
 				D67B506D250B291200FAECFB /* BlurHashDecode.swift in Sources */,
 				D68A76EC295369A8001DA1B3 /* AboutView.swift in Sources */,
+				D62275A024F1677200B82A16 /* ComposeHostingController.swift in Sources */,
 				04DACE8E212CC7CC009840C4 /* ImageCache.swift in Sources */,
+				D6BEA249291C6118002F4D01 /* DraftsView.swift in Sources */,
 				D61F75AD293AF39000C0B37F /* Filter+Helpers.swift in Sources */,
 				D6531DEE246B81C9000F9538 /* GifvAttachmentView.swift in Sources */,
+				D673ACCE2919E74200D6F8B0 /* MenuPicker.swift in Sources */,
 				D6370B9C24421FF30092A7FF /* Tusker.xcdatamodeld in Sources */,
 				D601FA83297EEC3F00A8E8B5 /* SuggestedProfileCardCollectionViewCell.swift in Sources */,
 				D691772E29AA5D420054D7EF /* UserActivityHandlingContext.swift in Sources */,
 				04ED00B121481ED800567C53 /* SteppedProgressView.swift in Sources */,
+				D677284C24ECBE9100C732D3 /* ComposeAvatarImageView.swift in Sources */,
 				D6A6C11B25B63CEE00298D0F /* MemoryCache.swift in Sources */,
 				D6114E0D27F7FEB30080E273 /* TrendingStatusesViewController.swift in Sources */,
 				D6BC9DDA232D8BE5002CA326 /* SearchResultsViewController.swift in Sources */,
@@ -1973,7 +2110,9 @@
 				D623A53D2635F5590095BD04 /* StatusPollView.swift in Sources */,
 				D64AAE9726C88DC400FC57FB /* ToastConfiguration.swift in Sources */,
 				D63661C02381C144004B9E16 /* PreferencesNavigationController.swift in Sources */,
+				D6E9CDA8281A427800BBC98E /* PostService.swift in Sources */,
 				D65B4B5E2973040D00DABDFB /* ReportAddStatusView.swift in Sources */,
+				D6B053A223BD2C0600A066FA /* AssetPickerViewController.swift in Sources */,
 				D6EE63FB2551F7F60065485C /* StatusCollapseButton.swift in Sources */,
 				D6CA8CDE296387310050C433 /* SaveToPhotosActivity.swift in Sources */,
 				D6B936712829F72900237D0E /* NSManagedObjectContext+Helpers.swift in Sources */,
@@ -1985,10 +2124,12 @@
 				D6945C3A23AC75E2005C403C /* FindInstanceViewController.swift in Sources */,
 				D65B4B6429771EFF00DABDFB /* ConversationViewController.swift in Sources */,
 				D68E6F59253C9969001A1B4C /* MultiSourceEmojiLabel.swift in Sources */,
+				D63F9C6E241D2D85004C03CF /* CompositionAttachment.swift in Sources */,
 				D6EBF01523C55C0900AE061B /* UIApplication+Scenes.swift in Sources */,
 				D6538945214D6D7500E3CEFC /* TableViewSwipeActionProvider.swift in Sources */,
 				D6F0B17524A3A1AA001E48C3 /* MainSidebarViewController.swift in Sources */,
 				D62E9985279CA23900C26176 /* URLSession+Development.swift in Sources */,
+				D622757424EDF1CD00B82A16 /* ComposeAttachmentsList.swift in Sources */,
 				D61F75B7293C119700C0B37F /* Filterer.swift in Sources */,
 				D64AAE9526C88C5000FC57FB /* ToastableViewController.swift in Sources */,
 				D6895DE928D962C2006341DA /* TimelineLikeController.swift in Sources */,
@@ -2000,21 +2141,30 @@
 				D6BED174212667E900F02DA0 /* TimelineStatusTableViewCell.swift in Sources */,
 				D69693F42585941A00F4E116 /* UIWindowSceneDelegate+Close.swift in Sources */,
 				D659F36229541065002D944A /* TTTView.swift in Sources */,
+				D6C143DA253510F4007DC240 /* ComposeEmojiTextField.swift in Sources */,
+				D6DD2A3F273C1F4900386A6C /* ComposeAttachmentImage.swift in Sources */,
 				D65B4B6229771A3F00DABDFB /* FetchStatusService.swift in Sources */,
+				D6DD2A45273D6C5700386A6C /* GIFImageView.swift in Sources */,
 				D61F759029353B4300C0B37F /* FileManager+Size.swift in Sources */,
 				0427033822B30F5F000D31B6 /* BehaviorPrefsView.swift in Sources */,
+				D64D0AAD2128D88B005A6F37 /* LocalData.swift in Sources */,
 				D6945C2F23AC47C3005C403C /* SavedDataManager.swift in Sources */,
 				D6C94D892139E6EC00CB5196 /* AttachmentView.swift in Sources */,
 				D6C693EF216192C2007D6A6D /* TuskerNavigationDelegate.swift in Sources */,
 				D6C94D872139E62700CB5196 /* LargeImageViewController.swift in Sources */,
+				D6B053AB23BD2F1400A066FA /* AssetCollectionViewCell.swift in Sources */,
+				D622757A24EE21D900B82A16 /* ComposeAttachmentRow.swift in Sources */,
 				D6E4269D2532A3E100C02E1C /* FuzzyMatcher.swift in Sources */,
 				D6969EA0240C8384002843CE /* EmojiLabel.swift in Sources */,
+				D64BC18623C1253A000D0238 /* AssetPreviewViewController.swift in Sources */,
 				D6F6A550291F058600F496A8 /* CreateListService.swift in Sources */,
 				D601FA5B29787AB100A8E8B5 /* AccountFollowsListViewController.swift in Sources */,
+				D6BEA24B291C6A2B002F4D01 /* AlertWithData.swift in Sources */,
 				D61ABEFE28F1C92600B29151 /* FavoriteService.swift in Sources */,
 				D61F75AB293AF11400C0B37F /* FilterKeywordMO.swift in Sources */,
 				D65B4B5A29720AB000DABDFB /* ReportStatusView.swift in Sources */,
 				D663626221360B1900C9CBA2 /* Preferences.swift in Sources */,
+				D626493823C0FD0000612E6E /* AllPhotosTableViewCell.swift in Sources */,
 				D627943B23A55BA600D38C68 /* NavigableTableViewCell.swift in Sources */,
 				D6D9498F298EB79400C59229 /* CopyableLable.swift in Sources */,
 				D6333B792139AEFD00CE884A /* Date+TimeAgo.swift in Sources */,
@@ -2031,8 +2181,8 @@
 				D663626C21361C6700C9CBA2 /* Account+Preferences.swift in Sources */,
 				D67895C0246870DE00D4CD9E /* LocalAccountAvatarView.swift in Sources */,
 				D6ADB6E828E8C878009924AB /* PublicTimelineDescriptionCollectionViewCell.swift in Sources */,
-				D6F4D79429ECB0AF00351B87 /* UIBackgroundConfiguration+AppColors.swift in Sources */,
 				D6333B372137838300CE884A /* AttributedString+Helpers.swift in Sources */,
+				D622757824EE133700B82A16 /* ComposeAssetPicker.swift in Sources */,
 				D681A29A249AD62D0085E54E /* LargeImageContentView.swift in Sources */,
 				D6DFC69E242C490400ACC392 /* TrackpadScrollGestureRecognizer.swift in Sources */,
 				D61AC1D8232EA42D00C54D2D /* InstanceTableViewCell.swift in Sources */,
@@ -2057,6 +2207,7 @@
 				D60089192981FEBA005B4D00 /* ConfettiView.swift in Sources */,
 				D61F759929384D4D00C0B37F /* CustomizeTimelinesView.swift in Sources */,
 				D61F759F29385AD800C0B37F /* SemiCaseSensitiveComparator.swift in Sources */,
+				D627FF76217E923E00CC0648 /* DraftsManager.swift in Sources */,
 				04586B4322B301470021BD04 /* AppearancePrefsView.swift in Sources */,
 				D6FF9860255C717400845181 /* AccountSwitchingContainerViewController.swift in Sources */,
 				D6E77D0B286D426E00D8B732 /* TrendingLinkCardCollectionViewCell.swift in Sources */,
@@ -2073,6 +2224,7 @@
 				D6945C3223AC4D36005C403C /* HashtagTimelineViewController.swift in Sources */,
 				D647D92824257BEB0005044F /* AttachmentPreviewViewController.swift in Sources */,
 				D61F75B5293BD97400C0B37F /* DeleteFilterService.swift in Sources */,
+				D66362752137068A00C9CBA2 /* Visibility+Helpers.swift in Sources */,
 				D6DFC6A0242C4CCC00ACC392 /* Weak.swift in Sources */,
 				D6C693FC2162FE6F007D6A6D /* LoadingViewController.swift in Sources */,
 				D61ABEF828EFC3F900B29151 /* ProfileStatusesViewController.swift in Sources */,
@@ -2086,7 +2238,9 @@
 				D61F75AF293AF50C00C0B37F /* EditedFilter.swift in Sources */,
 				D691771929A7B8820054D7EF /* ProfileHeaderMovedOverlayView.swift in Sources */,
 				D61F75B9293C15A000C0B37F /* ZeroHeightCollectionViewCell.swift in Sources */,
+				D677284824ECBCB100C732D3 /* ComposeView.swift in Sources */,
 				D68232F72464F4FD00325FB8 /* ComposeDrawingViewController.swift in Sources */,
+				D6F6A5592920676800F496A8 /* ComposeToolbar.swift in Sources */,
 				04586B4122B2FFB10021BD04 /* PreferencesView.swift in Sources */,
 				D6620ACE2511A0ED00312CA0 /* StatusStateResolver.swift in Sources */,
 				D6B9366B281EE77E00237D0E /* PollVoteButton.swift in Sources */,
@@ -2106,9 +2260,13 @@
 				D6AEBB3E2321638100E5038B /* UIActivity+Types.swift in Sources */,
 				D61AC1D5232E9FA600C54D2D /* InstanceSelectorTableViewController.swift in Sources */,
 				D681E4D9246E346E0053414F /* AccountActivityItemSource.swift in Sources */,
+				D626493F23C101C500612E6E /* AlbumAssetCollectionViewController.swift in Sources */,
 				D68015422401A74600D6103B /* MediaPrefsView.swift in Sources */,
+				D6C99FCB24FADC91005C74D3 /* MainComposeTextView.swift in Sources */,
 				D6093F9B25BDD4B9004811E6 /* HashtagSearchResultsViewController.swift in Sources */,
+				D6E4267725327FB400C02E1C /* ComposeAutocompleteView.swift in Sources */,
 				D6E77D09286D25FA00D8B732 /* TrendingHashtagCollectionViewCell.swift in Sources */,
+				D677284E24ECC01D00C732D3 /* Draft.swift in Sources */,
 				D667E5F12134D5050057A976 /* UIViewController+Delegates.swift in Sources */,
 				D6BC8748219738E1006163F1 /* EnhancedTableViewController.swift in Sources */,
 				D6E426B325337C7000C02E1C /* CustomEmojiImageView.swift in Sources */,
@@ -2121,6 +2279,7 @@
 				D6D12B56292D57E800D528E1 /* AccountCollectionViewCell.swift in Sources */,
 				D60088F22980DAA0005B4D00 /* TipJarView.swift in Sources */,
 				D6C82B4125C5BB7E0017F1E6 /* ExploreViewController.swift in Sources */,
+				D6B053A423BD2C8100A066FA /* AssetCollectionsListViewController.swift in Sources */,
 				D6A3A380295515550036B6EF /* ProfileHeaderButton.swift in Sources */,
 				D65B4B562971F98300DABDFB /* ReportView.swift in Sources */,
 				D623A543263634100095BD04 /* PollOptionCheckboxView.swift in Sources */,
@@ -2139,6 +2298,7 @@
 				D62FF04823D7CDD700909D6E /* AttributedStringHelperTests.swift in Sources */,
 				D6E426AD25334DA500C02E1C /* FuzzyMatcherTests.swift in Sources */,
 				D600891D298482F0005B4D00 /* PinnedTimelineTests.swift in Sources */,
+				D6114E1727F8BB210080E273 /* VersionTests.swift in Sources */,
 				D6CA8CDA2962231F0050C433 /* ArrayUniqueTests.swift in Sources */,
 				D6D4DDE5212518A200E1C4BB /* TuskerTests.swift in Sources */,
 			);
@@ -2283,7 +2443,7 @@
 				CODE_SIGN_ENTITLEMENTS = Tusker/Tusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 77;
+				CURRENT_PROJECT_VERSION = 76;
 				INFOPLIST_FILE = Tusker/Info.plist;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
@@ -2291,7 +2451,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2023.5;
+				MARKETING_VERSION = 2023.4;
 				OTHER_CODE_SIGN_FLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).Tusker";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2349,7 +2509,7 @@
 				CODE_SIGN_ENTITLEMENTS = OpenInTusker/OpenInTusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 77;
+				CURRENT_PROJECT_VERSION = 76;
 				INFOPLIST_FILE = OpenInTusker/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
 				"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.3;
@@ -2358,7 +2518,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2023.5;
+				MARKETING_VERSION = 2023.4;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).Tusker.OpenInTusker";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -2501,7 +2661,7 @@
 				CODE_SIGN_ENTITLEMENTS = Tusker/Tusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 77;
+				CURRENT_PROJECT_VERSION = 76;
 				INFOPLIST_FILE = Tusker/Info.plist;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
@@ -2509,7 +2669,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2023.5;
+				MARKETING_VERSION = 2023.4;
 				OTHER_CODE_SIGN_FLAGS = "";
 				OTHER_LDFLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).Tusker";
@@ -2532,7 +2692,7 @@
 				CODE_SIGN_ENTITLEMENTS = Tusker/Tusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 77;
+				CURRENT_PROJECT_VERSION = 76;
 				INFOPLIST_FILE = Tusker/Info.plist;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
@@ -2540,7 +2700,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2023.5;
+				MARKETING_VERSION = 2023.4;
 				OTHER_CODE_SIGN_FLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).Tusker";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2638,7 +2798,7 @@
 				CODE_SIGN_ENTITLEMENTS = OpenInTusker/OpenInTusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 77;
+				CURRENT_PROJECT_VERSION = 76;
 				INFOPLIST_FILE = OpenInTusker/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
 				"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.3;
@@ -2647,7 +2807,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2023.5;
+				MARKETING_VERSION = 2023.4;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).Tusker.OpenInTusker";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -2664,7 +2824,7 @@
 				CODE_SIGN_ENTITLEMENTS = OpenInTusker/OpenInTusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 77;
+				CURRENT_PROJECT_VERSION = 76;
 				INFOPLIST_FILE = OpenInTusker/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
 				"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.3;
@@ -2673,7 +2833,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2023.5;
+				MARKETING_VERSION = 2023.4;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).Tusker.OpenInTusker";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -2783,10 +2943,6 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = Pachyderm;
 		};
-		D635237029B78A7D009ED5E7 /* TuskerComponents */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = TuskerComponents;
-		};
 		D63CC701290EC0B8000E19DE /* Sentry */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = D63CC700290EC0B8000E19DE /* XCRemoteSwiftPackageReference "sentry-cocoa" */;
@@ -2810,22 +2966,10 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = Pachyderm;
 		};
-		D6B0026D29B5248800C70BE2 /* UserAccounts */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = UserAccounts;
-		};
-		D6BD395829B64426005FFD2B /* ComposeUI */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = ComposeUI;
-		};
 		D6BEA244291A0EDE002F4D01 /* Duckable */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = Duckable;
 		};
-		D6FA94E029B52898006AAC51 /* InstanceFeatures */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = InstanceFeatures;
-		};
 /* End XCSwiftPackageProductDependency section */
 
 /* Begin XCVersionGroup section */

Tusker/API/InstanceFeatures.swift

@@ -7,23 +7,17 @@
 //
 
 import Foundation
-import Combine
 import Pachyderm
+import Sentry
 
-public class InstanceFeatures: ObservableObject {
+struct InstanceFeatures {
     private static let pleromaVersionRegex = try! NSRegularExpression(pattern: "\\(compatible; pleroma (.*)\\)", options: .caseInsensitive)
     private static let akkomaVersionRegex = try! NSRegularExpression(pattern: "\\(compatible; akkoma (.*)\\)", options: .caseInsensitive)
     
-    private let _featuresUpdated = PassthroughSubject<Void, Never>()
-    public var featuresUpdated: some Publisher<Void, Never> { _featuresUpdated }
+    private var instanceType: InstanceType = .mastodon(.vanilla, nil)
+    private(set) var maxStatusChars = 500
     
-    @Published private var instanceType: InstanceType = .mastodon(.vanilla, nil)
-    @Published public private(set) var maxStatusChars = 500
-    @Published public private(set) var charsReservedPerURL = 23
-    @Published public private(set) var maxPollOptionChars: Int?
-    @Published public private(set) var maxPollOptionsCount: Int?
-    
-    public var localOnlyPosts: Bool {
+    var localOnlyPosts: Bool {
         switch instanceType {
         case .mastodon(.hometown(_), _), .mastodon(.glitch, _):
             return true
@@ -32,19 +26,19 @@ public class InstanceFeatures: ObservableObject {
         }
     }
     
-    public var mastodonAttachmentRestrictions: Bool {
+    var mastodonAttachmentRestrictions: Bool {
         instanceType.isMastodon
     }
     
-    public var pollsAndAttachments: Bool {
+    var pollsAndAttachments: Bool {
         instanceType.isPleroma
     }
     
-    public var boostToOriginalAudience: Bool {
+    var boostToOriginalAudience: Bool {
         instanceType.isPleroma || instanceType.isMastodon
     }
     
-    public var profilePinnedStatuses: Bool {
+    var profilePinnedStatuses: Bool {
         switch instanceType {
         case .pixelfed:
             return false
@@ -53,24 +47,24 @@ public class InstanceFeatures: ObservableObject {
         }
     }
     
-    public var trends: Bool {
+    var trends: Bool {
         instanceType.isMastodon
     }
     
-    public var profileSuggestions: Bool {
+    var profileSuggestions: Bool {
         instanceType.isMastodon && hasMastodonVersion(3, 4, 0)
     }
     
-    public var trendingStatusesAndLinks: Bool {
+    var trendingStatusesAndLinks: Bool {
         instanceType.isMastodon && hasMastodonVersion(3, 5, 0)
     }
     
-    public var reblogVisibility: Bool {
+    var reblogVisibility: Bool {
         (instanceType.isMastodon && hasMastodonVersion(2, 8, 0))
             || (instanceType.isPleroma && hasPleromaVersion(2, 0, 0))
     }
     
-    public var probablySupportsMarkdown: Bool {
+    var probablySupportsMarkdown: Bool {
         switch instanceType {
         case .pleroma(_), .mastodon(.glitch, _), .mastodon(.hometown(_), _):
             return true
@@ -79,7 +73,7 @@ public class InstanceFeatures: ObservableObject {
         }
     }
     
-    public var needsLocalOnlyEmojiHack: Bool {
+    var needsLocalOnlyEmojiHack: Bool {
         if case .mastodon(.glitch, _) = instanceType {
             return true
         } else {
@@ -87,7 +81,7 @@ public class InstanceFeatures: ObservableObject {
         }
     }
     
-    public var needsWideColorGamutHack: Bool {
+    var needsWideColorGamutHack: Bool {
         if case .mastodon(_, .some(let version)) = instanceType {
             return version < Version(4, 0, 0)
         } else {
@@ -95,26 +89,23 @@ public class InstanceFeatures: ObservableObject {
         }
     }
     
-    public var canFollowHashtags: Bool {
+    var canFollowHashtags: Bool {
         hasMastodonVersion(4, 0, 0)
     }
     
-    public var filtersV2: Bool {
+    var filtersV2: Bool {
         hasMastodonVersion(4, 0, 0)
     }
     
-    public var notificationsAllowedTypes: Bool {
+    var notificationsAllowedTypes: Bool {
         hasMastodonVersion(3, 5, 0)
     }
     
-    public var pollVotersCount: Bool {
+    var pollVotersCount: Bool {
         instanceType.isMastodon
     }
     
-    public init() {
-    }
-    
-    public func update(instance: Instance, nodeInfo: NodeInfo?) {
+    mutating func update(instance: Instance, nodeInfo: NodeInfo?) {
         let ver = instance.version.lowercased()
         if ver.contains("glitch") {
             instanceType = .mastodon(.glitch, Version(string: ver))
@@ -158,16 +149,11 @@ public class InstanceFeatures: ObservableObject {
         }
         
         maxStatusChars = instance.maxStatusCharacters ?? 500
-        charsReservedPerURL = instance.configuration?.statuses.charactersReservedPerURL ?? 23 // default Mastodon link length
-        if let pollsConfig = instance.pollsConfiguration {
-            maxPollOptionChars = pollsConfig.maxCharactersPerOption
-            maxPollOptionsCount = pollsConfig.maxOptions
+        
+        setInstanceBreadcrumb(instance: instance, nodeInfo: nodeInfo)
     }
     
-        _featuresUpdated.send()
-    }
-    
-    public func hasMastodonVersion(_ major: Int, _ minor: Int, _ patch: Int) -> Bool {
+    func hasMastodonVersion(_ major: Int, _ minor: Int, _ patch: Int) -> Bool {
         if case .mastodon(_, .some(let version)) = instanceType {
             return version >= Version(major, minor, patch)
         } else {
@@ -273,3 +259,19 @@ extension InstanceFeatures {
         }
     }
 }
+
+private func setInstanceBreadcrumb(instance: Instance, nodeInfo: NodeInfo?) {
+    let crumb = Breadcrumb(level: .info, category: "MastodonController")
+    crumb.data = [
+        "instance": [
+            "version": instance.version
+        ],
+    ]
+    if let nodeInfo {
+        crumb.data!["nodeInfo"] = [
+            "software": nodeInfo.software.name,
+            "version": nodeInfo.software.version,
+        ]
+    }
+    SentrySDK.addBreadcrumb(crumb)
+}

Tusker/API/LogoutService.swift

@@ -7,14 +7,13 @@
 //
 
 import Foundation
-import UserAccounts
 
 @MainActor
 class LogoutService {
-    let accountInfo: UserAccountInfo
+    let accountInfo: LocalData.UserAccountInfo
     private let mastodonController: MastodonController
     
-    init(accountInfo: UserAccountInfo) {
+    init(accountInfo: LocalData.UserAccountInfo) {
         self.accountInfo = accountInfo
         self.mastodonController = MastodonController.getForAccount(accountInfo)
     }
@@ -24,7 +23,7 @@ class LogoutService {
             try? await self.mastodonController.client.revokeAccessToken()
         }
         MastodonController.removeForAccount(accountInfo)
-        UserAccountsManager.shared.removeAccount(accountInfo)
+        LocalData.shared.removeAccount(accountInfo)
         let psc = mastodonController.persistentContainer.persistentStoreCoordinator
         for store in psc.persistentStores {
             guard let url = store.url else {

Tusker/API/MastodonController.swift

@@ -9,21 +9,15 @@
 import Foundation
 import Pachyderm
 import Combine
-import UserAccounts
-import InstanceFeatures
-import Sentry
-import ComposeUI
-
-private let oauthScopes = [Scope.read, .write, .follow]
 
 class MastodonController: ObservableObject {
 
-    static private(set) var all = [UserAccountInfo: MastodonController]()
+    static private(set) var all = [LocalData.UserAccountInfo: MastodonController]()
     
     @available(*, message: "do something less dumb")
     static var first: MastodonController { all.first!.value }
     
-    static func getForAccount(_ account: UserAccountInfo) -> MastodonController {
+    static func getForAccount(_ account: LocalData.UserAccountInfo) -> MastodonController {
         if let controller = all[account] {
             return controller
         } else {
@@ -37,7 +31,7 @@ class MastodonController: ObservableObject {
         }
     }
     
-    static func removeForAccount(_ account: UserAccountInfo) {
+    static func removeForAccount(_ account: LocalData.UserAccountInfo) {
         all.removeValue(forKey: account)
     }
     
@@ -49,15 +43,15 @@ class MastodonController: ObservableObject {
     private(set) nonisolated lazy var persistentContainer = MastodonCachePersistentStore(for: accountInfo, transient: transient)
 
     let instanceURL: URL
-    var accountInfo: UserAccountInfo?
+    var accountInfo: LocalData.UserAccountInfo?
     var accountPreferences: AccountPreferences!
     
     let client: Client!
-    let instanceFeatures = InstanceFeatures()
     
     @Published private(set) var account: Account!
     @Published private(set) var instance: Instance!
     @Published private(set) var nodeInfo: NodeInfo!
+    @Published private(set) var instanceFeatures = InstanceFeatures()
     @Published private(set) var lists: [List] = []
     @Published private(set) var customEmojis: [Emoji]?
     @Published private(set) var followedHashtags: [FollowedHashtag] = []
@@ -89,12 +83,11 @@ class MastodonController: ObservableObject {
             }
             .sink { [unowned self] (instance, nodeInfo) in
                 self.instanceFeatures.update(instance: instance, nodeInfo: nodeInfo)
-                setInstanceBreadcrumb(instance: instance, nodeInfo: nodeInfo)
             }
             .store(in: &cancellables)
         
-        instanceFeatures.featuresUpdated
-            .filter { [unowned self] _ in self.instanceFeatures.canFollowHashtags && self.followedHashtags.isEmpty }
+        $instanceFeatures
+            .filter { [unowned self] in $0.canFollowHashtags && self.followedHashtags.isEmpty }
             .sink { [unowned self] _ in
                 Task {
                     await self.loadFollowedHashtags()
@@ -135,7 +128,7 @@ class MastodonController: ObservableObject {
             return (clientID, clientSecret)
         } else {
             let app: RegisteredApplication = try await withCheckedThrowingContinuation({ continuation in
-                client.registerApp(name: "Tusker", redirectURI: "tusker://oauth", scopes: oauthScopes) { response in
+                client.registerApp(name: "Tusker", redirectURI: "tusker://oauth", scopes: [.read, .write, .follow]) { response in
                     switch response {
                     case .failure(let error):
                         continuation.resume(throwing: error)
@@ -153,7 +146,7 @@ class MastodonController: ObservableObject {
     /// - Returns: The access token
     func authorize(authorizationCode: String) async throws -> String {
         return try await withCheckedThrowingContinuation({ continuation in
-            client.getAccessToken(authorizationCode: authorizationCode, redirectURI: "tusker://oauth", scopes: oauthScopes) { response in
+            client.getAccessToken(authorizationCode: authorizationCode, redirectURI: "tusker://oauth") { response in
                 switch response {
                 case .failure(let error):
                     continuation.resume(throwing: error)
@@ -459,69 +452,4 @@ class MastodonController: ObservableObject {
         filters = (try? persistentContainer.viewContext.fetch(FilterMO.fetchRequest())) ?? []
     }
     
-    func createDraft(inReplyToID: String? = nil, mentioningAcct: String? = nil, text: String? = nil) -> Draft {
-        var acctsToMention = [String]()
-        
-        var visibility = inReplyToID != nil ? Preferences.shared.defaultReplyVisibility.resolved : Preferences.shared.defaultPostVisibility
-        var localOnly = false
-        var contentWarning = ""
-        
-        if let inReplyToID = inReplyToID,
-           let inReplyTo = persistentContainer.status(for: inReplyToID) {
-            acctsToMention.append(inReplyTo.account.acct)
-            acctsToMention.append(contentsOf: inReplyTo.mentions.map(\.acct))
-            visibility = min(visibility, inReplyTo.visibility)
-            localOnly = instanceFeatures.localOnlyPosts && inReplyTo.localOnly
-            
-            if !inReplyTo.spoilerText.isEmpty {
-                switch Preferences.shared.contentWarningCopyMode {
-                case .doNotCopy:
-                    break
-                case .asIs:
-                    contentWarning = inReplyTo.spoilerText
-                case .prependRe:
-                    if inReplyTo.spoilerText.lowercased().starts(with: "re:") {
-                        contentWarning = inReplyTo.spoilerText
-                    } else {
-                        contentWarning = "re: \(inReplyTo.spoilerText)"
-                    }
-                }
-            }
-        }
-        if let mentioningAcct = mentioningAcct {
-            acctsToMention.append(mentioningAcct)
-        }
-        if let ownAccount = self.account {
-            acctsToMention.removeAll(where: { $0 == ownAccount.acct })
-        }
-        acctsToMention = acctsToMention.uniques()
-        
-        let draft = Draft(
-            accountID: accountInfo!.id,
-            text: text ?? acctsToMention.map { "@\($0) " }.joined(),
-            contentWarning: contentWarning,
-            inReplyToID: inReplyToID,
-            visibility: visibility,
-            localOnly: localOnly
-        )
-        DraftsManager.shared.add(draft)
-        return draft
-    }
-    
-}
-
-private func setInstanceBreadcrumb(instance: Instance, nodeInfo: NodeInfo?) {
-    let crumb = Breadcrumb(level: .info, category: "MastodonController")
-    crumb.data = [
-        "instance": [
-            "version": instance.version
-        ],
-    ]
-    if let nodeInfo {
-        crumb.data!["nodeInfo"] = [
-            "software": nodeInfo.software.name,
-            "version": nodeInfo.software.version,
-        ]
-    }
-    SentrySDK.addBreadcrumb(crumb)
 }

Tusker/API/PostService.swift

@@ -11,16 +11,14 @@ import Pachyderm
 import UniformTypeIdentifiers
 
 class PostService: ObservableObject {
-    private let mastodonController: ComposeMastodonContext
-    private let config: ComposeUIConfig
+    private let mastodonController: MastodonController
     private let draft: Draft
     let totalSteps: Int
     
     @Published var currentStep = 1
     
-    init(mastodonController: ComposeMastodonContext, config: ComposeUIConfig, draft: Draft) {
+    init(mastodonController: MastodonController, draft: Draft) {
         self.mastodonController = mastodonController
-        self.config = config
         self.draft = draft
         // 2 steps (request data, then upload) for each attachment
         self.totalSteps = 2 + (draft.attachments.count * 2)
@@ -42,7 +40,7 @@ class PostService: ObservableObject {
         
         let request = Client.createStatus(
             text: textForPosting(),
-            contentType: config.contentType,
+            contentType: Preferences.shared.statusContentType,
             inReplyTo: draft.inReplyToID,
             media: uploadedAttachments,
             sensitive: sensitive,
@@ -59,7 +57,6 @@ class PostService: ObservableObject {
             currentStep += 1
             
             DraftsManager.shared.remove(self.draft)
-            DraftsManager.save()
         } catch let error as Client.Error {
             throw Error.posting(error)
         }
@@ -74,7 +71,7 @@ class PostService: ObservableObject {
             do {
                 (data, utType) = try await getData(for: attachment)
                 currentStep += 1
-            } catch let error as AttachmentData.Error {
+            } catch let error as CompositionAttachmentData.Error {
                 throw Error.attachmentData(index: index, cause: error)
             }
             do {
@@ -88,7 +85,7 @@ class PostService: ObservableObject {
         return attachments
     }
     
-    private func getData(for attachment: DraftAttachment) async throws -> (Data, UTType) {
+    private func getData(for attachment: CompositionAttachment) async throws -> (Data, UTType) {
         return try await withCheckedThrowingContinuation { continuation in
             attachment.data.getData(features: mastodonController.instanceFeatures) { result in
                 switch result {
@@ -121,7 +118,7 @@ class PostService: ObservableObject {
     }
     
     enum Error: Swift.Error, LocalizedError {
-        case attachmentData(index: Int, cause: AttachmentData.Error)
+        case attachmentData(index: Int, cause: CompositionAttachmentData.Error)
         case attachmentUpload(index: Int, cause: Client.Error)
         case posting(Client.Error)
         

Tusker/API/ReblogService.swift

@@ -17,7 +17,7 @@ class ReblogService {
     private let status: StatusMO
     
     var hapticFeedback = true
-    var visibility: Visibility? = nil
+    var visibility: Status.Visibility? = nil
     var requireConfirmation = Preferences.shared.confirmBeforeReblog
     
     init(status: StatusMO, mastodonController: MastodonController, presenter: any TuskerNavigationDelegate) {
@@ -39,8 +39,8 @@ class ReblogService {
         let image: UIImage?
         let reblogVisibilityActions: [CustomAlertController.MenuAction]?
         if mastodonController.instanceFeatures.reblogVisibility {
-            image = UIImage(systemName: Visibility.public.unfilledImageName)
-            reblogVisibilityActions = [Visibility.unlisted, .private].map { visibility in
+            image = UIImage(systemName: Status.Visibility.public.unfilledImageName)
+            reblogVisibilityActions = [Status.Visibility.unlisted, .private].map { visibility in
                 CustomAlertController.MenuAction(title: "Reblog as \(visibility.displayName)", subtitle: visibility.subtitle, image: UIImage(systemName: visibility.unfilledImageName)) {
                     // deliberately retain a strong reference to self
                     Task {
@@ -94,7 +94,7 @@ class ReblogService {
             status.favourited = oldValue
             mastodonController.persistentContainer.statusSubject.send(status.id)
             
-            let title = oldValue ? "Error Unreblogging" : "Error Reblogging"
+            let title = oldValue ? "Error Unfavoriting" : "Error Favoriting"
             let config = ToastConfiguration(from: error, with: title, in: presenter) { toast in
                 toast.dismissToast(animated: true)
                 await self.toggleReblog()

Tusker/AppDelegate.swift

@@ -10,8 +10,6 @@ import UIKit
 import CoreData
 import OSLog
 import Sentry
-import UserAccounts
-import ComposeUI
 
 let stateRestorationLogger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "StateRestoration")
 
@@ -34,7 +32,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         if let oldSavedData = SavedDataManager.load() {
             do {
                 for account in oldSavedData.accountIDs {
-                    guard let account = UserAccountsManager.shared.getAccount(id: account) else {
+                    guard let account = LocalData.shared.getAccount(id: account) else {
                         continue
                     }
                     let controller = MastodonController.getForAccount(account)
@@ -49,16 +47,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             }
         }
 
-        DispatchQueue.global(qos: .userInitiated).async {
-            let documentsDirectory = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!
-            let oldDraftsFile = documentsDirectory.appendingPathComponent("drafts").appendingPathExtension("plist")
-            if FileManager.default.fileExists(atPath: oldDraftsFile.path) {
-                if case .failure(let error) = DraftsManager.migrate(from: oldDraftsFile) {
-                    SentrySDK.capture(error: error)
-                }
-            }
-        }
-
         return true
     }
     

Tusker/CoreData/AccountPreferences.swift

@@ -9,12 +9,11 @@
 import Foundation
 import CoreData
 import Pachyderm
-import UserAccounts
 
 @objc(AccountPreferences)
 public final class AccountPreferences: NSManagedObject {
     
-    @nonobjc class func fetchRequest(account: UserAccountInfo) -> NSFetchRequest<AccountPreferences> {
+    @nonobjc class func fetchRequest(account: LocalData.UserAccountInfo) -> NSFetchRequest<AccountPreferences> {
         let req = NSFetchRequest<AccountPreferences>(entityName: "AccountPreferences")
         req.predicate = NSPredicate(format: "accountID = %@", account.id)
         req.sortDescriptors = [NSSortDescriptor(key: "createdAt", ascending: true)]
@@ -25,17 +24,15 @@ public final class AccountPreferences: NSManagedObject {
     @NSManaged var createdAt: Date
     @NSManaged var pinnedTimelinesData: Data?
     
-    @LazilyDecoding(from: \AccountPreferences.pinnedTimelinesData, fallback: AccountPreferences.defaultPinnedTimelines)
+    @LazilyDecoding(from: \AccountPreferences.pinnedTimelinesData, fallback: [])
     var pinnedTimelines: [PinnedTimeline]
     
-    static func `default`(account: UserAccountInfo, context: NSManagedObjectContext) -> AccountPreferences {
+    static func `default`(account: LocalData.UserAccountInfo, context: NSManagedObjectContext) -> AccountPreferences {
         let prefs = AccountPreferences(context: context)
         prefs.accountID = account.id
         prefs.createdAt = Date()
-        prefs.pinnedTimelines = Self.defaultPinnedTimelines
+        prefs.pinnedTimelines = [.home, .public(local: true), .public(local: false)]
         return prefs
     }
     
-    private static let defaultPinnedTimelines = [PinnedTimeline.home, .public(local: true), .public(local: false)]
-    
 }

Tusker/CoreData/MastodonCachePersistentStore.swift

@@ -13,13 +13,12 @@ import Combine
 import OSLog
 import Sentry
 import CloudKit
-import UserAccounts
 
 fileprivate let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "PersistentStore")
 
 class MastodonCachePersistentStore: NSPersistentCloudKitContainer {
     
-    private let accountInfo: UserAccountInfo?
+    private let accountInfo: LocalData.UserAccountInfo?
     
     private static let managedObjectModel: NSManagedObjectModel = {
         let url = Bundle.main.url(forResource: "Tusker", withExtension: "momd")!
@@ -52,7 +51,7 @@ class MastodonCachePersistentStore: NSPersistentCloudKitContainer {
     let accountSubject = PassthroughSubject<String, Never>()
     let relationshipSubject = PassthroughSubject<String, Never>()
 
-    init(for accountInfo: UserAccountInfo?, transient: Bool = false) {
+    init(for accountInfo: LocalData.UserAccountInfo?, transient: Bool = false) {
         self.accountInfo = accountInfo
         
         let group = DispatchGroup()
@@ -321,7 +320,7 @@ class MastodonCachePersistentStore: NSPersistentCloudKitContainer {
     
     @discardableResult
     private func upsert(relationship: Relationship, in context: NSManagedObjectContext) -> RelationshipMO {
-        if let relationshipMO = self.relationship(forAccount: relationship.accountID, in: context) {
+        if let relationshipMO = self.relationship(forAccount: relationship.id, in: context) {
             relationshipMO.updateFrom(apiRelationship: relationship, container: self)
             return relationshipMO
         } else {
@@ -336,7 +335,7 @@ class MastodonCachePersistentStore: NSPersistentCloudKitContainer {
             let relationshipMO = self.upsert(relationship: relationship, in: context)
             self.save(context: context)
             completion?(relationshipMO)
-            self.relationshipSubject.send(relationship.accountID)
+            self.relationshipSubject.send(relationship.id)
         }
     }
     

Tusker/CoreData/RelationshipMO.swift

@@ -11,7 +11,7 @@ import CoreData
 import Pachyderm
 
 @objc(RelationshipMO)
-public final class RelationshipMO: NSManagedObject, RelationshipProtocol {
+public final class RelationshipMO: NSManagedObject {
     
     @nonobjc public class func fetchRequest() -> NSFetchRequest<RelationshipMO> {
         return NSFetchRequest<RelationshipMO>(entityName: "Relationship")
@@ -29,8 +29,6 @@ public final class RelationshipMO: NSManagedObject, RelationshipProtocol {
     @NSManaged public var showingReblogs: Bool
     @NSManaged public var account: AccountMO?
     
-    public var followRequested: Bool { requested }
-    
 }
 
 extension RelationshipMO {
@@ -45,10 +43,10 @@ extension RelationshipMO {
             return
         }
         
-        self.accountID = relationship.accountID
+        self.accountID = relationship.id
         self.blocking = relationship.blocking
         self.domainBlocking = relationship.domainBlocking
-        self.endorsed = relationship.endorsed
+        self.endorsed = relationship.endorsed ?? false
         self.followedBy = relationship.followedBy
         self.following = relationship.following
         self.muting = relationship.muting
@@ -56,6 +54,6 @@ extension RelationshipMO {
         self.requested = relationship.followRequested
         self.showingReblogs = relationship.showingReblogs
         
-        self.account = container.account(for: relationship.accountID, in: context)
+        self.account = container.account(for: relationship.id, in: context)
     }
 }

Tusker/CoreData/SavedHashtag.swift

@@ -10,7 +10,6 @@ import Foundation
 import CoreData
 import Pachyderm
 import WebURLFoundationExtras
-import UserAccounts
 
 @objc(SavedHashtag)
 public final class SavedHashtag: NSManagedObject {
@@ -19,13 +18,13 @@ public final class SavedHashtag: NSManagedObject {
         return NSFetchRequest<SavedHashtag>(entityName: "SavedHashtag")
     }
     
-    @nonobjc class func fetchRequest(account: UserAccountInfo) -> NSFetchRequest<SavedHashtag> {
+    @nonobjc class func fetchRequest(account: LocalData.UserAccountInfo) -> NSFetchRequest<SavedHashtag> {
         let req = NSFetchRequest<SavedHashtag>(entityName: "SavedHashtag")
         req.predicate = NSPredicate(format: "accountID = %@", account.id)
         return req
     }
     
-    @nonobjc class func fetchRequest(name: String, account: UserAccountInfo) -> NSFetchRequest<SavedHashtag> {
+    @nonobjc class func fetchRequest(name: String, account: LocalData.UserAccountInfo) -> NSFetchRequest<SavedHashtag> {
         let req = NSFetchRequest<SavedHashtag>(entityName: "SavedHashtag")
         req.predicate = NSPredicate(format: "name LIKE[cd] %@ AND accountID = %@", name, account.id)
         return req
@@ -38,7 +37,7 @@ public final class SavedHashtag: NSManagedObject {
 }
 
 extension SavedHashtag {
-    convenience init(hashtag: Hashtag, account: UserAccountInfo, context: NSManagedObjectContext) {
+    convenience init(hashtag: Hashtag, account: LocalData.UserAccountInfo, context: NSManagedObjectContext) {
         self.init(context: context)
         self.accountID = account.id
         self.name = hashtag.name

Tusker/CoreData/SavedInstance.swift

@@ -8,7 +8,6 @@
 
 import Foundation
 import CoreData
-import UserAccounts
 
 @objc(SavedInstance)
 public final class SavedInstance: NSManagedObject {
@@ -17,13 +16,13 @@ public final class SavedInstance: NSManagedObject {
         return NSFetchRequest<SavedInstance>(entityName: "SavedInstance")
     }
     
-    @nonobjc class func fetchRequest(account: UserAccountInfo) -> NSFetchRequest<SavedInstance> {
+    @nonobjc class func fetchRequest(account: LocalData.UserAccountInfo) -> NSFetchRequest<SavedInstance> {
         let req = NSFetchRequest<SavedInstance>(entityName: "SavedInstance")
         req.predicate = NSPredicate(format: "accountID = %@", account.id)
         return req
     }
     
-    @nonobjc class func fetchRequest(url: URL, account: UserAccountInfo) -> NSFetchRequest<SavedInstance> {
+    @nonobjc class func fetchRequest(url: URL, account: LocalData.UserAccountInfo) -> NSFetchRequest<SavedInstance> {
         let req = NSFetchRequest<SavedInstance>(entityName: "SavedInstance")
         req.predicate = NSPredicate(format: "url = %@ AND accountID = %@", url as NSURL, account.id)
         return req
@@ -35,7 +34,7 @@ public final class SavedInstance: NSManagedObject {
 }
 
 extension SavedInstance {
-    convenience init(url: URL, account: UserAccountInfo, context: NSManagedObjectContext) {
+    convenience init(url: URL, account: LocalData.UserAccountInfo, context: NSManagedObjectContext) {
         self.init(context: context)
         self.accountID = account.id
         self.url = url

Tusker/CoreData/StatusMO.swift

@@ -75,9 +75,9 @@ public final class StatusMO: NSManagedObject, StatusProtocol {
     public var pinned: Bool? { pinnedInternal }
     public var bookmarked: Bool? { bookmarkedInternal }
     
-    public var visibility: Pachyderm.Visibility {
+    public var visibility: Pachyderm.Status.Visibility {
         get {
-            Pachyderm.Visibility(rawValue: visibilityString) ?? .public
+            Pachyderm.Status.Visibility(rawValue: visibilityString) ?? .public
         }
         set {
             visibilityString = newValue.rawValue

Tusker/CoreData/TimelinePosition.swift

@@ -9,12 +9,11 @@
 import Foundation
 import CoreData
 import Pachyderm
-import UserAccounts
 
 @objc(TimelinePosition)
 public final class TimelinePosition: NSManagedObject {
     
-    @nonobjc class func fetchRequest(timeline: Timeline, account: UserAccountInfo) -> NSFetchRequest<TimelinePosition> {
+    @nonobjc class func fetchRequest(timeline: Timeline, account: LocalData.UserAccountInfo) -> NSFetchRequest<TimelinePosition> {
         let req = NSFetchRequest<TimelinePosition>(entityName: "TimelinePosition")
         req.predicate = NSPredicate(format: "accountID = %@ AND timelineKind = %@", account.id, toTimelineKind(timeline))
         req.sortDescriptors = [NSSortDescriptor(key: "createdAt", ascending: true)]
@@ -35,7 +34,7 @@ public final class TimelinePosition: NSManagedObject {
         set { timelineKind = toTimelineKind(newValue) }
     }
     
-    convenience init(timeline: Timeline, account: UserAccountInfo, context: NSManagedObjectContext) {
+    convenience init(timeline: Timeline, account: LocalData.UserAccountInfo, context: NSManagedObjectContext) {
         self.init(context: context)
         self.timeline = timeline
         self.accountID = account.id

Tusker/Extensions/Array+Uniques.swift

@@ -11,10 +11,10 @@ import Foundation
 extension Array {
     func uniques<ID: Hashable>(by identify: (Element) -> ID) -> [Element] {
         var uniques = Set<Hashed<Element, ID>>()
-        for (index, elem) in self.enumerated() {
-            uniques.insert(Hashed(element: elem, id: identify(elem), origIndex: index))
+        for elem in self {
+            uniques.insert(Hashed(element: elem, id: identify(elem)))
         }
-        return uniques.sorted(by: { $0.origIndex < $1.origIndex }).map(\.element)
+        return uniques.map(\.element)
     }
 }
 
@@ -27,7 +27,6 @@ extension Array where Element: Hashable {
 fileprivate struct Hashed<Element, ID: Hashable>: Hashable {
     let element: Element
     let id: ID
-    let origIndex: Int
     
     static func ==(lhs: Self, rhs: Self) -> Bool {
         return lhs.id == rhs.id

Tusker/Extensions/Date+TimeAgo.swift

@@ -7,7 +7,6 @@
 //
 
 import Foundation
-import TuskerComponents
 
 extension Date {
 
@@ -35,7 +34,30 @@ extension Date {
     }
     
     func timeAgoString() -> String {
-        self.formatted(.abbreviatedTimeAgo)
+        let (amount, component) = timeAgo()
+        
+        switch component {
+        case .year:
+            return "\(amount)y"
+        case .month:
+            return "\(amount)mo"
+        case .weekOfYear:
+            return "\(amount)w"
+        case .day:
+            return "\(amount)d"
+        case .hour:
+            return "\(amount)h"
+        case .minute:
+            return "\(amount)m"
+        case .second:
+            if amount >= 3 {
+                return "\(amount)s"
+            } else {
+                return "Now"
+            }
+        default:
+            fatalError("Unexpected component: \(component)")
+        }
     }
     
 }

Tusker/Extensions/UIBackgroundConfiguration+AppColors.swift

@@ -1,35 +0,0 @@
-//
-//  UIBackgroundConfiguration+AppColors.swift
-//  Tusker
-//
-//  Created by Shadowfacts on 4/16/23.
-//  Copyright © 2023 Shadowfacts. All rights reserved.
-//
-
-import UIKit
-
-extension UIBackgroundConfiguration {
-    static func appListPlainCell(for state: UICellConfigurationState) -> UIBackgroundConfiguration {
-        var config = UIBackgroundConfiguration.listPlainCell().updated(for: state)
-        if state.isFocused {
-            // use default
-        } else if state.isHighlighted || state.isSelected {
-            config.backgroundColor = .appSelectedCellBackground
-        } else {
-            config.backgroundColor = .appBackground
-        }
-        return config
-    }
-    
-    static func appListGroupedCell(for state: UICellConfigurationState) -> UIBackgroundConfiguration {
-        var config = UIBackgroundConfiguration.listGroupedCell().updated(for: state)
-        if state.isFocused {
-            // use default
-        } else if state.isHighlighted || state.isSelected {
-            config.backgroundColor = .appSelectedCellBackground
-        } else {
-            config.backgroundColor = .appGroupedCellBackground
-        }
-        return config
-    }
-}

Tusker/Extensions/Visibility+Helpers.swift

@@ -1,33 +1,16 @@
 //
-//  Visibility.swift
-//  Pachyderm
+//  Visibility+String.swift
+//  Tusker
 //
-//  Created by Shadowfacts on 3/7/23.
+//  Created by Shadowfacts on 8/29/18.
+//  Copyright © 2018 Shadowfacts. All rights reserved.
 //
 
-import Foundation
+import Pachyderm
+import UIKit
 
-public enum Visibility: String, Sendable, Codable, CaseIterable, Comparable {
-    case `public`
-    case unlisted
-    case `private`
-    case direct
+extension Status.Visibility {
     
-    public static func < (lhs: Visibility, rhs: Visibility) -> Bool {
-        switch (lhs, rhs) {
-        case (.direct, .public), (.private, .public), (.unlisted, .public):
-            return true
-        case (.direct, .unlisted), (.private, .unlisted):
-            return true
-        case (.direct, .private):
-            return true
-        default:
-            return false
-        }
-    }
-}
-
-public extension Visibility {
     var displayName: String {
         switch self {
         case .public:
@@ -79,4 +62,20 @@ public extension Visibility {
             return "envelope"
         }
     }
+    
+}
+
+extension Status.Visibility: Comparable {
+    public static func < (lhs: Pachyderm.Status.Visibility, rhs: Pachyderm.Status.Visibility) -> Bool {
+        switch (lhs, rhs) {
+        case (.direct, .public), (.private, .public), (.unlisted, .public):
+            return true
+        case (.direct, .unlisted), (.private, .unlisted):
+            return true
+        case (.direct, .private):
+            return true
+        default:
+            return false
+        }
+    }
 }

Tusker/HTMLConverter.swift

@@ -32,7 +32,7 @@ struct HTMLConverter {
         let doc = try! SwiftSoup.parseBodyFragment(html)
         let body = doc.body()!
         
-        if let attributedText = attributedTextForHTMLNode(body) {
+        let attributedText = attributedTextForHTMLNode(body)
         let mutAttrString = NSMutableAttributedString(attributedString: attributedText)
         mutAttrString.trimTrailingCharactersInSet(.whitespacesAndNewlines)
         mutAttrString.collapseWhitespace()
@@ -40,12 +40,9 @@ struct HTMLConverter {
         mutAttrString.addAttribute(.paragraphStyle, value: paragraphStyle, range: mutAttrString.fullRange)
         
         return mutAttrString
-        } else {
-            return NSAttributedString()
-        }
     }
     
-    private func attributedTextForHTMLNode(_ node: Node, usePreformattedText: Bool = false) -> NSAttributedString? {
+    private func attributedTextForHTMLNode(_ node: Node, usePreformattedText: Bool = false) -> NSAttributedString {
         switch node {
         case let node as TextNode:
             let text: String
@@ -68,9 +65,7 @@ struct HTMLConverter {
                     }
                 }
                 
-                if let childText = attributedTextForHTMLNode(child, usePreformattedText: usePreformattedText || node.tagName() == "pre") {
-                    attributed.append(childText)
-                }
+                attributed.append(attributedTextForHTMLNode(child, usePreformattedText: usePreformattedText || node.tagName() == "pre"))
                 
                 if appendEllipsis {
                     attributed.append(NSAttributedString("…"))
@@ -139,8 +134,10 @@ struct HTMLConverter {
             }
             
             return attributed
+        case is DataNode:
+            return NSAttributedString()
         default:
-            return nil
+            fatalError("Unexpected node type \(type(of: node))")
         }
     }
     

Tusker/LocalData.swift

@@ -1,16 +1,18 @@
 //
-//  UserAccountsManager.swift
-//  UserAccounts
+//  LocalData.swift
+//  Tusker
 //
-//  Created by Shadowfacts on 3/5/23.
+//  Created by Shadowfacts on 8/18/18.
+//  Copyright © 2018 Shadowfacts. All rights reserved.
 //
 
 import Foundation
 import Combine
+import CryptoKit
 
-public class UserAccountsManager: ObservableObject {
+class LocalData: ObservableObject {
     
-    public static let shared = UserAccountsManager()
+    static let shared = LocalData()
     
     let defaults: UserDefaults
     
@@ -36,7 +38,7 @@ public class UserAccountsManager: ObservableObject {
     }
     
     private let accountsKey = "accounts"
-    public private(set) var accounts: [UserAccountInfo] {
+    private(set) var accounts: [UserAccountInfo] {
         get {
             if let array = defaults.array(forKey: accountsKey) as? [[String: String]] {
                 return array.compactMap(UserAccountInfo.init(userDefaultsDict:))
@@ -64,7 +66,7 @@ public class UserAccountsManager: ObservableObject {
     }
     
     private let mostRecentAccountKey = "mostRecentAccount"
-    public private(set) var mostRecentAccountID: String? {
+    private(set) var mostRecentAccountID: String? {
         get {
             return defaults.string(forKey: mostRecentAccountKey)
         }
@@ -107,13 +109,13 @@ public class UserAccountsManager: ObservableObject {
         usesAccountIDHashes = true
     }
     
-    // MARK: Account Management
+    // MARK: - Account Management
     
-    public var onboardingComplete: Bool {
+    var onboardingComplete: Bool {
         return !accounts.isEmpty
     }
     
-    public func addAccount(instanceURL url: URL, clientID: String, clientSecret secret: String, username: String?, accessToken: String) -> UserAccountInfo {
+    func addAccount(instanceURL url: URL, clientID: String, clientSecret secret: String, username: String?, accessToken: String) -> UserAccountInfo {
         var accounts = self.accounts
         if let index = accounts.firstIndex(where: { $0.instanceURL == url && $0.username == username }) {
             accounts.remove(at: index)
@@ -124,15 +126,15 @@ public class UserAccountsManager: ObservableObject {
         return info
     }
     
-    public func removeAccount(_ info: UserAccountInfo) {
+    func removeAccount(_ info: UserAccountInfo) {
         accounts.removeAll(where: { $0.id == info.id })
     }
     
-    public func getAccount(id: String) -> UserAccountInfo? {
+    func getAccount(id: String) -> UserAccountInfo? {
         return accounts.first(where: { $0.id == id })
     }
     
-    public func getMostRecentAccount() -> UserAccountInfo? {
+    func getMostRecentAccount() -> UserAccountInfo? {
         guard onboardingComplete else { return nil }
         let mostRecent: UserAccountInfo?
         if let id = mostRecentAccountID {
@@ -143,13 +145,86 @@ public class UserAccountsManager: ObservableObject {
         return mostRecent ?? accounts.first!
     }
     
-    public func setMostRecentAccount(_ account: UserAccountInfo?) {
+    func setMostRecentAccount(_ account: UserAccountInfo?) {
         mostRecentAccountID = account?.id
     }
 
 }
 
-public extension Notification.Name {
+extension LocalData {
+    struct UserAccountInfo: Equatable, Hashable {
+        let id: String
+        let instanceURL: URL
+        let clientID: String
+        let clientSecret: String
+        private(set) var username: String!
+        let accessToken: String
+        
+        fileprivate static let tempAccountID = "temp"
+        
+        fileprivate static func id(instanceURL: URL, username: String?) -> String {
+            // We hash the instance host and username to form the account ID
+            // so that account IDs will match across devices, allowing for data syncing and handoff.
+            var hasher = SHA256()
+            hasher.update(data: instanceURL.host!.data(using: .utf8)!)
+            if let username {
+                hasher.update(data: username.data(using: .utf8)!)
+            }
+            return Data(hasher.finalize()).base64EncodedString()
+        }
+        
+        /// Only to be used for temporary MastodonController needed to fetch own account info and create final UserAccountInfo with real username
+        init(tempInstanceURL instanceURL: URL, clientID: String, clientSecret: String, accessToken: String) {
+            self.id = UserAccountInfo.tempAccountID
+            self.instanceURL = instanceURL
+            self.clientID = clientID
+            self.clientSecret = clientSecret
+            self.accessToken = accessToken
+        }
+        
+        fileprivate init(instanceURL: URL, clientID: String, clientSecret: String, username: String? = nil, accessToken: String) {
+            self.id = UserAccountInfo.id(instanceURL: instanceURL, username: username)
+            self.instanceURL = instanceURL
+            self.clientID = clientID
+            self.clientSecret = clientSecret
+            self.username = username
+            self.accessToken = accessToken
+        }
+        
+        fileprivate init?(userDefaultsDict dict: [String: String]) {
+            guard let id = dict["id"],
+                let instanceURL = dict["instanceURL"],
+                let url = URL(string: instanceURL),
+                let clientID = dict["clientID"],
+                let secret = dict["clientSecret"],
+                let accessToken = dict["accessToken"] else {
+                    return nil
+            }
+            self.id = id
+            self.instanceURL = url
+            self.clientID = clientID
+            self.clientSecret = secret
+            self.username = dict["username"]
+            self.accessToken = accessToken
+        }
+        
+        /// A filename-safe string for this account
+        var persistenceKey: String {
+            // slashes are not allowed in the persistent store coordinator name
+            id.replacingOccurrences(of: "/", with: "_")
+        }
+        
+        func hash(into hasher: inout Hasher) {
+            hasher.combine(id)
+        }
+        
+        static func ==(lhs: UserAccountInfo, rhs: UserAccountInfo) -> Bool {
+            return lhs.id == rhs.id
+        }
+    }
+}
+
+extension Notification.Name {
     static let userLoggedOut = Notification.Name("Tusker.userLoggedOut")
     static let addAccount = Notification.Name("Tusker.addAccount")
     static let activateAccount = Notification.Name("Tusker.activateAccount")

Tusker/MenuController.swift

@@ -18,22 +18,33 @@ struct MenuController {
         return UIKeyCommand(title: "Refresh", action: #selector(RefreshableViewController.refresh), input: "r", modifierFlags: .command, discoverabilityTitle: discoverabilityTitle)
     }
     
-    static func sidebarCommand(item: MainSidebarViewController.Item, command: String, action: Selector) -> UIKeyCommand {
+    static func sidebarCommand(item: MainSidebarViewController.Item, command: String) -> UIKeyCommand {
+        let data: Any
+        if case let .tab(tab) = item {
+            data = tab.rawValue
+        } else if case .explore = item {
+            data = "search"
+        } else if case .bookmarks = item {
+            data = "bookmarks"
+        } else {
+            fatalError()
+        }
         return UIKeyCommand(
             title: item.title,
             image: UIImage(systemName: item.imageName!),
-            action: action,
+            action: #selector(MainSplitViewController.handleSidebarItemCommand(_:)),
             input: command,
-            modifierFlags: .command
+            modifierFlags: .command,
+            propertyList: data
         )
     }
     
     static let sidebarItemKeyCommands: [UIKeyCommand] = [
-        sidebarCommand(item: .tab(.timelines), command: "1", action: #selector(MainSplitViewController.handleSidebarCommandTimelines)),
-        sidebarCommand(item: .tab(.notifications), command: "2", action: #selector(MainSplitViewController.handleSidebarCommandNotifications)),
-        sidebarCommand(item: .explore, command: "3", action: #selector(MainSplitViewController.handleSidebarCommandExplore)),
-        sidebarCommand(item: .bookmarks, command: "4", action: #selector(MainSplitViewController.handleSidebarCommandBookmarks)),
-        sidebarCommand(item: .tab(.myProfile), command: "5", action: #selector(MainSplitViewController.handleSidebarCommandMyProfile)),
+        sidebarCommand(item: .tab(.timelines), command: "1"),
+        sidebarCommand(item: .tab(.notifications), command: "2"),
+        sidebarCommand(item: .explore, command: "3"),
+        sidebarCommand(item: .bookmarks, command: "4"),
+        sidebarCommand(item: .tab(.myProfile), command: "5"),
     ]
     
     static let nextSubTabCommand = UIKeyCommand(title: "Next Sub Tab", action: #selector(TabbedPageViewController.selectNextPage), input: "]", modifierFlags: [.command, .shift])

Tusker/Models/CompositionAttachment.swift

@@ -1,6 +1,6 @@
 //
-//  DraftAttachment.swift
-//  ComposeUI
+//  CompositionAttachment.swift
+//  Tusker
 //
 //  Created by Shadowfacts on 3/14/20.
 //  Copyright © 2020 Shadowfacts. All rights reserved.
@@ -10,28 +10,28 @@ import Foundation
 import UIKit
 import UniformTypeIdentifiers
 
-public final class DraftAttachment: NSObject, Codable, ObservableObject, Identifiable {
+final class CompositionAttachment: NSObject, Codable, ObservableObject {
     static let typeIdentifier = "space.vaccor.Tusker.composition-attachment"
     
-    public let id: UUID
-    @Published var data: AttachmentData
+    let id: UUID
+    @Published var data: CompositionAttachmentData
     @Published var attachmentDescription: String
     
-    init(data: AttachmentData, description: String = "") {
+    init(data: CompositionAttachmentData, description: String = "") {
         self.id = UUID()
         self.data = data
         self.attachmentDescription = description
     }
     
-    public init(from decoder: Decoder) throws {
+    init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         
         self.id = try container.decode(UUID.self, forKey: .id)
-        self.data = try container.decode(AttachmentData.self, forKey: .data)
+        self.data = try container.decode(CompositionAttachmentData.self, forKey: .data)
         self.attachmentDescription = try container.decode(String.self, forKey: .attachmentDescription)
     }
     
-    public func encode(to encoder: Encoder) throws {
+    func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
         
         try container.encode(id, forKey: .id)
@@ -39,7 +39,7 @@ public final class DraftAttachment: NSObject, Codable, ObservableObject, Identif
         try container.encode(attachmentDescription, forKey: .attachmentDescription)
     }
     
-    static func ==(lhs: DraftAttachment, rhs: DraftAttachment) -> Bool {
+    static func ==(lhs: CompositionAttachment, rhs: CompositionAttachment) -> Bool {
         return lhs.id == rhs.id
     }
     
@@ -50,27 +50,29 @@ public final class DraftAttachment: NSObject, Codable, ObservableObject, Identif
     }
 }
 
+extension CompositionAttachment: Identifiable {}
+
 private let imageType = UTType.image.identifier
 private let mp4Type = UTType.mpeg4Movie.identifier
 private let quickTimeType = UTType.quickTimeMovie.identifier
 private let dataType = UTType.data.identifier
 private let gifType = UTType.gif.identifier
 
-extension DraftAttachment: NSItemProviderWriting {
-    public static var writableTypeIdentifiersForItemProvider: [String] {
+extension CompositionAttachment: NSItemProviderWriting {
+    static var writableTypeIdentifiersForItemProvider: [String] {
         [typeIdentifier]
     }
     
-    public func loadData(withTypeIdentifier typeIdentifier: String, forItemProviderCompletionHandler completionHandler: @escaping (Data?, Error?) -> Void) -> Progress? {
-        if typeIdentifier == DraftAttachment.typeIdentifier {
+    func loadData(withTypeIdentifier typeIdentifier: String, forItemProviderCompletionHandler completionHandler: @escaping (Data?, Error?) -> Void) -> Progress? {
+        if typeIdentifier == CompositionAttachment.typeIdentifier {
             do {
                 completionHandler(try PropertyListEncoder().encode(self), nil)
             } catch {
                 completionHandler(nil, error)
             }
-        } else {
-            completionHandler(nil, ItemProviderError.incompatibleTypeIdentifier)
         }
+        
+        completionHandler(nil, ItemProviderError.incompatibleTypeIdentifier)
         return nil
     }
     
@@ -86,30 +88,30 @@ extension DraftAttachment: NSItemProviderWriting {
     }
 }
 
-extension DraftAttachment: NSItemProviderReading {
-    public static var readableTypeIdentifiersForItemProvider: [String] {
+extension CompositionAttachment: NSItemProviderReading {
+    static var readableTypeIdentifiersForItemProvider: [String] {
         // todo: is there a better way of handling movies than manually adding all possible UTI types?
         // just using kUTTypeMovie doesn't work, because we need the actually type in order to get the file extension
         // without the file extension, getting the thumbnail and exporting the video for attachment upload fails
         [typeIdentifier] + UIImage.readableTypeIdentifiersForItemProvider + [mp4Type, quickTimeType] + NSURL.readableTypeIdentifiersForItemProvider
     }
     
-    public static func object(withItemProviderData data: Data, typeIdentifier: String) throws -> DraftAttachment {
-        if typeIdentifier == DraftAttachment.typeIdentifier {
-            return try PropertyListDecoder().decode(DraftAttachment.self, from: data)
+    static func object(withItemProviderData data: Data, typeIdentifier: String) throws -> CompositionAttachment {
+        if typeIdentifier == CompositionAttachment.typeIdentifier {
+            return try PropertyListDecoder().decode(CompositionAttachment.self, from: data)
         } else if typeIdentifier == gifType {
-            return DraftAttachment(data: .gif(data))
-        } else if UIImage.readableTypeIdentifiersForItemProvider.contains(typeIdentifier) {
-            return DraftAttachment(data: .image(data, originalType: UTType(typeIdentifier)!))
+            return CompositionAttachment(data: .gif(data))
+        } else if UIImage.readableTypeIdentifiersForItemProvider.contains(typeIdentifier), let image = try? UIImage.object(withItemProviderData: data, typeIdentifier: typeIdentifier) {
+            return CompositionAttachment(data: .image(image))
         } else if let type = UTType(typeIdentifier), type == .mpeg4Movie || type == .quickTimeMovie {
             let temporaryDirectoryURL = URL(fileURLWithPath: NSTemporaryDirectory(), isDirectory: true)
             let temporaryFileName = ProcessInfo().globallyUniqueString
             let fileExt = type.preferredFilenameExtension!
             let temporaryFileURL = temporaryDirectoryURL.appendingPathComponent(temporaryFileName).appendingPathExtension(fileExt)
             try data.write(to: temporaryFileURL)
-            return DraftAttachment(data: .video(temporaryFileURL))
+            return CompositionAttachment(data: .video(temporaryFileURL))
         } else if NSURL.readableTypeIdentifiersForItemProvider.contains(typeIdentifier), let url = try? NSURL.object(withItemProviderData: data, typeIdentifier: typeIdentifier) as URL {
-            return DraftAttachment(data: .video(url))
+            return CompositionAttachment(data: .video(url))
         } else {
             throw ItemProviderError.incompatibleTypeIdentifier
         }

Tusker/Models/CompositionAttachmentData.swift

@@ -1,6 +1,6 @@
 //
-//  AttachmentData.swift
-//  ComposeUI
+//  CompositionAttachmentData.swift
+//  Tusker
 //
 //  Created by Shadowfacts on 1/1/20.
 //  Copyright © 2020 Shadowfacts. All rights reserved.
@@ -10,11 +10,10 @@ import UIKit
 import Photos
 import UniformTypeIdentifiers
 import PencilKit
-import InstanceFeatures
 
-enum AttachmentData {
+enum CompositionAttachmentData {
     case asset(PHAsset)
-    case image(Data, originalType: UTType)
+    case image(UIImage)
     case video(URL)
     case drawing(PKDrawing)
     case gif(Data)
@@ -23,7 +22,7 @@ enum AttachmentData {
         switch self {
         case let .asset(asset):
             return asset.attachmentType!
-        case .image(_, originalType: _):
+        case .image(_):
             return .image
         case .video(_):
             return .video
@@ -54,21 +53,11 @@ enum AttachmentData {
     
     func getData(features: InstanceFeatures, skipAllConversion: Bool = false, completion: @escaping (Result<(Data, UTType), Error>) -> Void) {
         switch self {
-        case let .image(originalData, originalType):
-            let data: Data
-            let type: UTType
-            switch originalType {
-            case .png, .jpeg:
-                data = originalData
-                type =  originalType
-            default:
-                let image = UIImage(data: originalData)!
+        case let .image(image):
+            // Export as JPEG instead of PNG, otherweise photos straight from the camera are too large
+            // for Mastodon in its default configuration (max of 10MB).
             // The quality of 0.8 was chosen completely arbitrarily, it may need to be tuned in the future.
-                data = image.jpegData(compressionQuality: 0.8)!
-                type = .jpeg
-            }
-            let processed = processImageData(data, type: type, features: features, skipAllConversion: skipAllConversion)
-            completion(.success(processed))
+            completion(.success((image.jpegData(compressionQuality: 0.8)!, .jpeg)))
         case let .asset(asset):
             if asset.mediaType == .image {
                 let options = PHImageRequestOptions()
@@ -77,12 +66,38 @@ enum AttachmentData {
                 options.resizeMode = .none
                 options.isNetworkAccessAllowed = true
                 PHImageManager.default().requestImageDataAndOrientation(for: asset, options: options) { (data, dataUTI, orientation, info) in
-                    guard let data = data, let dataUTI = dataUTI else {
+                    guard var data = data, let dataUTI = dataUTI else {
                         completion(.failure(.missingData))
                         return
                     }
-                    let processed = processImageData(data, type: UTType(dataUTI)!, features: features, skipAllConversion: skipAllConversion)
-                    completion(.success(processed))
+                    
+                    guard !skipAllConversion else {
+                        completion(.success((data, UTType(dataUTI)!)))
+                        return
+                    }
+                    
+                    let utType: UTType
+                    let image = CIImage(data: data)!
+                    let needsColorSpaceConversion = features.needsWideColorGamutHack && image.colorSpace?.name != CGColorSpace.sRGB
+    
+                    // neither Mastodon nor Pleroma handles HEIC well, so convert to JPEG
+                    // they also do a bad job converting wide color gamut images (they seem to just drop the profile, letting the wide-gamut values be reinterprete as sRGB)
+                    // if that changes in the future, we'll need to pass the InstanceFeatures in here somehow and gate the conversion
+                    if needsColorSpaceConversion || dataUTI == "public.heic" {
+                        let context = CIContext()
+                        let colorSpace = needsColorSpaceConversion || image.colorSpace != nil ? CGColorSpace(name: CGColorSpace.sRGB)! : image.colorSpace!
+                        if dataUTI == "public.png" {
+                            data = context.pngRepresentation(of: image, format: .ARGB8, colorSpace: colorSpace)!
+                            utType = .png
+                        } else {
+                            data = context.jpegRepresentation(of: image, colorSpace: colorSpace)!
+                            utType = .jpeg
+                        }
+                    } else {
+                        utType = UTType(dataUTI)!
+                    }
+    
+                    completion(.success((data, utType)))
                 }
             } else if asset.mediaType == .video {
                 let options = PHVideoRequestOptions()
@@ -91,7 +106,7 @@ enum AttachmentData {
                 options.version = .current
                 PHImageManager.default().requestExportSession(forVideo: asset, options: options, exportPreset: AVAssetExportPresetHighestQuality) { (exportSession, info) in
                     if let exportSession = exportSession {
-                        AttachmentData.exportVideoData(session: exportSession, completion: completion)
+                        CompositionAttachmentData.exportVideoData(session: exportSession, completion: completion)
                     } else if let error = info?[PHImageErrorKey] as? Error {
                         completion(.failure(.videoExport(error)))
                     } else {
@@ -107,7 +122,7 @@ enum AttachmentData {
                 completion(.failure(.noVideoExportSession))
                 return
             }
-            AttachmentData.exportVideoData(session: session, completion: completion)
+            CompositionAttachmentData.exportVideoData(session: session, completion: completion)
             
         case let .drawing(drawing):
             let image = drawing.imageInLightMode(from: drawing.bounds, scale: 1)
@@ -117,33 +132,6 @@ enum AttachmentData {
         }
     }
     
-    private func processImageData(_ data: Data, type: UTType, features: InstanceFeatures, skipAllConversion: Bool) -> (Data, UTType) {
-        guard !skipAllConversion else {
-            return (data, type)
-        }
-        
-        var data = data
-        var type = type
-        let image = CIImage(data: data)!
-        let needsColorSpaceConversion = features.needsWideColorGamutHack && image.colorSpace?.name != CGColorSpace.sRGB
-        
-        // neither Mastodon nor Pleroma handles HEIC well, so convert to JPEG
-        // they also do a bad job converting wide color gamut images (they seem to just drop the profile, letting the wide-gamut values be reinterprete as sRGB)
-        // if that changes in the future, we'll need to pass the InstanceFeatures in here somehow and gate the conversion
-        if needsColorSpaceConversion || type == .heic {
-            let context = CIContext()
-            let colorSpace = needsColorSpaceConversion || image.colorSpace != nil ? CGColorSpace(name: CGColorSpace.sRGB)! : image.colorSpace!
-            if type == .png {
-                data = context.pngRepresentation(of: image, format: .ARGB8, colorSpace: colorSpace)!
-            } else {
-                data = context.jpegRepresentation(of: image, colorSpace: colorSpace)!
-                type = .jpeg
-            }
-        }
-        
-        return (data, type)
-    }
-    
     private static func exportVideoData(session: AVAssetExportSession, completion: @escaping (Result<(Data, UTType), Error>) -> Void) {
         session.outputFileType = .mp4
         session.outputURL = FileManager.default.temporaryDirectory.appendingPathComponent("exported_video_\(UUID())").appendingPathExtension("mp4")
@@ -184,7 +172,7 @@ enum AttachmentData {
 }
 
 extension PHAsset {
-    var attachmentType: AttachmentData.AttachmentType? {
+    var attachmentType: CompositionAttachmentData.AttachmentType? {
         switch self.mediaType {
         case .image:
             return .image
@@ -196,7 +184,7 @@ extension PHAsset {
     }
 }
 
-extension AttachmentData: Codable {
+extension CompositionAttachmentData: Codable {
     func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
         
@@ -204,18 +192,17 @@ extension AttachmentData: Codable {
         case let .asset(asset):
             try container.encode("asset", forKey: .type)
             try container.encode(asset.localIdentifier, forKey: .assetIdentifier)
-        case let .image(originalData, originalType):
+        case let .image(image):
             try container.encode("image", forKey: .type)
-            try container.encode(originalType, forKey: .imageType)
-            try container.encode(originalData, forKey: .imageData)
+            try container.encode(image.pngData()!, forKey: .imageData)
         case .video(_):
-            throw EncodingError.invalidValue(self, EncodingError.Context(codingPath: encoder.codingPath, debugDescription: "video CompositionAttachments cannot be encoded"))
+            throw EncodingError.invalidValue(self, EncodingError.Context(codingPath: [], debugDescription: "video CompositionAttachments cannot be encoded"))
         case let .drawing(drawing):
             try container.encode("drawing", forKey: .type)
             let drawingData = drawing.dataRepresentation()
             try container.encode(drawingData, forKey: .drawing)
         case .gif(_):
-            throw EncodingError.invalidValue(self, EncodingError.Context(codingPath: encoder.codingPath, debugDescription: "gif CompositionAttachments cannot be encoded"))
+            throw EncodingError.invalidValue(self, EncodingError.Context(codingPath: [], debugDescription: "gif CompositionAttachments cannot be encoded"))
         }
     }
     
@@ -230,16 +217,10 @@ extension AttachmentData: Codable {
             }
             self = .asset(asset)
         case "image":
-            let data = try container.decode(Data.self, forKey: .imageData)
-            if let type = try container.decodeIfPresent(UTType.self, forKey: .imageType) {
-                self = .image(data, originalType: type)
-            } else {
-                guard let image = UIImage(data: data) else {
-                    throw DecodingError.dataCorruptedError(forKey: .imageData, in: container, debugDescription: "CompositionAttachment data could not be decoded into UIImage")
-                }
-                let jpegData = image.jpegData(compressionQuality: 1)!
-                self = .image(jpegData, originalType: .jpeg)
+            guard let image = UIImage(data: try container.decode(Data.self, forKey: .imageData)) else {
+                throw DecodingError.dataCorruptedError(forKey: .imageData, in: container, debugDescription: "Could not decode UIImage from image data")
             }
+            self = .image(image)
         case "drawing":
             let drawingData = try container.decode(Data.self, forKey: .drawing)
             let drawing = try PKDrawing(data: drawingData)
@@ -252,7 +233,6 @@ extension AttachmentData: Codable {
     enum CodingKeys: CodingKey {
         case type
         case imageData
-        case imageType
         /// The local identifier of the PHAsset for this attachment
         case assetIdentifier
         /// The PKDrawing object for this attachment.
@@ -260,13 +240,13 @@ extension AttachmentData: Codable {
     }
 }
 
-extension AttachmentData: Equatable {
-    static func ==(lhs: AttachmentData, rhs: AttachmentData) -> Bool {
+extension CompositionAttachmentData: Equatable {
+    static func ==(lhs: CompositionAttachmentData, rhs: CompositionAttachmentData) -> Bool {
         switch (lhs, rhs) {
         case let (.asset(a), .asset(b)):
             return a.localIdentifier == b.localIdentifier
-        case let (.image(a, originalType: aType), .image(b, originalType: bType)):
-            return a == b && aType == bType
+        case let (.image(a), .image(b)):
+            return a == b
         case let (.video(a), .video(b)):
             return a == b
         case let (.drawing(a), .drawing(b)):

Tusker/Models/Draft.swift

@@ -1,62 +1,55 @@
 //
 //  Draft.swift
-//  ComposeUI
+//  Tusker
 //
 //  Created by Shadowfacts on 8/18/20.
 //  Copyright © 2020 Shadowfacts. All rights reserved.
 //
 
 import Foundation
-import Combine
 import Pachyderm
 
-public class Draft: Codable, Identifiable, ObservableObject {
-    public let id: UUID
+class Draft: Codable, ObservableObject {
+    let id: UUID
     var lastModified: Date
     
-    @Published public var accountID: String
-    @Published public var text: String
-    @Published public var contentWarningEnabled: Bool
-    @Published public var contentWarning: String
-    @Published public var attachments: [DraftAttachment]
-    @Published public var inReplyToID: String?
-    @Published public var visibility: Visibility
-    @Published public var poll: Poll?
-    @Published public var localOnly: Bool
+    @Published var accountID: String
+    @Published var text: String
+    @Published var contentWarningEnabled: Bool
+    @Published var contentWarning: String
+    @Published var attachments: [CompositionAttachment]
+    @Published var inReplyToID: String?
+    @Published var visibility: Status.Visibility
+    @Published var poll: Poll?
+    @Published var localOnly: Bool
     
     var initialText: String
     
-    public var hasContent: Bool {
+    var hasContent: Bool {
         (!text.isEmpty && text != initialText) ||
             (contentWarningEnabled && !contentWarning.isEmpty) ||
             attachments.count > 0 ||
             poll?.hasContent == true
     }
     
-    public init(
-        accountID: String,
-        text: String,
-        contentWarning: String,
-        inReplyToID: String?,
-        visibility: Visibility,
-        localOnly: Bool
-    ) {
+    init(accountID: String) {
         self.id = UUID()
         self.lastModified = Date()
         
         self.accountID = accountID
-        self.text = text
-        self.contentWarning = contentWarning
-        self.contentWarningEnabled = !contentWarning.isEmpty
+        self.text = ""
+        self.contentWarningEnabled = false
+        self.contentWarning = ""
         self.attachments = []
-        self.inReplyToID = inReplyToID
-        self.visibility = visibility
-        self.localOnly = localOnly
+        self.inReplyToID = nil
+        self.visibility = Preferences.shared.defaultPostVisibility
+        self.poll = nil
+        self.localOnly = false
         
-        self.initialText = text
+        self.initialText = ""
     }
     
-    public required init(from decoder: Decoder) throws {
+    required init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         
         self.id = try container.decode(UUID.self, forKey: .id)
@@ -66,16 +59,16 @@ public class Draft: Codable, Identifiable, ObservableObject {
         self.text = try container.decode(String.self, forKey: .text)
         self.contentWarningEnabled = try container.decode(Bool.self, forKey: .contentWarningEnabled)
         self.contentWarning = try container.decode(String.self, forKey: .contentWarning)
-        self.attachments = try container.decode([DraftAttachment].self, forKey: .attachments)
+        self.attachments = try container.decode([CompositionAttachment].self, forKey: .attachments)
         self.inReplyToID = try container.decode(String?.self, forKey: .inReplyToID)
-        self.visibility = try container.decode(Visibility.self, forKey: .visibility)
+        self.visibility = try container.decode(Status.Visibility.self, forKey: .visibility)
         self.poll = try container.decode(Poll?.self, forKey: .poll)
         self.localOnly = try container.decodeIfPresent(Bool.self, forKey: .localOnly) ?? false
         
         self.initialText = try container.decode(String.self, forKey: .initialText)
     }
     
-    public func encode(to encoder: Encoder) throws {
+    func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
         
         try container.encode(id, forKey: .id)
@@ -96,11 +89,13 @@ public class Draft: Codable, Identifiable, ObservableObject {
 }
 
 extension Draft: Equatable {
-    public static func ==(lhs: Draft, rhs: Draft) -> Bool {
+    static func ==(lhs: Draft, rhs: Draft) -> Bool {
         return lhs.id == rhs.id
     }
 }
 
+extension Draft: Identifiable {}
+
 extension Draft {
     enum CodingKeys: String, CodingKey {
         case id
@@ -121,29 +116,29 @@ extension Draft {
 }
 
 extension Draft {
-    public class Poll: Codable, ObservableObject {
-        @Published public var options: [Option]
-        @Published public var multiple: Bool
-        @Published public var duration: TimeInterval
+    class Poll: Codable, ObservableObject {
+        @Published var options: [Option]
+        @Published var multiple: Bool
+        @Published var duration: TimeInterval
         
         var hasContent: Bool {
             options.contains { !$0.text.isEmpty }
         }
         
-        public init() {
+        init() {
             self.options = [Option(""), Option("")]
             self.multiple = false
             self.duration = 24 * 60 * 60 // 1 day
         }
         
-        public required init(from decoder: Decoder) throws {
+        required init(from decoder: Decoder) throws {
             let container = try decoder.container(keyedBy: CodingKeys.self)
             self.options = try container.decode([Option].self, forKey: .options)
             self.multiple = try container.decode(Bool.self, forKey: .multiple)
             self.duration = try container.decode(TimeInterval.self, forKey: .duration)
         }
         
-        public func encode(to encoder: Encoder) throws {
+        func encode(to encoder: Encoder) throws {
             var container = encoder.container(keyedBy: CodingKeys.self)
             try container.encode(options, forKey: .options)
             try container.encode(multiple, forKey: .multiple)
@@ -156,22 +151,76 @@ extension Draft {
             case duration
         }
         
-        public class Option: Identifiable, Codable, ObservableObject {
-            public let id = UUID()
-            @Published public var text: String
+        class Option: Identifiable, Codable, ObservableObject {
+            let id = UUID()
+            @Published var text: String
             
             init(_ text: String) {
                 self.text = text
             }
             
-            public required init(from decoder: Decoder) throws {
+            required init(from decoder: Decoder) throws {
                 self.text = try decoder.singleValueContainer().decode(String.self)
             }
             
-            public func encode(to encoder: Encoder) throws {
+            func encode(to encoder: Encoder) throws {
                 var container = encoder.singleValueContainer()
                 try container.encode(text)
             }
         }
     }
 }
+
+extension MastodonController {
+    
+    func createDraft(inReplyToID: String? = nil, mentioningAcct: String? = nil) -> Draft {
+        var acctsToMention = [String]()
+        
+        var visibility = inReplyToID != nil ? Preferences.shared.defaultReplyVisibility.resolved : Preferences.shared.defaultPostVisibility
+        var localOnly = false
+        var contentWarning = ""
+        
+        if let inReplyToID = inReplyToID,
+           let inReplyTo = persistentContainer.status(for: inReplyToID) {
+            acctsToMention.append(inReplyTo.account.acct)
+            acctsToMention.append(contentsOf: inReplyTo.mentions.map(\.acct))
+            visibility = min(visibility, inReplyTo.visibility)
+            localOnly = instanceFeatures.localOnlyPosts && inReplyTo.localOnly
+            
+            if !inReplyTo.spoilerText.isEmpty {
+                switch Preferences.shared.contentWarningCopyMode {
+                case .doNotCopy:
+                    break
+                case .asIs:
+                    contentWarning = inReplyTo.spoilerText
+                case .prependRe:
+                    if inReplyTo.spoilerText.lowercased().starts(with: "re:") {
+                        contentWarning = inReplyTo.spoilerText
+                    } else {
+                        contentWarning = "re: \(inReplyTo.spoilerText)"
+                    }
+                }
+            }
+        }
+        if let mentioningAcct = mentioningAcct {
+            acctsToMention.append(mentioningAcct)
+        }
+        if let ownAccount = self.account {
+            acctsToMention.removeAll(where: { $0 == ownAccount.acct })
+        }
+        acctsToMention = acctsToMention.uniques()
+        
+        let draft = Draft(accountID: accountInfo!.id)
+        draft.inReplyToID = inReplyToID
+        draft.text = acctsToMention.map { "@\($0) " }.joined()
+        draft.initialText = draft.text
+        draft.visibility = visibility
+        draft.localOnly = localOnly
+        draft.contentWarning = contentWarning
+        draft.contentWarningEnabled = !contentWarning.isEmpty
+        
+        DraftsManager.shared.add(draft)
+        return draft
+    }
+    
+}

Tusker/Models/DraftsManager.swift

@@ -0,0 +1,77 @@
+//
+//  DraftsManager.swift
+//  Tusker
+//
+//  Created by Shadowfacts on 10/22/18.
+//  Copyright © 2018 Shadowfacts. All rights reserved.
+//
+
+import Foundation
+
+class DraftsManager: Codable, ObservableObject {
+
+    private(set) static var shared: DraftsManager = load()
+    
+    private static var documentsDirectory = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!
+    private static var archiveURL = DraftsManager.documentsDirectory.appendingPathComponent("drafts").appendingPathExtension("plist")
+    
+    static func save() {
+        DispatchQueue.global(qos: .utility).async {
+            let encoder = PropertyListEncoder()
+            let data = try? encoder.encode(shared)
+            try? data?.write(to: archiveURL, options: .noFileProtection)
+        }
+    }
+    
+    static func load() -> DraftsManager {
+        let decoder = PropertyListDecoder()
+        if let data = try? Data(contentsOf: archiveURL),
+            let draftsManager = try? decoder.decode(DraftsManager.self, from: data) {
+            return draftsManager
+        }
+        return DraftsManager()
+    }
+    
+    private init() {}
+    
+    required init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        
+        if let dict = try? container.decode([UUID: Draft].self, forKey: .drafts) {
+            self.drafts = dict
+        } else if let array = try? container.decode([Draft].self, forKey: .drafts) {
+            self.drafts = array.reduce(into: [:], { partialResult, draft in
+                partialResult[draft.id] = draft
+            })
+        } else {
+            throw DecodingError.dataCorruptedError(forKey: .drafts, in: container, debugDescription: "expected drafts to be a dict or array of drafts")
+        }
+    }
+    
+    func encode(to encoder: Encoder) throws {
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(drafts, forKey: .drafts)
+    }
+    
+    @Published private var drafts: [UUID: Draft] = [:]
+    var sorted: [Draft] {
+        return drafts.values.sorted(by: { $0.lastModified > $1.lastModified })
+    }
+    
+    func add(_ draft: Draft) {
+        drafts[draft.id] = draft
+    }
+    
+    func remove(_ draft: Draft) {
+        drafts.removeValue(forKey: draft.id)
+    }
+    
+    func getBy(id: UUID) -> Draft? {
+        return drafts[id]
+    }
+    
+    enum CodingKeys: String, CodingKey {
+        case drafts
+    }
+    
+}

Tusker/Models/StatusFormat.swift

@@ -1,6 +1,6 @@
 //
 //  StatusFormat.swift
-//  ComposeUI
+//  Tusker
 //
 //  Created by Shadowfacts on 1/12/19.
 //  Copyright © 2019 Shadowfacts. All rights reserved.
@@ -12,8 +12,8 @@ import Pachyderm
 enum StatusFormat: Int, CaseIterable {
     case bold, italics, strikethrough, code
     
-    func insertionResult(for contentType: StatusContentType) -> FormatInsertionResult? {
-        switch contentType {
+    var insertionResult: FormatInsertionResult? {
+        switch Preferences.shared.statusContentType {
         case .plain:
             return nil
         case .markdown:
@@ -60,7 +60,7 @@ enum StatusFormat: Int, CaseIterable {
 
 typealias FormatInsertionResult = (prefix: String, suffix: String, insertionPoint: Int)
 
-fileprivate protocol FormatType {
+protocol FormatType {
     static func format(_ format: StatusFormat) -> FormatInsertionResult
 }
 

Tusker/Preferences/Preferences.swift

@@ -49,7 +49,7 @@ class Preferences: Codable, ObservableObject {
         self.leadingStatusSwipeActions = try container.decodeIfPresent([StatusSwipeAction].self, forKey: .leadingStatusSwipeActions) ?? leadingStatusSwipeActions
         self.trailingStatusSwipeActions = try container.decodeIfPresent([StatusSwipeAction].self, forKey: .trailingStatusSwipeActions) ?? trailingStatusSwipeActions
         
-        self.defaultPostVisibility = try container.decode(Visibility.self, forKey: .defaultPostVisibility)
+        self.defaultPostVisibility = try container.decode(Status.Visibility.self, forKey: .defaultPostVisibility)
         self.defaultReplyVisibility = try container.decodeIfPresent(ReplyVisibility.self, forKey: .defaultReplyVisibility) ?? .sameAsPost
         self.automaticallySaveDrafts = try container.decode(Bool.self, forKey: .automaticallySaveDrafts)
         self.requireAttachmentDescriptions = try container.decode(Bool.self, forKey: .requireAttachmentDescriptions)
@@ -158,7 +158,7 @@ class Preferences: Codable, ObservableObject {
     @Published var trailingStatusSwipeActions: [StatusSwipeAction] = [.reply, .share]
     
     // MARK: Composing
-    @Published var defaultPostVisibility = Visibility.public
+    @Published var defaultPostVisibility = Status.Visibility.public
     @Published var defaultReplyVisibility = ReplyVisibility.sameAsPost
     @Published var automaticallySaveDrafts = true
     @Published var requireAttachmentDescriptions = false
@@ -266,11 +266,11 @@ class Preferences: Codable, ObservableObject {
 extension Preferences {
     enum ReplyVisibility: Codable, Hashable, CaseIterable {
         case sameAsPost
-        case visibility(Visibility)
+        case visibility(Status.Visibility)
         
-        static var allCases: [Preferences.ReplyVisibility] = [.sameAsPost] + Visibility.allCases.map { .visibility($0) }
+        static var allCases: [Preferences.ReplyVisibility] = [.sameAsPost] + Status.Visibility.allCases.map { .visibility($0) }
         
-        var resolved: Visibility {
+        var resolved: Status.Visibility {
             switch self {
             case .sameAsPost:
                 return Preferences.shared.defaultPostVisibility

Tusker/Scenes/AuxiliarySceneDelegate.swift

@@ -8,7 +8,6 @@
 
 import UIKit
 import Pachyderm
-import UserAccounts
 
 class AuxiliarySceneDelegate: UIResponder, UIWindowSceneDelegate, TuskerSceneDelegate {
     
@@ -32,11 +31,11 @@ class AuxiliarySceneDelegate: UIResponder, UIWindowSceneDelegate, TuskerSceneDel
         }
         launchActivity = activity
         
-        let account: UserAccountInfo
+        let account: LocalData.UserAccountInfo
         
         if let activityAccount = UserActivityManager.getAccount(from: activity) {
             account = activityAccount
-        } else if let mostRecent = UserAccountsManager.shared.getMostRecentAccount() {
+        } else if let mostRecent = LocalData.shared.getMostRecentAccount() {
             account = mostRecent
         } else {
             // without an account, we can't do anything so we just destroy the scene

Tusker/Scenes/ComposeSceneDelegate.swift

@@ -8,8 +8,6 @@
 
 import UIKit
 import Combine
-import UserAccounts
-import ComposeUI
 
 class ComposeSceneDelegate: UIResponder, UIWindowSceneDelegate, TuskerSceneDelegate {
 
@@ -24,12 +22,12 @@ class ComposeSceneDelegate: UIResponder, UIWindowSceneDelegate, TuskerSceneDeleg
             return
         }
         
-        guard UserAccountsManager.shared.onboardingComplete else {
+        guard LocalData.shared.onboardingComplete else {
             UIApplication.shared.requestSceneSessionDestruction(session, options: nil, errorHandler: nil)
             return
         }
         
-        let account: UserAccountInfo
+        let account: LocalData.UserAccountInfo
         let controller: MastodonController
         let draft: Draft?
         
@@ -38,7 +36,7 @@ class ComposeSceneDelegate: UIResponder, UIWindowSceneDelegate, TuskerSceneDeleg
                 account = activityAccount
             } else {
                 // todo: this potentially changes the account for the draft, should show the same warning to user as in the drafts selection screen
-                account = UserAccountsManager.shared.getMostRecentAccount()!
+                account = LocalData.shared.getMostRecentAccount()!
             }
             
             controller = MastodonController.getForAccount(account)
@@ -51,7 +49,7 @@ class ComposeSceneDelegate: UIResponder, UIWindowSceneDelegate, TuskerSceneDeleg
                 draft = nil
             }
         } else {
-            account = UserAccountsManager.shared.getMostRecentAccount()!
+            account = LocalData.shared.getMostRecentAccount()!
             controller = MastodonController.getForAccount(account)
             draft = nil
         }
@@ -63,15 +61,15 @@ class ComposeSceneDelegate: UIResponder, UIWindowSceneDelegate, TuskerSceneDeleg
         composeVC.delegate = self
         let nav = EnhancedNavigationViewController(rootViewController: composeVC)
         
+        updateTitle(draft: composeVC.draft)
+        composeVC.uiState.$draft
+            .sink { [unowned self] in self.updateTitle(draft: $0) }
+            .store(in: &cancellables)
+        
         window = UIWindow(windowScene: windowScene)
         window!.rootViewController = nav
         window!.makeKeyAndVisible()
         
-        updateTitle(draft: composeVC.controller.draft)
-        composeVC.controller.$draft
-            .sink { [unowned self] in self.updateTitle(draft: $0) }
-            .store(in: &cancellables)
-        
         NotificationCenter.default.addObserver(self, selector: #selector(themePrefChanged), name: .themePreferenceChanged, object: nil)
         themePrefChanged()
     }
@@ -82,7 +80,7 @@ class ComposeSceneDelegate: UIResponder, UIWindowSceneDelegate, TuskerSceneDeleg
         if let window = window,
            let nav = window.rootViewController as? UINavigationController,
            let compose = nav.topViewController as? ComposeHostingController {
-            scene.userActivity = UserActivityManager.editDraftActivity(id: compose.controller.draft.id, accountID: scene.session.mastodonController!.accountInfo!.id)
+            scene.userActivity = UserActivityManager.editDraftActivity(id: compose.draft.id, accountID: scene.session.mastodonController!.accountInfo!.id)
         }
     }
     
@@ -110,7 +108,7 @@ class ComposeSceneDelegate: UIResponder, UIWindowSceneDelegate, TuskerSceneDeleg
 }
 
 extension ComposeSceneDelegate: ComposeHostingControllerDelegate {
-    func dismissCompose(mode: DismissMode) -> Bool {
+    func dismissCompose(mode: ComposeUIState.DismissMode) -> Bool {
         let animation: UIWindowScene.DismissalAnimation
         switch mode {
         case .cancel:

Tusker/Scenes/MainSceneDelegate.swift

@@ -11,8 +11,6 @@ import Pachyderm
 import MessageUI
 import CoreData
 import Duckable
-import UserAccounts
-import ComposeUI
 
 class MainSceneDelegate: UIResponder, UIWindowSceneDelegate, TuskerSceneDelegate {
     
@@ -163,13 +161,13 @@ class MainSceneDelegate: UIResponder, UIWindowSceneDelegate, TuskerSceneDelegate
     
     func showAppOrOnboardingUI(session: UISceneSession? = nil) {
         let session = session ?? window!.windowScene!.session
-        if UserAccountsManager.shared.onboardingComplete {
-            let account: UserAccountInfo
+        if LocalData.shared.onboardingComplete {
+            let account: LocalData.UserAccountInfo
             if let activity = launchActivity,
                let activityAccount = UserActivityManager.getAccount(from: activity) {
                 account = activityAccount
             } else {
-                account = UserAccountsManager.shared.getMostRecentAccount()!
+                account = LocalData.shared.getMostRecentAccount()!
             }
             
             if session.mastodonController == nil {
@@ -196,9 +194,9 @@ class MainSceneDelegate: UIResponder, UIWindowSceneDelegate, TuskerSceneDelegate
         }
     }
     
-    func activateAccount(_ account: UserAccountInfo, animated: Bool) {
-        let oldMostRecentAccount = UserAccountsManager.shared.mostRecentAccountID
-        UserAccountsManager.shared.setMostRecentAccount(account)
+    func activateAccount(_ account: LocalData.UserAccountInfo, animated: Bool) {
+        let oldMostRecentAccount = LocalData.shared.mostRecentAccountID
+        LocalData.shared.setMostRecentAccount(account)
         window!.windowScene!.session.mastodonController = MastodonController.getForAccount(account)
         
         // iPadOS shows the title below the App Name
@@ -214,8 +212,8 @@ class MainSceneDelegate: UIResponder, UIWindowSceneDelegate, TuskerSceneDelegate
         if let container = window?.rootViewController as? AccountSwitchingContainerViewController {
             let direction: AccountSwitchingContainerViewController.AnimationDirection
             if animated,
-               let oldIndex = UserAccountsManager.shared.accounts.firstIndex(where: { $0.id == oldMostRecentAccount }),
-               let newIndex = UserAccountsManager.shared.accounts.firstIndex(of: account) {
+               let oldIndex = LocalData.shared.accounts.firstIndex(where: { $0.id == oldMostRecentAccount }),
+               let newIndex = LocalData.shared.accounts.firstIndex(of: account) {
                 direction = newIndex > oldIndex ? .upwards : .downwards
             } else {
                 direction = .none
@@ -231,8 +229,8 @@ class MainSceneDelegate: UIResponder, UIWindowSceneDelegate, TuskerSceneDelegate
             return
         }
         LogoutService(accountInfo: account).run()
-        if UserAccountsManager.shared.onboardingComplete {
-            activateAccount(UserAccountsManager.shared.accounts.first!, animated: false)
+        if LocalData.shared.onboardingComplete {
+            activateAccount(LocalData.shared.accounts.first!, animated: false)
         } else {
             window!.rootViewController = createOnboardingUI()
         }
@@ -271,7 +269,7 @@ class MainSceneDelegate: UIResponder, UIWindowSceneDelegate, TuskerSceneDelegate
 }
 
 extension MainSceneDelegate: OnboardingViewControllerDelegate {
-    func didFinishOnboarding(account: UserAccountInfo) {
+    func didFinishOnboarding(account: LocalData.UserAccountInfo) {
         activateAccount(account, animated: false)
     }
 }

Tusker/Screens/Account Follows/AccountFollowsListViewController.swift

@@ -68,7 +68,13 @@ class AccountFollowsListViewController: UIViewController, CollectionViewControll
             cell.updateUI(accountID: item)
             
             cell.configurationUpdateHandler = { cell, state in
-                cell.backgroundConfiguration = .appListPlainCell(for: state)
+                var config = UIBackgroundConfiguration.listPlainCell().updated(for: state)
+                if state.isHighlighted || state.isSelected {
+                    config.backgroundColor = .appSelectedCellBackground
+                } else {
+                    config.backgroundColor = .appBackground
+                }
+                cell.backgroundConfiguration = config
             }
         }
         let loadingCell = UICollectionView.CellRegistration<LoadingCollectionViewCell, Void> { cell, indexPath, item in

Tusker/Screens/Asset Picker/AlbumAssetCollectionViewController.swift

@@ -0,0 +1,30 @@
+//
+//  AlbumAssetCollectionViewController.swift
+//  Tusker
+//
+//  Created by Shadowfacts on 1/4/20.
+//  Copyright © 2020 Shadowfacts. All rights reserved.
+//
+
+import UIKit
+import Photos
+
+class AlbumAssetCollectionViewController: AssetCollectionViewController {
+
+    let collection: PHAssetCollection
+    
+    init(collection: PHAssetCollection) {
+        self.collection = collection
+        
+        super.init()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func fetchAssets(with options: PHFetchOptions) -> PHFetchResult<PHAsset> {
+        return PHAsset.fetchAssets(in: collection, options: options)
+    }
+
+}

Tusker/Screens/Asset Picker/AssetCollectionViewController.swift

@@ -0,0 +1,269 @@
+//
+//  AssetCollectionViewController.swift
+//  Tusker
+//
+//  Created by Shadowfacts on 1/1/20.
+//  Copyright © 2020 Shadowfacts. All rights reserved.
+//
+
+import UIKit
+import Photos
+
+private let reuseIdentifier = "assetCell"
+private let cameraReuseIdentifier = "showCameraCell"
+
+protocol AssetCollectionViewControllerDelegate: AnyObject {
+    func shouldSelectAsset(_ asset: PHAsset) -> Bool
+    func didSelectAssets(_ assets: [PHAsset])
+    func captureFromCamera()
+}
+
+class AssetCollectionViewController: UIViewController, UICollectionViewDelegate {
+
+    weak var delegate: AssetCollectionViewControllerDelegate?
+    
+    private var collectionView: UICollectionView!
+    private var dataSource: UICollectionViewDiffableDataSource<Section, Item>!
+    
+    private var thumbnailSize: CGSize!
+    
+    private let imageManager = PHCachingImageManager()
+    private var fetchResult: PHFetchResult<PHAsset>!
+    
+    var selectedAssets: [PHAsset] {
+        return collectionView.indexPathsForSelectedItems?.compactMap { (indexPath) in
+            guard case let .asset(asset) = dataSource.itemIdentifier(for: indexPath) else { return nil }
+            return asset
+        } ?? []
+    }
+    
+    init() {
+        super.init(nibName: nil, bundle: nil)
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        let itemSize = NSCollectionLayoutSize(widthDimension: .fractionalWidth(1/3), heightDimension: .fractionalWidth(1/3))
+        let item = NSCollectionLayoutItem(layoutSize: itemSize)
+        let groupSize = NSCollectionLayoutSize(widthDimension: .fractionalWidth(1), heightDimension: .fractionalWidth(1/3))
+        let group = NSCollectionLayoutGroup.horizontal(layoutSize: groupSize, subitem: item, count: 3)
+        group.interItemSpacing = .fixed(4)
+        let section = NSCollectionLayoutSection(group: group)
+        let layout = UICollectionViewCompositionalLayout(section: section)
+        collectionView = UICollectionView(frame: view.bounds, collectionViewLayout: layout)
+        collectionView.delegate = self
+        view.addSubview(collectionView)
+        
+        // use the safe area layout guide instead of letting it automatically use the safe area insets
+        // because otherwise, when presented in a popover with the arrow on the left or right side,
+        // the collection view content will be cut off by the width of the arrow because the popover
+        // doesn't respect safe area insets
+        collectionView.translatesAutoresizingMaskIntoConstraints = false
+        NSLayoutConstraint.activate([
+            view.safeAreaLayoutGuide.leadingAnchor.constraint(equalTo: collectionView.leadingAnchor),
+            view.safeAreaLayoutGuide.trailingAnchor.constraint(equalTo: collectionView.trailingAnchor),
+            // top ignores safe area because when presented in the sheet container, it simplifies the top content offset
+            view.topAnchor.constraint(equalTo: collectionView.topAnchor),
+            // bottom ignores safe area because we want cells to underflow bottom of the screen on notched iPhones
+            view.bottomAnchor.constraint(equalTo: collectionView.bottomAnchor),
+        ])
+        view.backgroundColor = .appBackground
+        collectionView.backgroundColor = .appBackground
+        
+        navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(donePressed))
+
+        collectionView.alwaysBounceVertical = true
+        collectionView.allowsMultipleSelection = true
+        collectionView.allowsSelection = true
+        collectionView.allowsFocus = true
+        
+        collectionView.register(UINib(nibName: "AssetCollectionViewCell", bundle: .main), forCellWithReuseIdentifier: reuseIdentifier)
+        
+        let controlCell = UICollectionView.CellRegistration<AssetPickerControlCollectionViewCell, Item> { cell, indexPath, itemIdentifier in
+            switch itemIdentifier {
+            case .showCamera:
+                cell.imageView.image = UIImage(systemName: "camera")
+                cell.label.text = "Take a Photo"
+            case .changeLimitedSelection:
+                cell.imageView.image = UIImage(systemName: "photo.on.rectangle.angled")
+                cell.label.text = "Select More Photos"
+            case .asset(_):
+                break
+            }
+        }
+        
+        dataSource = UICollectionViewDiffableDataSource<Section, Item>(collectionView: collectionView, cellProvider: { (collectionView, indexPath, item) -> UICollectionViewCell? in
+            switch item {
+            case .showCamera, .changeLimitedSelection:
+                return collectionView.dequeueConfiguredReusableCell(using: controlCell, for: indexPath, item: item)
+            case let .asset(asset):
+                let cell = collectionView.dequeueReusableCell(withReuseIdentifier: reuseIdentifier, for: indexPath) as! AssetCollectionViewCell
+        
+                cell.updateUI(asset: asset)
+                self.imageManager.requestImage(for: asset, targetSize: self.thumbnailSize, contentMode: .aspectFill, options: nil) { (image, _) in
+                    guard let image = image else { return }
+                    DispatchQueue.main.async {
+                        guard cell.assetIdentifier == asset.localIdentifier else { return }
+                        cell.thumbnailImage = image
+                    }
+                }
+
+                return cell
+            }
+        })
+        
+        updateItemsSelectedCount()
+
+        if let singleFingerPanGesture = collectionView.gestureRecognizers?.first(where: {
+                $0.name == "multi-select.singleFingerPanGesture"
+            }),
+            let interactivePopGesture = navigationController?.interactivePopGestureRecognizer {
+            singleFingerPanGesture.require(toFail: interactivePopGesture)
+        }
+        
+        PHPhotoLibrary.shared().register(self)
+    }
+    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        
+        let scale = UIScreen.main.scale
+        let cellWidth = view.bounds.width / 3
+        thumbnailSize = CGSize(width: cellWidth * scale, height: cellWidth * scale)
+        
+        loadAssets()
+    }
+    
+    private func loadAssets() {
+        var items = [Item.showCamera]
+        
+        switch PHPhotoLibrary.authorizationStatus(for: .readWrite) {
+        case .notDetermined:
+            PHPhotoLibrary.requestAuthorization(for: .readWrite) { (_) in
+                DispatchQueue.main.async {
+                    self.loadAssets()
+                }
+            }
+            return
+            
+        case .restricted, .denied:
+            // todo: better UI for this
+            return
+            
+        case .authorized:
+            break
+            
+        case .limited:
+            items.append(.changeLimitedSelection)
+            break
+            
+        @unknown default:
+            // who knows, just try anyways
+            break
+        }
+        
+        let options = PHFetchOptions()
+        options.sortDescriptors = [NSSortDescriptor(key: "creationDate", ascending: false)]
+        fetchResult = fetchAssets(with: options)
+        var snapshot = NSDiffableDataSourceSnapshot<Section, Item>()
+        snapshot.appendSections([.assets])
+        fetchResult.enumerateObjects { (asset, _, _) in
+            items.append(.asset(asset))
+        }
+        snapshot.appendItems(items)
+        dataSource.apply(snapshot, animatingDifferences: false)
+    }
+    
+    open func fetchAssets(with options: PHFetchOptions) -> PHFetchResult<PHAsset> {
+        return PHAsset.fetchAssets(with: options)
+    }
+    
+    func updateItemsSelectedCount() {
+        let selected = collectionView.indexPathsForSelectedItems?.count ?? 0
+        
+        navigationItem.title = "\(selected) selected"
+    }
+
+    // MARK: UICollectionViewDelegate
+
+    func collectionView(_ collectionView: UICollectionView, shouldBeginMultipleSelectionInteractionAt indexPath: IndexPath) -> Bool {
+        return true
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, shouldSelectItemAt indexPath: IndexPath) -> Bool {
+        guard let item = dataSource.itemIdentifier(for: indexPath) else { return false }
+        if let delegate = delegate,
+           case let .asset(asset) = item {
+            return delegate.shouldSelectAsset(asset)
+        }
+        return true
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+        guard let item = dataSource.itemIdentifier(for: indexPath) else { return }
+        switch item {
+        case .showCamera:
+            collectionView.deselectItem(at: indexPath, animated: false)
+            delegate?.captureFromCamera()
+        case .changeLimitedSelection:
+            // todo: change observer
+            PHPhotoLibrary.shared().presentLimitedLibraryPicker(from: self)
+        case .asset(_):
+            updateItemsSelectedCount()
+        }
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, didDeselectItemAt indexPath: IndexPath) {
+        updateItemsSelectedCount()
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, contextMenuConfigurationForItemAt indexPath: IndexPath, point: CGPoint) -> UIContextMenuConfiguration? {
+        guard case let .asset(asset) = dataSource.itemIdentifier(for: indexPath) else { return nil }
+        return UIContextMenuConfiguration(identifier: indexPath as NSIndexPath, previewProvider: { () -> UIViewController? in
+            return AssetPreviewViewController(asset: asset)
+        }, actionProvider: nil)
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, previewForHighlightingContextMenuWithConfiguration configuration: UIContextMenuConfiguration) -> UITargetedPreview? {
+        if let indexPath = (configuration.identifier as? NSIndexPath) as IndexPath?,
+            let cell = collectionView.cellForItem(at: indexPath) as? AssetCollectionViewCell {
+            let parameters = UIPreviewParameters()
+            parameters.backgroundColor = .black
+            return UITargetedPreview(view: cell.imageView, parameters: parameters)
+        } else {
+            return nil
+        }
+    }
+    
+    // MARK: - Interaction
+    
+    @objc func donePressed() {
+        delegate?.didSelectAssets(selectedAssets)
+        dismiss(animated: true)
+    }
+    
+}
+
+extension AssetCollectionViewController {
+    enum Section: Hashable {
+        case assets
+    }
+    enum Item: Hashable {
+        case showCamera
+        case changeLimitedSelection
+        case asset(PHAsset)
+    }
+}
+
+extension AssetCollectionViewController: PHPhotoLibraryChangeObserver {
+    func photoLibraryDidChange(_ changeInstance: PHChange) {
+        DispatchQueue.main.async {
+            self.loadAssets()
+        }
+    }
+}

Tusker/Screens/Asset Picker/AssetCollectionsListViewController.swift

@@ -0,0 +1,158 @@
+//
+//  AssetCollectionsListViewController.swift
+//  Tusker
+//
+//  Created by Shadowfacts on 1/1/20.
+//  Copyright © 2020 Shadowfacts. All rights reserved.
+//
+
+import UIKit
+import Photos
+
+class AssetCollectionsListViewController: UITableViewController {
+
+    weak var assetCollectionDelegate: AssetCollectionViewControllerDelegate?
+    
+    var dataSource: DataSource!
+
+    init() {
+        super.init(style: .plain)
+        
+        title = NSLocalizedString("Collections", comment: "asset collections list title")
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(cancelPressed))
+
+        tableView.register(UINib(nibName: "AllPhotosTableViewCell", bundle: .main), forCellReuseIdentifier: "allPhotosCell")
+        tableView.register(UINib(nibName: "AlbumTableViewCell", bundle: .main), forCellReuseIdentifier: "albumCell")
+        
+        tableView.allowsFocus = true
+        tableView.backgroundColor = .appGroupedBackground
+        
+        dataSource = DataSource(tableView: tableView, cellProvider: { (tableView, indexPath, item) -> UITableViewCell? in
+            switch item {
+            case .cameraRoll:
+                return tableView.dequeueReusableCell(withIdentifier: "allPhotosCell", for: indexPath)
+
+            case let .album(collection):
+                let cell = tableView.dequeueReusableCell(withIdentifier: "albumCell", for: indexPath) as! AlbumTableViewCell
+                cell.updateUI(album: collection)
+                return cell
+            }
+        })
+        
+        var snapshot = NSDiffableDataSourceSnapshot<Section, Item>()
+        snapshot.appendSections([.system, .albums, .sharedAlbums, .smartAlbums])
+        snapshot.appendItems([.cameraRoll], toSection: .system)
+        
+        let smartAlbums = PHAssetCollection.fetchAssetCollections(with: .smartAlbum, subtype: .any, options: nil)
+        var smartAlbumItems = [Item]()
+        smartAlbums.enumerateObjects { (collection, _, _) in
+            guard collection.assetCollectionSubtype != .smartAlbumAllHidden else {
+                return
+            }
+            smartAlbumItems.append(.album(collection))
+        }
+        // sort these manually, using PHFetchOptions.sortDescriptors seems like it just doesn't work with fetchAssetCollections
+        smartAlbumItems.sort(by: { $0.title < $1.title })
+        snapshot.appendItems(smartAlbumItems, toSection: .smartAlbums)
+        
+        let albums = PHAssetCollection.fetchAssetCollections(with: .album, subtype: .any, options: nil)
+        var albumItems = [Item]()
+        var sharedItems = [Item]()
+        albums.enumerateObjects { (collection, _, _) in
+            if collection.estimatedAssetCount > 0 {
+                if collection.assetCollectionSubtype == .albumCloudShared {
+                    sharedItems.append(.album(collection))
+                } else {
+                    albumItems.append(.album(collection))
+                }
+            }
+        }
+        albumItems.sort(by: { $0.title < $1.title })
+        sharedItems.sort(by: { $0.title < $1.title })
+        snapshot.appendItems(albumItems, toSection: .albums)
+        snapshot.appendItems(sharedItems, toSection: .sharedAlbums)
+
+        dataSource.apply(snapshot, animatingDifferences: false)
+    }
+    
+    // MARK: - Table view delegate
+    
+    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        switch dataSource.itemIdentifier(for: indexPath) {
+        case nil:
+            return
+            
+        case .cameraRoll:
+            let assetCollection = AssetCollectionViewController()
+            assetCollection.delegate = assetCollectionDelegate
+            show(assetCollection, sender: self)
+            
+        case let .album(collection):
+            let assetCollection = AlbumAssetCollectionViewController(collection: collection)
+            assetCollection.delegate = assetCollectionDelegate
+            show(assetCollection, sender: self)
+        }
+    }
+    
+    // MARK: - Interaction
+    
+    @objc func cancelPressed() {
+        dismiss(animated: true)
+    }
+
+}
+
+extension AssetCollectionsListViewController {
+    enum Section {
+        case system
+        case albums
+        case sharedAlbums
+        case smartAlbums
+    }
+    enum Item: Hashable {
+        case cameraRoll
+        case album(PHAssetCollection)
+        
+        func hash(into hasher: inout Hasher) {
+            switch self {
+            case .cameraRoll:
+                hasher.combine("cameraRoll")
+            case let .album(collection):
+                hasher.combine("album")
+                hasher.combine(collection.localIdentifier)
+            }
+        }
+        
+        var title: String {
+            switch self {
+            case .cameraRoll:
+                return "All Photos"
+            case .album(let collection):
+                return collection.localizedTitle ?? ""
+            }
+        }
+    }
+    class DataSource: UITableViewDiffableDataSource<Section, Item> {
+        override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
+            switch sectionIdentifier(for: section) {
+            case .albums:
+                return NSLocalizedString("Albums", comment: "albums section title")
+            case .sharedAlbums:
+                return NSLocalizedString("Shared Albums", comment: "shared albums section title")
+            case .smartAlbums:
+                return NSLocalizedString("Smart Albums", comment: "smart albums section title")
+            default:
+                return nil
+            }
+        }
+    }
+}

Tusker/Screens/Asset Picker/AssetPickerViewController.swift

@@ -0,0 +1,95 @@
+//
+//  AssetPickerViewController.swift
+//  Tusker
+//
+//  Created by Shadowfacts on 1/1/20.
+//  Copyright © 2020 Shadowfacts. All rights reserved.
+//
+
+import UIKit
+import Photos
+
+protocol AssetPickerViewControllerDelegate: AnyObject {
+    func assetPicker(_ assetPicker: AssetPickerViewController, shouldAllowAssetOfType type: CompositionAttachmentData.AttachmentType) -> Bool
+    func assetPicker(_ assetPicker: AssetPickerViewController, didSelectAttachments attachments: [CompositionAttachmentData])
+}
+
+class AssetPickerViewController: UINavigationController {
+
+    weak var assetPickerDelegate: AssetPickerViewControllerDelegate?
+    
+    var currentCollectionSelectedAssets: [CompositionAttachmentData] {
+        if let vc = visibleViewController as? AssetCollectionViewController {
+            return vc.selectedAssets.map { .asset($0) }
+        } else {
+            return []
+        }
+    }
+    
+    init() {
+        super.init(navigationBarClass: nil, toolbarClass: nil)
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        let assetCollectionsList = AssetCollectionsListViewController()
+        assetCollectionsList.assetCollectionDelegate = self
+        let assetCollection = AssetCollectionViewController()
+        assetCollection.delegate = self
+        setViewControllers([assetCollectionsList, assetCollection], animated: false)
+    }
+    
+    func presentImagePicker(animated: Bool) {
+        let imagePicker = UIImagePickerController()
+        imagePicker.delegate = self
+        imagePicker.sourceType = .camera
+        imagePicker.mediaTypes = UIImagePickerController.availableMediaTypes(for: .camera)!
+        self.present(imagePicker, animated: true)
+    }
+
+}
+
+extension AssetPickerViewController: AssetCollectionViewControllerDelegate {
+    func shouldSelectAsset(_ asset: PHAsset) -> Bool {
+        guard let delegate = assetPickerDelegate else { return true }
+        guard let type = asset.attachmentType else { return false }
+        return delegate.assetPicker(self, shouldAllowAssetOfType: type)
+    }
+    func didSelectAssets(_ assets: [PHAsset]) {
+        assetPickerDelegate?.assetPicker(self, didSelectAttachments: assets.map { .asset($0) })
+    }
+    func captureFromCamera() {
+        presentImagePicker(animated: true)
+    }
+}
+
+extension AssetPickerViewController: UIImagePickerControllerDelegate, UINavigationControllerDelegate {
+    func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey : Any]) {
+        let attachment: CompositionAttachmentData
+        if let image = info[.originalImage] as? UIImage {
+            attachment = .image(image)
+        } else if let url = info[.mediaURL] as? URL {
+            attachment = .video(url)
+        } else {
+            return
+        }
+        
+        if assetPickerDelegate?.assetPicker(self, shouldAllowAssetOfType: attachment.type) ?? true {
+            assetPickerDelegate?.assetPicker(self, didSelectAttachments: [attachment])
+            // dismiss image picker
+            dismiss(animated: true) {
+                // dismiss asset picker
+                self.dismiss(animated: true)
+            }
+        } else {
+            dismiss(animated: false) {
+                self.presentImagePicker(animated: false)
+            }
+        }
+    }
+}

Tusker/Screens/Asset Picker/AssetPreviewViewController.swift

@@ -0,0 +1,128 @@
+//
+//  AssetPreviewViewController.swift
+//  Tusker
+//
+//  Created by Shadowfacts on 1/4/20.
+//  Copyright © 2020 Shadowfacts. All rights reserved.
+//
+
+import UIKit
+import Photos
+import PhotosUI
+import AVKit
+
+class AssetPreviewViewController: UIViewController {
+
+    let asset: PHAsset
+    
+    init(asset: PHAsset) {
+        self.asset = asset
+        
+        super.init(nibName: nil, bundle: nil)
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        view.backgroundColor = .black
+
+        switch asset.mediaType {
+        case .image:
+            if asset.mediaSubtypes.contains(.photoLive) {
+                showLivePhoto(asset)
+            } else {
+                showAssetImage(asset)
+            }
+        case .video:
+            showAssetVideo(asset)
+        default:
+            fatalError("asset mediaType must be image or video")
+        }
+    }
+    
+    func showImage(_ image: UIImage) {
+        let imageView = UIImageView(image: image)
+        imageView.translatesAutoresizingMaskIntoConstraints = false
+        imageView.contentMode = .scaleAspectFit
+        view.addSubview(imageView)
+        NSLayoutConstraint.activate([
+            imageView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+            imageView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
+            imageView.topAnchor.constraint(equalTo: view.topAnchor),
+            imageView.bottomAnchor.constraint(equalTo: view.bottomAnchor)
+        ])
+        preferredContentSize = image.size
+    }
+    
+    func showAssetImage(_ asset: PHAsset) {
+        let options = PHImageRequestOptions()
+        options.version = .current
+        options.deliveryMode = .opportunistic
+        options.resizeMode = .none
+        options.isNetworkAccessAllowed = true
+        PHImageManager.default().requestImage(for: asset, targetSize: view.bounds.size, contentMode: .aspectFit, options: options) { (image, _) in
+            DispatchQueue.main.async {
+                self.showImage(image!)
+            }
+        }
+    }
+    
+    func showLivePhoto(_ asset: PHAsset) {
+        let options = PHLivePhotoRequestOptions()
+        options.deliveryMode = .opportunistic
+        options.version = .current
+        options.isNetworkAccessAllowed = true
+        PHImageManager.default().requestLivePhoto(for: asset, targetSize: view.bounds.size, contentMode: .aspectFit, options: options) { (livePhoto, _) in
+            guard let livePhoto = livePhoto else {
+                fatalError("failed to get live photo")
+            }
+            DispatchQueue.main.async {
+                let livePhotoView = PHLivePhotoView()
+                livePhotoView.livePhoto = livePhoto
+                livePhotoView.isMuted = true
+                livePhotoView.startPlayback(with: .full)
+                livePhotoView.translatesAutoresizingMaskIntoConstraints = false
+                livePhotoView.contentMode = .scaleAspectFit
+                self.view.addSubview(livePhotoView)
+                NSLayoutConstraint.activate([
+                    livePhotoView.leadingAnchor.constraint(equalTo: self.view.leadingAnchor),
+                    livePhotoView.trailingAnchor.constraint(equalTo: self.view.trailingAnchor),
+                    livePhotoView.topAnchor.constraint(equalTo: self.view.topAnchor),
+                    livePhotoView.bottomAnchor.constraint(equalTo: self.view.bottomAnchor)
+                ])
+                self.preferredContentSize = livePhoto.size
+            }
+        }
+    }
+    
+    func showVideo(asset: AVAsset) {
+        let playerController = AVPlayerViewController()
+        let item = AVPlayerItem(asset: asset)
+        let player = AVPlayer(playerItem: item)
+        player.isMuted = true
+        player.play()
+        playerController.player = player
+        self.embedChild(playerController)
+        self.preferredContentSize = item.presentationSize
+    }
+    
+    func showAssetVideo(_ asset: PHAsset) {
+        let options = PHVideoRequestOptions()
+        options.deliveryMode = .automatic
+        options.isNetworkAccessAllowed = true
+        options.version = .current
+        PHImageManager.default().requestAVAsset(forVideo: asset, options: options) { (avAsset, _, _) in
+            guard let avAsset = avAsset else {
+                fatalError("failed to get AVAsset")
+            }
+            DispatchQueue.main.async {
+                self.showVideo(asset: avAsset)
+            }
+        }
+    }
+    
+}

Tusker/Screens/Attachment Gallery/AttachmentPreviewViewController.swift

@@ -8,7 +8,6 @@
 
 import UIKit
 import Pachyderm
-import TuskerComponents
 
 class AttachmentPreviewViewController: UIViewController {
 

Tusker/Screens/Compose/ComposeAssetPicker.swift

@@ -0,0 +1,29 @@
+//
+//  ComposeAssetPicker.swift
+//  Tusker
+//
+//  Created by Shadowfacts on 8/19/20.
+//  Copyright © 2020 Shadowfacts. All rights reserved.
+//
+
+import SwiftUI
+
+struct ComposeAssetPicker: UIViewControllerRepresentable {
+    typealias UIViewControllerType = AssetPickerViewController
+    
+    @ObservedObject var draft: Draft
+    let delegate: AssetPickerViewControllerDelegate?
+    
+    @EnvironmentObject var mastodonController: MastodonController
+    
+    func makeUIViewController(context: Context) -> AssetPickerViewController {
+        let vc = AssetPickerViewController()
+        vc.assetPickerDelegate = delegate
+        vc.preferredContentSize = CGSize(width: 400, height: 600)
+        return vc
+    }
+    
+    func updateUIViewController(_ uiViewController: AssetPickerViewController, context: Context) {
+    }
+    
+}

Tusker/Screens/Compose/ComposeAttachmentImage.swift

@@ -1,6 +1,6 @@
 //
-//  AttachmentThumbnailView.swift
-//  ComposeUI
+//  ComposeAttachmentImage.swift
+//  Tusker
 //
 //  Created by Shadowfacts on 11/10/21.
 //  Copyright © 2021 Shadowfacts. All rights reserved.
@@ -8,10 +8,9 @@
 
 import SwiftUI
 import Photos
-import TuskerComponents
 
-struct AttachmentThumbnailView: View {
-    let attachment: DraftAttachment
+struct ComposeAttachmentImage: View {
+    let attachment: CompositionAttachment
     let fullSize: Bool
     
     @State private var gifData: Data? = nil
@@ -48,8 +47,8 @@ struct AttachmentThumbnailView: View {
     
     private func loadImage() {
         switch attachment.data {
-        case let .image(originalData, originalType: _):
-            self.image = UIImage(data: originalData)
+        case let .image(image):
+            self.image = image
         case let .asset(asset):
             let size: CGSize
             if fullSize {
@@ -115,3 +114,9 @@ private struct GIFViewWrapper: UIViewRepresentable {
     func updateUIView(_ uiView: GIFImageView, context: Context) {
     }
 }
+
+struct ComposeAttachmentImage_Previews: PreviewProvider {
+    static var previews: some View {
+        ComposeAttachmentImage(attachment: CompositionAttachment(data: .image(UIImage())), fullSize: false)
+    }
+}

Tusker/Screens/Compose/ComposeAttachmentRow.swift

@@ -0,0 +1,164 @@
+//
+//  ComposeAttachmentRow.swift
+//  Tusker
+//
+//  Created by Shadowfacts on 8/19/20.
+//  Copyright © 2020 Shadowfacts. All rights reserved.
+//
+
+import SwiftUI
+import Photos
+import AVFoundation
+import Vision
+
+struct ComposeAttachmentRow: View {
+    @ObservedObject var draft: Draft
+    @ObservedObject var attachment: CompositionAttachment
+    
+    @EnvironmentObject var mastodonController: MastodonController
+    @EnvironmentObject var uiState: ComposeUIState
+    @State private var mode: Mode = .allowEntry
+    @State private var isShowingTextRecognitionFailedAlert = false
+    @State private var textRecognitionErrorMessage: String? = nil
+    
+    var body: some View {
+        HStack(alignment: .center, spacing: 4) {
+            ComposeAttachmentImage(attachment: attachment, fullSize: false)
+                .frame(width: 80, height: 80)
+                .cornerRadius(8)
+                .contextMenu {
+                    if case .drawing(_) = attachment.data {
+                        Button(action: self.editDrawing) {
+                            Label("Edit Drawing", systemImage: "hand.draw")
+                        }
+                    } else if attachment.data.type == .image {
+                        Button(action: self.recognizeText) {
+                            Label("Recognize Text", systemImage: "doc.text.viewfinder")
+                        }
+                    }
+                    
+                    Button(role: .destructive, action: self.removeAttachment) {
+                        Label("Delete", systemImage: "trash")
+                    }
+                } previewIfAvailable: {
+                    ComposeAttachmentImage(attachment: attachment, fullSize: true)
+                }
+            
+            switch mode {
+            case .allowEntry:
+                ComposeTextView(text: $attachment.attachmentDescription, placeholder: Text("Describe for the visually impaired…"), minHeight: 80)
+                    .backgroundColor(.clear)
+                
+            case .recognizingText:
+                ProgressView()
+            }
+            
+            
+            // todo: find a way to make this button not activated when the list row is selected, see FB8595628
+//            Button(action: self.removeAttachment) {
+//                Image(systemName: "xmark.circle.fill")
+//                    .foregroundColor(.blue)
+//            }
+        }
+        .onReceive(attachment.$attachmentDescription) { (newDesc) in
+            if newDesc.isEmpty {
+                uiState.attachmentsMissingDescriptions.insert(attachment.id)
+            } else {
+                uiState.attachmentsMissingDescriptions.remove(attachment.id)
+            }
+        }
+        .alert(isPresented: $isShowingTextRecognitionFailedAlert) {
+            Alert(
+                title: Text("Text Recognition Failed"),
+                message: Text(self.textRecognitionErrorMessage ?? ""),
+                dismissButton: .default(Text("OK"))
+            )
+        }
+    }
+    
+    private func removeAttachment() {
+        withAnimation {
+            draft.attachments.removeAll { $0.id == attachment.id }
+        }
+    }
+    
+    private func editDrawing() {
+        uiState.composeDrawingMode = .edit(id: attachment.id)
+        uiState.delegate?.presentComposeDrawing()
+    }
+    
+    private func recognizeText() {
+        mode = .recognizingText
+        
+        DispatchQueue.global(qos: .userInitiated).async {
+            self.attachment.data.getData(features: mastodonController.instanceFeatures, skipAllConversion: true) { (result) in
+                let data: Data
+                do {
+                    try data = result.get().0
+                } catch {
+                    DispatchQueue.main.async {
+                        self.mode = .allowEntry
+                        self.isShowingTextRecognitionFailedAlert = true
+                        self.textRecognitionErrorMessage = error.localizedDescription
+                    }
+                    return
+                }
+                let handler = VNImageRequestHandler(data: data, options: [:])
+                let request = VNRecognizeTextRequest { (request, error) in
+                    DispatchQueue.main.async {
+                        if let results = request.results as? [VNRecognizedTextObservation] {
+                            var text = ""
+                            for observation in results {
+                                let result = observation.topCandidates(1).first!
+                                text.append(result.string)
+                                text.append("\n")
+                            }
+                            self.attachment.attachmentDescription = text
+                        }
+                        
+                        self.mode = .allowEntry
+                    }
+                }
+                request.recognitionLevel = .accurate
+                request.usesLanguageCorrection = true
+                DispatchQueue.global(qos: .userInitiated).async {
+                    do {
+                        try handler.perform([request])
+                    } catch {
+                        // The perform call throws an error with code 1 if the request is cancelled, which we don't want to show an alert for.
+                        guard (error as NSError).code != 1 else { return }
+                        DispatchQueue.main.async {
+                            self.mode = .allowEntry
+                            self.isShowingTextRecognitionFailedAlert = true
+                            self.textRecognitionErrorMessage = error.localizedDescription
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+extension ComposeAttachmentRow {
+    enum Mode {
+        case allowEntry, recognizingText
+    }
+}
+
+private extension View {
+    @available(iOS, obsoleted: 16.0)
+    @ViewBuilder
+    func contextMenu<M: View, P: View>(@ViewBuilder menuItems: () -> M, @ViewBuilder previewIfAvailable preview: () -> P) -> some View {
+        if #available(iOS 16.0, *) {
+            self.contextMenu(menuItems: menuItems, preview: preview)
+        } else {
+            self.contextMenu(menuItems: menuItems)
+        }
+    }
+}
+
+//struct ComposeAttachmentRow_Previews: PreviewProvider {
+//    static var previews: some View {
+//        ComposeAttachmentRow()
+//    }
+//}

Tusker/Screens/Compose/ComposeAttachmentsList.swift

@@ -0,0 +1,210 @@
+//
+//  ComposeAttachmentsList.swift
+//  Tusker
+//
+//  Created by Shadowfacts on 8/19/20.
+//  Copyright © 2020 Shadowfacts. All rights reserved.
+//
+
+import SwiftUI
+
+struct ComposeAttachmentsList: View {
+    private let cellHeight: CGFloat = 80
+    private let cellPadding: CGFloat = 12
+    
+    @ObservedObject var draft: Draft
+    
+    @EnvironmentObject var mastodonController: MastodonController
+    @EnvironmentObject var uiState: ComposeUIState
+    @State var isShowingAssetPickerPopover = false
+    @State var isShowingCreateDrawing = false
+    
+    @Environment(\.colorScheme) var colorScheme: ColorScheme
+    @Environment(\.horizontalSizeClass) var horizontalSizeClass: UserInterfaceSizeClass?
+    
+    var body: some View {
+        Group {
+            ForEach(draft.attachments) { (attachment) in
+                ComposeAttachmentRow(
+                    draft: draft,
+                    attachment: attachment
+                )
+                .listRowInsets(EdgeInsets(top: cellPadding / 2, leading: cellPadding / 2, bottom: cellPadding / 2, trailing: cellPadding / 2))
+                .onDrag { NSItemProvider(object: attachment) }
+            }
+            .onMove(perform: self.moveAttachments)
+            .onDelete(perform: self.deleteAttachments)
+            .conditionally(canAddAttachment) {
+                $0.onInsert(of: CompositionAttachment.readableTypeIdentifiersForItemProvider, perform: self.insertAttachments)
+            }
+            
+            Button(action: self.addAttachment) {
+                Label("Add photo or video", systemImage: addButtonImageName)
+            }
+            .disabled(!canAddAttachment)
+            .foregroundColor(.accentColor)
+            .frame(height: cellHeight / 2)
+            .sheetOrPopover(isPresented: $isShowingAssetPickerPopover, content: self.assetPickerPopover)
+            .listRowInsets(EdgeInsets(top: cellPadding / 2, leading: cellPadding / 2, bottom: cellPadding / 2, trailing: cellPadding / 2))
+            
+            Button(action: self.createDrawing) {
+                Label("Draw something", systemImage: "hand.draw")
+            }
+            .disabled(!canAddAttachment)
+            .foregroundColor(.accentColor)
+            .frame(height: cellHeight / 2)
+            .listRowInsets(EdgeInsets(top: cellPadding / 2, leading: cellPadding / 2, bottom: cellPadding / 2, trailing: cellPadding / 2))
+            
+            Button(action: self.togglePoll) {
+                Label(draft.poll == nil ? "Add a poll" : "Remove poll", systemImage: "chart.bar.doc.horizontal")
+            }
+            .disabled(!canAddPoll)
+            .foregroundColor(.accentColor)
+            .frame(height: cellHeight / 2)
+            .listRowInsets(EdgeInsets(top: cellPadding / 2, leading: cellPadding / 2, bottom: cellPadding / 2, trailing: cellPadding / 2))
+        }
+        .onAppear(perform: self.didAppear)
+    }
+    
+    private var addButtonImageName: String {
+        switch colorScheme {
+        case .dark:
+            return "photo.fill"
+        case .light:
+            return "photo"
+        @unknown default:
+            return "photo"
+        }
+    }
+    
+    private var canAddAttachment: Bool {
+        if mastodonController.instanceFeatures.mastodonAttachmentRestrictions {
+            return draft.attachments.count < 4 && draft.attachments.allSatisfy { $0.data.type == .image } && draft.poll == nil
+        } else {
+            return true
+        }
+    }
+    
+    private var canAddPoll: Bool {
+        if mastodonController.instanceFeatures.pollsAndAttachments {
+            return true
+        } else {
+            return draft.attachments.isEmpty
+        }
+    }
+    
+    private func didAppear() {
+        if #available(iOS 16.0, *) {
+            // these appearance proxy hacks are no longer necessary
+        } else {
+            let proxy = UITableView.appearance(whenContainedInInstancesOf: [ComposeHostingController.self])
+            // enable drag and drop to reorder on iPhone
+            proxy.dragInteractionEnabled = true
+            proxy.isScrollEnabled = false
+        }
+    }
+    
+    private func assetPickerPopover() -> some View {
+        ComposeAssetPicker(draft: draft, delegate: uiState.delegate?.assetPickerDelegate)
+            .onDisappear {
+                // on iPadOS 16, this is necessary to dismiss the popover when collapsing from regular -> compact size class
+                // otherwise, the popover isn't visible but it's still "presented", so the sheet can't be shown
+                self.isShowingAssetPickerPopover = false
+            }
+            // on iPadOS 16, this is necessary to show the dark color in the popover arrow
+            .background(Color(.appBackground))
+            .environment(\.colorScheme, .dark)
+            .edgesIgnoringSafeArea(.bottom)
+            .withSheetDetentsIfAvailable()
+    }
+    
+    private func addAttachment() {
+        if #available(iOS 16.0, *) {
+            isShowingAssetPickerPopover = true
+        } else if horizontalSizeClass == .regular {
+            isShowingAssetPickerPopover = true
+        } else {
+            uiState.delegate?.presentAssetPickerSheet()
+        }
+    }
+    
+    private func moveAttachments(from source: IndexSet, to destination: Int) {
+        draft.attachments.move(fromOffsets: source, toOffset: destination)
+    }
+    
+    private func deleteAttachments(at indices: IndexSet) {
+        draft.attachments.remove(atOffsets: indices)
+    }
+    
+    private func insertAttachments(at offset: Int, itemProviders: [NSItemProvider]) {
+        for provider in itemProviders where provider.canLoadObject(ofClass: CompositionAttachment.self) {
+            guard canAddAttachment else { break }
+            
+            provider.loadObject(ofClass: CompositionAttachment.self) { (object, error) in
+                guard let attachment = object as? CompositionAttachment else { return }
+                DispatchQueue.main.async {
+                    self.draft.attachments.insert(attachment, at: offset)
+                }
+            }
+        }
+    }
+    
+    private func createDrawing() {
+        uiState.composeDrawingMode = .createNew
+        uiState.delegate?.presentComposeDrawing()
+    }
+    
+    private func togglePoll() {
+        UIApplication.shared.sendAction(#selector(UIView.resignFirstResponder), to: nil, from: nil, for: nil)
+        
+        withAnimation {
+            draft.poll = draft.poll == nil ? Draft.Poll() : nil
+        }
+    }
+}
+
+fileprivate extension View {
+    @available(iOS, obsoleted: 16.0)
+    @ViewBuilder
+    func sheetOrPopover(isPresented: Binding<Bool>, @ViewBuilder content: @escaping () -> some View) -> some View {
+        if #available(iOS 16.0, *) {
+            self.modifier(SheetOrPopover(isPresented: isPresented, view: content))
+        } else {
+            self.popover(isPresented: isPresented, content: content)
+        }
+    }
+    
+    @available(iOS, obsoleted: 16.0)
+    @ViewBuilder
+    func withSheetDetentsIfAvailable() -> some View {
+        if #available(iOS 16.0, *) {
+            self
+                .presentationDetents([.medium, .large])
+                .presentationDragIndicator(.visible)
+        } else {
+            self
+        }
+    }
+}
+
+@available(iOS 16.0, *)
+struct SheetOrPopover<V: View>: ViewModifier {
+    @Binding var isPresented: Bool
+    @ViewBuilder let view: () -> V
+    
+    @Environment(\.horizontalSizeClass) var sizeClass
+    
+    func body(content: Content) -> some View {
+        if sizeClass == .compact {
+            content.sheet(isPresented: $isPresented, content: view)
+        } else {
+            content.popover(isPresented: $isPresented, content: view)
+        }
+    }
+}
+
+//struct ComposeAttachmentsList_Previews: PreviewProvider {
+//    static var previews: some View {
+//        ComposeAttachmentsList()
+//    }
+//}