Initial pass at Calckey support

See #362

CHANGELOG-release.md

@@ -1,178 +1,3 @@
-## 2024.2
-This release introduces push notifications as well as an enhanced multi-column interface on iPadOS!
-
-Features/Improvements:
-- Push notifications
-- Add post preview to Appearance preferences
-- Show instance announcements in Notifications tab
-- Add subscription option to Tip Jar
-- iPadOS: Multi-column navigation
-- Pleroma/Akkoma: Emoji reaction notifications
-
-Bugfixes:
-- Fix fetching server info on some instances
-- Fix attachment captions not displaying while loading in gallery
-- macOS: Remove in-app Safari preferences
-- Pleroma: Handle posts with missing creation date
-
-## 2024.1
-This update includes a significant improvements for the attachment gallery and displaying rich text posts. See below for a full list of improvements and fixes.
-
-Features/Improvements:
-- Improve attachment gallery
-  - Improve animations
-  - Display video captions
-  - Support sharing/saving videos
-  - Resume music playback after playing videos
-- Improve rich text display in posts
-- Add See Results button to polls
-- Add Share and Save to Photos menu items to post attachments
-- Show verified links in account lists
-- Display message on empty list timelines
-- Add preference to indicate attachments lacking alt text
-- Mark notifications as read on Mastodon web frontend once displayed
-- iPadOS: Support tapping the selected sidebar item to scroll to top
-
-Bugfixes:
-- Fix issue changing scope after searching
-- Fix crash when searching "from:me"
-- Fix tapping Followers button on profile opening Following screen
-- Fix crash when removing poll option on Compose screen
-- Fix hang when sharing video/GIFV attachments
-- Fix stretched Save to Photos icon when sharing attachments
-- Fix GIFV playback preventing device sleep
-- Fix Notifications tab not scrolling to top when tab bar item tapped
-- Fix selection not clearing on Trending Hashtags
-- Fix fast account switcher overlapping iPhone sensor housing in landscape
-- Fix Edit List screen not updating when adding/removing accounts
-- Fix changing list reply policy not refreshing timeline
-- Pixelfed: Fix crash when there are multiple follow notifications from the same account
-- macOS: Fix attachment gallery displaying improperly when Reduce Motion is on
-
-## 2023.8
-This update adds support for search operators and post translation, and improves support for displaying rich-text posts. See below for a full list of improvements and fixes.
-
-Features/Improvements:
-- Show search operators on Mastodon 4.2
-- Use server-set preference for default post visibility, language, and (on Hometown) local-only
-- Allow changing list reply policy and exclusivity options on Edit List screen
-- Add Translate action to conversations (on supported Mastodon instances)
-- Style block quotes correclty in rich-text posts
-- Improve the appearance of lists in rich-text posts
-- Add preference to underline links
-- Compress uploaded video attachments to fit within instance limits
-- Add preference to hide attachments in timelines
-- Update visible timestamps after refresh notifications/timelines
-- iPadOS: Allow switching between split screen and fullscreen navigation modes
-- Pixelfed: Improve error message when uploading attachment fails
-- Akkoma: Enable composing local-only posts
-
-Bugfixes:
-- Fix older notifications not loading if all initiially-loaded ones are grouped together
-- Fix List timelines failing to refresh if they were initially empty
-- Fix replies to posts with CWs always showing confirmation dialog when cancelling
-- Fix Compose screen permitting setting the language to multiple/undefined
-- Fix crash when uploading attachments without file extensions
-- Fix Live Text button reappearing with swiping between attachment gallery pages
-- Fix avatars on certain notifications flickering when refreshing
-- Fix avatars on follow request notifications not being rounded
-- Fix timeline jump button appearing incorrectly when Button Shapes acccessibility setting is on
-- Fix public instance timeline screen not handling post deletion correctly
-- Fix post that's reblogged and contains a followed hashtag not showing the reblogger
-- Fix crash on launch when reblogged posts are visible
-- Fix crash when showing display names with custom emoji in certain places
-- Fix crash when showing trending hashtags without history data
-- Fix potential crash on instance selector screen
-- Fix potential crash if the app is dismissed while fast account switcher is animating
-- Fix potential crash after deleting List on the Eplore screen
-- Pixelfed: Fix error decoding certain posts
-- VoiceOver: Fix history entries on Edit History screen not having descriptions
-- iPadOS: Fix delay on app launch before "My Profile" sidebar item appears
-- iPadOS: Fix language picker button not highlighting when hovered with the cursor
-- macOS: Fix "New Post" window title appearing twice
-- macOS: Fix Cmd+W sometimes closing non-foreground windows
-- macOS: Fix visibility/local-only buttons not appearing in Compose toolbar
-- macOS: Fix images copied from Safari not pasting on Compose screen
-
-## 2023.7
-This update adds support for iOS 17 and includes some minor changes.
-
-Changes:
-- Support iOS 17
-- Indicate that edit history may be incomplete for remote posts
-- Fix crash when collapsing to tab-bar mode in certain circumstances
-- Fix potential crashes when using autocomplete on the Compose screen
-- Fix Iceshrimp instances not being detected
-
-## 2023.6
-This update fixes a number of bugs and improves stability throughout the app. See below for a list of fixes.
-
-Bugfixes:
-- Fix issues displaying main post in the Conversation screen
-- Fix crash when opening the Compose screen in certain locales
-- Fix issues when collapsing from sidebar to tab bar mode
-- Fix incorrect UI being displayed when accessing certain parts of the app immediately after launch
-- Fix link card images not being blurred on posts marked sensitive
-- Fix links appearing with incorrect accent color intermittently
-- Fix being unable to remove followed hashtags from the Explore screen
-- Akkoma: Fix not being able to follow hashtags
-- Pleroma: Fix refreshing Mentions failing
-- iPhone: Fix ducked Compose screen disappearing when rotating on large phones
-
-## 2023.5
-This update adds new several Compose-related features, including the ability to edit posts, a share sheet extension, and a post language picker. See below for the full list of improvements and bugfixes.
-
-Features/Improvements:
-- Edit posts
-- Indicate edited posts in timestamp
-- Show post edit history from Conversation screen
-- Add Share Sheet extension
-- Add expanded attachment view on Compose screen
-    - Add an attachment, select the description text field, then tap the expand button
-    - Expanded view allows you to see the attachment while writing the description
-    - Allows playing back videos while writing description
-    - iOS 16: Allows zooming in to the attachment
-- Add language picker to the Compose screen
-- Improve Compose screen ducking behavior
-- Show reblogger's avatar on reblogged posts
-- Use system photo picker instead of custom interface
-- Improve hashtag search UI in Customize Timelines
-- Improve status collapse/expand animation on Notifications screen
-- Apply filters to Notifications screen
-- Improve performance when scrolling through timeline
-- Improve error messages when editing filters
-- Change favorite/reblog button order to match Mastodon UI
-- Gracefully handle unknown attachment types
-- iPadOS: Persist sidebar visibility across
-
-Bugfixes:
-- Fix scroll-to-top not working in in-app Safari
-- Fix inaccruate titles in certain error popups
-- Fix error decoding post HTML
-- Fix replied-to account not being the first @-mention
-- Fix "No Content" message on profiles using wrong background color
-- Fix reblogged posts appearing in Bookmarks
-- Fix spurious errors when loading timeline
-- Fix crash when displaying certain profiles
-- Fix crash when the server returns invalid notifications
-- Fix link previews not appearing in Notifications
-- Fix Notifications screen taking a long time to load
-- Fix deleted posts not being removed from Notifications screen
-- Fix crashes when switching between sidebar/tab-bar modes
-- Fix instance features not being detected on IDNA domains
-- Fix list/hashtag timelines missing controls when opened in new window
-- Fix reblog button being enabled on the user's own direct posts
-- Fix main post in Conversation flickering
-- Fix link card images not loading on Mastodon
-- Fix crash when editing filter with the Hide action
-- Fix certain remote status links not being resolved
-- Fix Handoff to iPad/Mac presenting new screen modally
-- GoToSocial: Fix decoding certain posts
-- Calckey: Fix decoding certain posts
-- iPadOS: Fix Compose window lacking a title
-- iPadOS: Fix keyboard focus highlight not showing
-- macOS: Fix sidebar keyboard shortcuts not working
-
 ## 2023.4
 Features/Improvements:
 - Add preference for non-pure-black dark mode

CHANGELOG.md

@@ -1,415 +1,5 @@
 # Changelog
 
-## 2024.3 (127)
-Bugfixes:
-- Fix Remove Suggestion context menu action missing from Suggested Accounts screen
-- Fix profile header images being blurry
-- Fix dismissing gallery when presented from sheet
-- Fix potential crash in multi-column interface
-- Fix crash when opening push notification while sheet presented
-- Fix being able to block your own domain
-- Fix links in profile fields with other text not being interactable
-- Fix excessive CPU use immediately after app launch
-- Fix timeline failing to load when one status is malformed
-- iPadOS: Fix pointer interactions on conversation main status action buttons
-- iPadOS: Fix multiple close buttons being added in multi-column interface
-- iPadOS: Fix Cmd+1/etc. resetting navigation state when returning to previous column
-- iPadOS: Fix previous sidebar selection losing navigation state in some circumstances
-- iPadOS: Fix profile followers/following buttons not having pointer effect
-- iPadOS: Fix search token suggestions not having pointer effect
-- iPadOS: Fix conversation thread links appearing above avatar during pointer effect
-- iPadOS: Fix multi-column interface not animating scroll when replacing subsequent columns
-- iPadOS: Fix not being able to select text on conversation main status by double-clicking with cursor
-- iPadOS: Fix selecting search result always pushing new column rather than replacing
-- Pixelfed/Firefish: Fix error loading accounts in some circumstances
-- Pixelfed: Fix loading relationships and follow/block/etc. actions not working
-
-## 2024.3 (126)
-Bugfixes:
-- Fix an issue displaying post HTML in certain edge cases
-- Fix crash when video attachment playback ends
-- Fix excessive CPU usage when scrubbing video attachment
-- Fix video attachment thubmnails being flipped on Compose screen
-- Pleroma: Fix editing attachment descriptions not working
-
-## 2024.2 (124)
-Features/Improvements:
-- Add subscription option to Tip Jar
-
-Bugfixes:
-- Fix attachment captions not displaying while loading in gallery
-- Fix tapping follow request push notification not working
-- Pleroma: Handle posts with missing creation dates
-
-## 2024.2 (122)
-Features/Improvements:
-- Show instance announcements in Notifications
-- Pleroma/Akkoma: Display emoji reactions in Notifications
-- Pleroma/Akkoma: Add push notifications for emoji reactions
-
-Bugfixes:
-- Fix issue fetching server info on some instances
-- Fix Preferences background color not updating after changing Pure Black Dark Mode
-- Fix push subscription settings background using incorrect color with Pure Black Dark Mode off
-
-## 2024.2 (121)
-This build introduces a new multi-column navigation mode on iPad. You can revert to the old mode under Preferences -> Appearance.
-
-Features/Improvements:
-- iPadOS: Enable multi-column navigation
-- Add post preview to Appearance preferences
-- Consolidate Media preferences section with Appearance
-- Add icons to Preferences sections
-
-Bugfixes:
-- Fix push notifications not working on Pleroma/Akkoma and older Mastodon versions
-- Fix push notifications not working with certain accounts
-- Fix links on About screen not being aligned
-- macOS: Remove non-functional in-app Safari preferences
-
-## 2024.2 (120)
-This build adds push notifications, which can be enabled in Preferences -> Notifications.
-
-## 2024.1 (119)
-Features/Improvements:
-- Add Account Settings button to Preferences
-
-## 2024.1 (118)
-Bugfixes:
-- Fix music not pausing/resuming when video playback starts
-
-## 2024.1 (117)
-Features/Improvements:
-- Add See Results button to polls
-
-Bugfixes:
-- Fix race condition when presenting gallery for 4th of more than 4 attachments
-- Fix gallery interactive dismissal not working for 4th or later attachments on posts with more than 4 attachments
-- Pixelfed: Fix crash when there are multiple follow notifications from the same account
-- macOS: Fix gallery being positioned incorrectly when Reduce Motion is on
-
-## 2024.1 (116)
-Features/Improvements:
-- Display message on empty list timelines
-- Add preference to display badge for attachments that lack alt text
-- Mark notifications as read on the Mastodon web frontend once displayed
-- iPadOS: Support tapping the selected sidebar item to scroll to top
-
-Bugfixes:
-- Fix playing back GIFVs preventing the device sleeping
-- Fix incorrect cell separator insets followers/following lists
-- Fix memory leak in attachments gallery
-- Fix notifications tab not scrolling to top when tab bar item tapped
-- Fix Trending Hashtags screen not clearing selection
-- Fix fast account switcher overlapping sensor housing on landscape iPhones
-- Fix Edit List screen not updating when accounts are added/removed
-- Fix changing List reply policy not refreshing list timeline
-- macOS: Fix certain gallery attachments being incorrectly sized/positioned
-
-## 2024.1 (115)
-Features/Improvements:
-- Rewrite attachment gallery
-  - Fixes a number of long-standing issues
-  - Adds a custom video player that shows controls and caption
-  - Supports sharing/saving videos
-
-Bugfixes:
-- Fix hang when sharing video/gifv attachments
-- Fix stretched icon for Save to Photos action when sharing attachment
-- Fix crash when Compose screen is dismissed while adding attachments
-- Fix crash when sharing attachment from context menu on iPad
-
-## 2024.1 (113)
-Features/Improvements:
-- Add Share and Save to Photos context menu actions to attachments
-- Show verified link in account lists
-- Change cell separator appearance on posts
-
-Bugfixes:
-- Fix tapping Followers button on profiles opening Following screen
-- Fix crash when removing poll option on Compose screen
-- Fix leading indentation in post text being ignored
-- Fix crash when viewing posts containing HTML numeric character references
-- Fix paragraphs starting with links being combined with previous paragraph
-
-## 2024.1 (112)
-Bugfixes:
-- Fix profile field links not displaying
-- Fix various issues displaying rich text in posts
-- Fix issue changing scope after searching
-- Fix crash when searching for "from:me"
-
-## 2024.1 (111)
-This build contains a complete rewrite of the HTML parsing pipeline for displaying posts. If you notice any issues with how post text appears—especially when it differs from on the web—please report it!
-
-## 2023.8 (110)
-Bugfixes:
-- Fix potential crash after deleting List on Explore screen
-
-## 2023.8 (109)
-Features/Improvements:
-- Add Translate action to conversations (on supported Mastodon instances)
-- Improve share extension launch speed
-- Add preference for hiding attachments in timelines
-
-Bugfixes:
-- Fix crash during state restoration when reblogged statuses are present
-- Fix timeline state restoration using incorrect scroll position in certain circumstances
-- Fix status that is reblogged and contains a followed hashtag not showing reblogger label
-- macOS: Fix visibility/local-only buttons not appearing in Compose toolbar
-- macOS: Fix images copied from Safari not pasting on Compose screen
-
-## 2023.8 (107)
-Features/Improvements:
-- Style blockquotes in statuses
-- Use server language preference for search operator suggestions
-- Render IDN domains in the account switcher
-
-Bugfixes:
-- Fix crash when showing trending hashtags with improper history data
-- Fix crash when uploading attachment w/o file extension
-- Fix status deletions not being handled properly in logged out views
-- Fix status history entries not having VoiceOver descriptions
-- Fix avatars in follow request notifications not being rounded
-- Fix potential crash if the app is dismissed while fast account switcher is animating
-- Fix error decoding certain statuses on Pixelfed
-
-## 2023.8 (106)
-Bugfixes:
-- Fix being able to set post language to multiple/undefined
-- iPadOS: Fix language picker button not having a pointer effect
-- macOS: Fix Cmd+W sometimes closing the non-foreground window
-
-## 2023.8 (105)
-Features/Improvements:
-- Use server-set preference for default post visibility, language, and (on Hometown) local-only
-- Add preference to underline links
-- Allow changing list reply policy and exclusivity from menu on Edit List screen
-- Attribute network requests to user, rather than developer, when appropriate
-
-Bugfixes:
-- Fix older notifications not loading if all initially-loaded are grouped together
-- Fix list timelines failing to refresh if there were no statuses initially
-- Fix timeline jump button having a background when Button Shapes accessibility setting is on
-- Fix crash when relaunching app after not being launched in more than a week
-- Fix potential crash on instance selector screen
-- Fix crash when showing display names with custom emojis in certain places
-
-## 2023.8 (104)
-Features/Improvements:
-- Show search operators on Mastodon 4.2
-- Enable composing local-only posts on Akkoma
-- Update timestamps after refreshing notifications/timelines
-- Improve list appearance in rich text posts
-- Improve error message when uploading attachment to Pixelfed fails
-- Compress uploaded videos to fit within instance limits
-- iPad: Allow switching between split screen and full screen navigation
-
-Bugfixes:
-- Fix replies to posts with content warnings always showing confirmation dialog before closing
-- Fix Live Text control reappearing when swiping between attachment gallery pages
-- Fix avatars on certain notifications flickering when refreshing
-- iPad: Fix delay on app launch before "My Profile" sidebar item appears
-- macOS: Fix "New Post" window title appearing twice
-
-## 2023.7 (103)
-Features/Improvements:
-- Add support for iOS 17
-- Indicate that edit history may be incomplete for remote posts
-
-Bugfixes:
-- Fix crash when collapsing to tab-bar mode in certain circumstances
-- Fix potential crashes when using autocomplete on the Compose screen
-- Fix Iceshrimp instances not being detected
-
-## 2023.6 (100)
-Bugfixes:
-- Fix Conversation main post flashing incorrect background color when touched
-- Fix reblogs count button in Conversation main post not being left-aligned
-- Fix Conversation main post flickering when context loaded
-- Fix context menu not appearing when long pressing finished/voted poll
-- Fix Tip Jar button width changing while purchasing
-- Fix crash when opening Compose screen in certain locales
-- Fix potential issue with Recognize Text context menu action on attachments
-- Fix attachment deletion context menu action not working
-- Fix crash when collapsing from sidebar to tab bar mode
-- Fix crash when post deleted before Notifications screen is loaded
-- Fix race conditions when accessing certain parts of the app immediately upon launch
-- Fix crash when viewing invalid user post notifications
-- Fix non-square avatars not displaying correctly in various places
-- Fix incorrect context menu preview being shown on filtered posts
-- Fix link card images not being blurred on sensitive posts
-- Fix reblog confirmation alert showing incorrect visibilities for non-public posts
-- Fix Home/Notifications tab switchers being cut off with smaller than default Dynamic Type sizes
-- Fix posts using incorrect accent color for links in certain circumstances
-- Fix not being able to remove followed hashtags from Explore screen
-- Fix not being able to attach images from Markup share sheet or Shortcuts share action
-- Fix very wide attachments being untappably short
-- Fix double posting in poor network conditions
-- Fix crash when autocompleting emoji on instances with a large number of custom emoji
-- Akkoma: Fix not being able to follow hashtags
-- Pleroma: Fix refreshing Mentions failing
-- iPhone: Fix ducked Compose screen breaking when rotating on Plus/Max iPhone models
-- iPhone: Fix Compose toolbar not extending to the full width of the screen in landscape on iPhone
-- iPadOS: Fix closing app dismissing in-app Safari
-- iPadOS: Fix reblog confirmation alert not being centered in split view
-
-## 2023.5 (98)
-Bugfixes:
-- Fix broken animation when opening/closing expanded attachment view on Compose screen
-
-## 2023.5 (97)
-Features/Improvements:
-- Change favorite/reblog button order to match Mastodon
-- Use QuickLook as a fallback for uknown attachment types
-
-Bugfixes:
-- Fix crash when adding drawing attachment
-
-## 2023.5 (96)
-Features/Improvements:
-- Resolve Mastodon's remote status links
-
-Bugfixes:
-- Fix handoff to iPad/Mac presenting new screen modally rather than navigating
-- Fix crash if timeline gap cell is accessibility-activated after leaking
-- Fix various crashes when multiple Compose/Drafts screens are opened
-- Delete orphaned draft attachments
-- Fix deleted posts not getting removed from Notifications screen
-- Fix replied-to status not changing when selecting draft
-
-## 2023.5 (94)
-Features/Improvements:
-- Apply filters to Notifications screen
-
-Bugfixes:
-- Fix editing posts not working on Akkoma
-- Fix editing Markdown/HTML posts
-- Fix crash when editing filter with Hide action
-
-## 2023.5 (91)
-Features/Improvements:
-- Improve performance when scrolling through timeline
-- Improve error messages when editing filters
-- Enable editing posts on Pleroma 2.5+
-
-Bugfixes:
-- Fix share sheet extension not working with Apple News
-- Fix crash when sharing certain photos with share extension
-- Fix reblog button being enabled on Direct posts
-- Fix expanded statuses collapsing when opening Conversation
-- Fix main post in Conversation flickering when context loaded
-- Fix link card images not loading on Mastodon
-
-## 2023.5 (89)
-This build is a hotfix for an issue loading notifications in certain circumstances. The changelong for the previous build (adding post editing) is included below.
-
-## 2023.5 (85)
-This build adds support for editing posts and showing edit timestamps and history.
-
-Features/Improvements:
-- Post editing
-- Show post edit history
-- Improve rate limit exceeded error message
-- Shorten hashtag save/follow action subtitles so they fit in the context menu
-- Remove Hide/Show Reblogs action for accounts the user isn't following
-
-Bugfixes:
-- Fix nodeinfo not being fetched on instances with punycode domains
-- Fix potential crash with interactive push gesture
-- Fix list timelines opened in new window lacking Edit button
-- Fix hashtag timelines opened in new window lacking save/follow actions
-- Fix being able to scroll to top while fast account switcher is active
-- Fix decoding statuses lacking emojis on Calckey
-- Fix decoding polls on Calckey
-
-## 2023.5 (84)
-Bugfixes:
-- Fix notifications scrolling to top when refreshing
-- Fix decoding statuses failing on GoToSocial
-- Fix assorted issues when collapsing/expanding between sidebar and tab bar modes
-
-## 2023.5 (83)
-This build contains significant refactors to the notifications screen, please report any issues you encounter.
-
-Features/Improvements:
-- Tweak appearance of profile fields
-- Make language picker sheet half-height
-
-Bugfixes:
-- Fix crash when laying out profile fields on certain accounts
-- Fix other presented screens getting dismissed when opened after closing expanded attachment view
-- Fix janky status collapse/expand animation on notifications screen
-- Fix link previews not appearing in notifications
-
-## 2023.5 (81)
-Further improvements and fixes to the Compose screen, see below. Features are frozen for the upcoming release, please report any bugs you encounter!
-
-Features/Improvements:
-- Add expanded attachment view on Compose screen
-    - Add an attachment, select the description text field, and tap on the expand button on the attachment thumbnail
-    - Expanded attachment view allows you to view the attachment larger while writing the description
-    - Plays back videos while writing the description
-    - iOS 16: Allow zooming in to expanded attachment view
-- Add language picker to Compose screen
-- Persist sidebar visibility across app launches
-- Align link verification checkmarks to link rather than creen edge
-- Fully dismiss, rather than ducking, the Compose screen when swiped down with no content
-- Remove Automatically Save Drafts preference
-    - Drafts are always saved automatically, and the save/delete sheet is now always shown on dismiss
-
-Bugfixes:
-- Fix share sheet extension being unavailable on iOS 15
-- Fix crash when loading draft with poll from share sheet extension
-- Fix active draft being deleted when Compose screen ducked
-- Fix restored, ducked Compose screen lacking title
-- Fix error when reloading empty profile
-- Fix local attachments not being deleted upon draft deletion
-- Fix GIFs being converted to still images on upload
-- Fix crash on deleting draft with attachments in share extension
-- Fix deleted attachments in Compose screen reappearing
-- Fix spinner on Send Report button being misplaced
-- Fix crash on launch loop when migrating from previous version in certain circumstances
-
-## 2023.5 (80)
-This build adds a Share Sheet extension and introduces further Compose screen refactors.
-
-Features/Improvements:
-- Add Share Sheet extension
-- Show reblogger's avatar on reblogged posts
-
-Bugfixes:
-- Fix not being able to close Compose screen when Automatically Save Drafts preference is off
-- Fix Post button always being disabled when Require Attachment Descriptions preference is on
-- Fix crash when pasting screenshots
-- Fix not being able to paste gifs
-- Don't consider HTTP 206 responses to timeline requests to be errors
-- Fix crash when displaying menu for statuses missing URLs
-- Fix errors while posting not displaying useful error messages
-
-## 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.
 

NotificationExtension/Info.plist

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>TuskerInfo</key>
-	<dict>
-		<key>PushProxyHost</key>
-		<string>$(TUSKER_PUSH_PROXY_HOST)</string>
-		<key>PushProxyScheme</key>
-		<string>$(TUSKER_PUSH_PROXY_SCHEME)</string>
-		<key>SentryDSN</key>
-		<string>$(SENTRY_DSN)</string>
-	</dict>
-	<key>NSExtension</key>
-	<dict>
-		<key>NSExtensionPointIdentifier</key>
-		<string>com.apple.usernotifications.service</string>
-		<key>NSExtensionPrincipalClass</key>
-		<string>$(PRODUCT_MODULE_NAME).NotificationService</string>
-	</dict>
-</dict>
-</plist>

NotificationExtension/NotificationExtension.entitlements

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>com.apple.security.app-sandbox</key>
-	<true/>
-	<key>com.apple.security.application-groups</key>
-	<array>
-		<string>group.$(BUNDLE_ID_PREFIX).Tusker</string>
-	</array>
-	<key>com.apple.security.network.client</key>
-	<true/>
-</dict>
-</plist>

NotificationExtension/NotificationService.swift

@@ -1,362 +0,0 @@
-//
-//  NotificationService.swift
-//  NotificationExtension
-//
-//  Created by Shadowfacts on 4/9/24.
-//  Copyright © 2024 Shadowfacts. All rights reserved.
-//
-
-import UserNotifications
-import UserAccounts
-import PushNotifications
-import CryptoKit
-import OSLog
-import Pachyderm
-import Intents
-import HTMLStreamer
-import WebURL
-
-private let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "NotificationService")
-
-class NotificationService: UNNotificationServiceExtension {
-    
-    private static let textConverter = TextConverter(configuration: .init(insertNewlines: false), callbacks: HTMLCallbacks.self)
-    
-    private var pendingRequest: (UNMutableNotificationContent, (UNNotificationContent) -> Void, Task<Void, Never>)?
-
-    override func didReceive(_ request: UNNotificationRequest, withContentHandler contentHandler: @escaping (UNNotificationContent) -> Void) {
-        guard let mutableContent = request.content.mutableCopy() as? UNMutableNotificationContent else {
-            logger.error("Couldn't get mutable content")
-            contentHandler(request.content)
-            return
-        }
-        
-        guard request.content.userInfo["v"] as? Int == 1,
-              let accountID = (request.content.userInfo["ctx"] as? String).flatMap(\.removingPercentEncoding),
-              let account = UserAccountsManager.shared.getAccount(id: accountID),
-              let subscription = getSubscription(account: account),
-              let encryptedBody = (request.content.userInfo["data"] as? String).flatMap({ Data(base64Encoded: $0) }),
-              let salt = (request.content.userInfo["salt"] as? String).flatMap(decodeBase64URL(_:)),
-              let serverPublicKeyData = (request.content.userInfo["pk"] as? String).flatMap(decodeBase64URL(_:)) else {
-            logger.error("Missing info from push notification")
-            contentHandler(request.content)
-            return
-        }
-        
-        guard let body = decryptNotification(subscription: subscription, serverPublicKeyData: serverPublicKeyData, salt: salt, encryptedBody: encryptedBody) else {
-            contentHandler(request.content)
-            return
-        }
-
-        let withoutPadding = body.dropFirst(2)
-        
-        let notification: PushNotification
-        do {
-            notification = try JSONDecoder().decode(PushNotification.self, from: withoutPadding)
-        } catch {
-            logger.error("Unable to decode push payload: \(String(describing: error))")
-            contentHandler(request.content)
-            return
-        }
-        
-        mutableContent.title = notification.title
-        mutableContent.body = notification.body
-        mutableContent.userInfo["notificationID"] = notification.notificationID
-        mutableContent.userInfo["accountID"] = accountID
-        mutableContent.targetContentIdentifier = accountID
-
-        let task = Task {
-            await updateNotificationContent(mutableContent, account: account, push: notification)
-            if !Task.isCancelled {
-                contentHandler(pendingRequest?.0 ?? mutableContent)
-                pendingRequest = nil
-            }
-        }
-        pendingRequest = (mutableContent, contentHandler, task)
-    }
-    
-    override func serviceExtensionTimeWillExpire() {
-        if let pendingRequest {
-            logger.debug("Expiring with pending request")
-            pendingRequest.2.cancel()
-            pendingRequest.1(pendingRequest.0)
-            self.pendingRequest = nil
-        } else {
-            logger.debug("Expiring without pending request")
-        }
-    }
-    
-    private func updateNotificationContent(_ content: UNMutableNotificationContent, account: UserAccountInfo, push: PushNotification) async {
-        let client = Client(baseURL: account.instanceURL, accessToken: account.accessToken)
-        let notification: Pachyderm.Notification
-        do {
-            notification = try await client.run(Client.getNotification(id: push.notificationID)).0
-        } catch {
-            logger.error("Error fetching notification: \(String(describing: error))")
-            return
-        }
-        
-        let kindStr: String?
-        switch notification.kind {
-        case .reblog:
-            kindStr = "🔁 Reblogged"
-        case .favourite:
-            kindStr = "⭐️ Favorited"
-        case .follow:
-            kindStr = "👤 Followed by @\(notification.account.acct)"
-        case .followRequest:
-            kindStr = "👤 Asked to follow by @\(notification.account.acct)"
-        case .poll:
-            kindStr = "📊 Poll finished"
-        case .update:
-            kindStr = "✏️ Edited"
-        case .emojiReaction:
-            if let emoji = notification.emoji {
-                kindStr = "\(emoji) Reacted"
-            } else {
-                kindStr = nil
-            }
-        default:
-            kindStr = nil
-        }
-        
-        let notificationContent: String?
-        if let status = notification.status {
-            notificationContent = NotificationService.textConverter.convert(html: status.content)
-        } else if notification.kind == .follow || notification.kind == .followRequest {
-            notificationContent = nil
-        } else {
-            notificationContent = push.body
-        }
-        
-        content.body = [kindStr, notificationContent].compactMap { $0 }.joined(separator: "\n")
-        
-        let attachmentDataTask: Task<URL?, Never>?
-        // We deliberately don't include attachments for other types of notifications that have statuses (favs, etc.)
-        // because we risk just fetching the same thing a bunch of times for many senders.
-        if notification.kind == .mention || notification.kind == .status || notification.kind == .update,
-           let attachment = notification.status?.attachments.first {
-            let url = attachment.previewURL ?? attachment.url
-            attachmentDataTask = Task {
-                do {
-                    let data = try await URLSession.shared.data(from: url).0
-                    let localAttachmentURL = FileManager.default.temporaryDirectory.appendingPathComponent("attachment_\(attachment.id)").appendingPathExtension(url.pathExtension)
-                    try data.write(to: localAttachmentURL)
-                    return localAttachmentURL
-                } catch {
-                    logger.error("Error setting notification attachments: \(String(describing: error))")
-                    return nil
-                }
-            }
-        } else {
-            attachmentDataTask = nil
-        }
-        
-        let conversationIdentifier: String?
-        if let status = notification.status {
-            if let context = status.pleromaExtras?.context {
-                conversationIdentifier = "context:\(context)"
-            } else if [Notification.Kind.reblog, .favourite, .poll, .update].contains(notification.kind) {
-                conversationIdentifier = "status:\(status.id)"
-            } else {
-                conversationIdentifier = nil
-            }
-        } else {
-            conversationIdentifier = nil
-        }
-        
-        let account: Account?
-        switch notification.kind {
-        case .mention, .status:
-            account = notification.status?.account
-        default:
-            account = notification.account
-        }
-        let sender: INPerson?
-        if let account {
-            let handle = INPersonHandle(value: "@\(account.acct)", type: .unknown)
-            let image: INImage?
-            if let avatar = account.avatar,
-               let (data, resp) = try? await URLSession.shared.data(from: avatar),
-               let code = (resp as? HTTPURLResponse)?.statusCode,
-               (200...299).contains(code) {
-                image = INImage(imageData: data)
-            } else {
-                image = nil
-            }
-            sender = INPerson(
-                personHandle: handle,
-                nameComponents: nil,
-                displayName: account.displayName,
-                image: image,
-                contactIdentifier: nil,
-                customIdentifier: account.id
-            )
-        } else {
-            sender = nil
-        }
-
-        let intent = INSendMessageIntent(
-            recipients: nil,
-            outgoingMessageType: .outgoingMessageText,
-            content: notificationContent,
-            speakableGroupName: nil,
-            conversationIdentifier: conversationIdentifier,
-            serviceName: nil,
-            sender: sender,
-            attachments: nil
-        )
-        
-        let interaction = INInteraction(intent: intent, response: nil)
-        interaction.direction = .incoming
-        
-        do {
-            try await interaction.donate()
-        } catch {
-            logger.error("Error donating interaction: \(String(describing: error))")
-            return
-        }
-        
-        let updatedContent: UNMutableNotificationContent
-        do {
-            let newContent = try content.updating(from: intent)
-            if let newMutableContent = newContent.mutableCopy() as? UNMutableNotificationContent {
-                pendingRequest?.0 = newMutableContent
-                updatedContent = newMutableContent
-            } else {
-                updatedContent = content
-            }
-        } catch {
-            logger.error("Error updating notification from intent: \(String(describing: error))")
-            updatedContent = content
-        }
-        
-        if let localAttachmentURL = await attachmentDataTask?.value,
-           let attachment = try? UNNotificationAttachment(identifier: localAttachmentURL.lastPathComponent, url: localAttachmentURL) {
-            updatedContent.attachments = [
-                attachment
-            ]
-        }
-    }
-    
-    private func getSubscription(account: UserAccountInfo) -> PushNotifications.PushSubscription? {
-        DispatchQueue.main.sync {
-            // this is necessary because of a swift bug: https://github.com/apple/swift/pull/72507
-            MainActor.runUnsafely {
-                PushManager.shared.pushSubscription(account: account)
-            }
-        }
-    }
-    
-    private func decryptNotification(subscription: PushNotifications.PushSubscription, serverPublicKeyData: Data, salt: Data, encryptedBody: Data) -> Data? {
-        // See https://github.com/ClearlyClaire/webpush/blob/f14a4d52e201128b1b00245d11b6de80d6cfdcd9/lib/webpush/encryption.rb
-        
-        var context = Data()
-        context.append(0)
-        let clientPublicKey = subscription.secretKey.publicKey.x963Representation
-        let clientPublicKeyLength = UInt16(clientPublicKey.count)
-        context.append(UInt8((clientPublicKeyLength >> 8) & 0xFF))
-        context.append(UInt8(clientPublicKeyLength & 0xFF))
-        context.append(clientPublicKey)
-        let serverPublicKeyLength = UInt16(serverPublicKeyData.count)
-        context.append(UInt8((serverPublicKeyLength >> 8) & 0xFF))
-        context.append(UInt8(serverPublicKeyLength & 0xFF))
-        context.append(serverPublicKeyData)
-        
-        func info(encoding: String) -> Data {
-            var info = Data("Content-Encoding: \(encoding)\0P-256".utf8)
-            info.append(context)
-            return info
-        }
-
-        let sharedSecret: SharedSecret
-        do {
-            let serverPublicKey = try P256.KeyAgreement.PublicKey(x963Representation: serverPublicKeyData)
-            sharedSecret = try subscription.secretKey.sharedSecretFromKeyAgreement(with: serverPublicKey)
-        } catch {
-            logger.error("Error getting shared secret: \(String(describing: error))")
-            return nil
-        }
-        
-        let sharedInfo = Data("Content-Encoding: auth\0".utf8)
-        let pseudoRandomKey = sharedSecret.hkdfDerivedSymmetricKey(using: SHA256.self, salt: subscription.authSecret, sharedInfo: sharedInfo, outputByteCount: 32)
-        let contentEncryptionKeyInfo = info(encoding: "aesgcm")
-        let contentEncryptionKey = HKDF<SHA256>.deriveKey(inputKeyMaterial: pseudoRandomKey, salt: salt, info: contentEncryptionKeyInfo, outputByteCount: 16)
-        let nonceInfo = info(encoding: "nonce")
-        let nonce = HKDF<SHA256>.deriveKey(inputKeyMaterial: pseudoRandomKey, salt: salt, info: nonceInfo, outputByteCount: 12)
-        
-        let nonceAndEncryptedBody = nonce.withUnsafeBytes { noncePtr in
-            var data = Data(buffer: noncePtr.bindMemory(to: UInt8.self))
-            data.append(encryptedBody)
-            return data
-        }
-        do {
-            let sealedBox = try AES.GCM.SealedBox(combined: nonceAndEncryptedBody)
-            let decrypted = try AES.GCM.open(sealedBox, using: contentEncryptionKey)
-            return decrypted
-        } catch {
-            logger.error("Error decrypting push: \(String(describing: error))")
-            return nil
-        }
-    }
-
-}
-
-extension MainActor {
-    @_unavailableFromAsync
-    @available(macOS, obsoleted: 14.0)
-    @available(iOS, obsoleted: 17.0)
-    @available(watchOS, obsoleted: 10.0)
-    @available(tvOS, obsoleted: 17.0)
-    @available(visionOS 1.0, *)
-    static func runUnsafely<T>(_ body: @MainActor () throws -> T) rethrows -> T {
-        if #available(macOS 14.0, iOS 17.0, watchOS 10.0, tvOS 17.0, *) {
-            return try MainActor.assumeIsolated(body)
-        }
-        
-        dispatchPrecondition(condition: .onQueue(.main))
-        return try withoutActuallyEscaping(body) { fn in
-            try unsafeBitCast(fn, to: (() throws -> T).self)()
-        }
-    }
-}
-
-private func decodeBase64URL(_ s: String) -> Data? {
-    var str = s.replacingOccurrences(of: "-", with: "+").replacingOccurrences(of: "_", with: "/")
-    if str.count % 4 != 0 {
-        str.append(String(repeating: "=", count: 4 - str.count % 4))
-    }
-    return Data(base64Encoded: str)
-}
-
-// copied from HTMLConverter.Callbacks, blergh
-private struct HTMLCallbacks: HTMLConversionCallbacks {
-    static func makeURL(string: String) -> URL? {
-        // Converting WebURL to URL is a small but non-trivial expense (since it works by
-        // serializing the WebURL as a string and then having Foundation parse it again),
-        // so, if available, use the system parser which doesn't require another round trip.
-        if #available(iOS 16.0, macOS 13.0, *),
-           let url = try? URL.ParseStrategy().parse(string) {
-            url
-        } else if let web = WebURL(string),
-                  let url = URL(web) {
-            url
-        } else {
-            URL(string: string)
-        }
-    }
-    
-    static func elementAction(name: String, attributes: [Attribute]) -> ElementAction {
-        guard name == "span" else {
-            return .default
-        }
-        let clazz = attributes.attributeValue(for: "class")
-        if clazz == "invisible" {
-            return .skip
-        } else if clazz == "ellipsis" {
-            return .append("…")
-        } else {
-            return .default
-        }
-    }
-}

NotificationExtension/PrivacyInfo.xcprivacy

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>NSPrivacyAccessedAPITypes</key>
-	<array>
-		<dict>
-			<key>NSPrivacyAccessedAPITypeReasons</key>
-			<array>
-				<string>1C8F.1</string>
-			</array>
-			<key>NSPrivacyAccessedAPIType</key>
-			<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
-		</dict>
-	</array>
-</dict>
-</plist>

OpenInTusker/ActionViewController.swift

@@ -8,7 +8,6 @@
 
 import UIKit
 import MobileCoreServices
-import UniformTypeIdentifiers
 
 class ActionViewController: UIViewController {
 
@@ -18,29 +17,25 @@ class ActionViewController: UIViewController {
         super.viewDidLoad()
         
         findURLFromWebPage { (components) in
-            DispatchQueue.main.async {
+            if let components = components {
-                if let components {
                 self.searchForURLInApp(components)
             } else {
                 self.findURLItem { (components) in
-                        if let components {
+                    if let components = components {
-                            DispatchQueue.main.async {
                         self.searchForURLInApp(components)
                     }
                 }
             }
         }
     }
-        }
-    }
     
-    private func findURLFromWebPage(completion: @escaping @Sendable (URLComponents?) -> Void) {
+    private func findURLFromWebPage(completion: @escaping (URLComponents?) -> Void) {
         for item in extensionContext!.inputItems as! [NSExtensionItem] {
             for provider in item.attachments! {
-                guard provider.hasItemConformingToTypeIdentifier(UTType.propertyList.identifier) else {
+                guard provider.hasItemConformingToTypeIdentifier(kUTTypePropertyList as String) else {
                     continue
                 }
-                provider.loadItem(forTypeIdentifier: UTType.propertyList.identifier, options: nil) { (result, error) in
+                provider.loadItem(forTypeIdentifier: kUTTypePropertyList as String, options: nil) { (result, error) in
                     guard let result = result as? [String: Any],
                           let jsResult = result[NSExtensionJavaScriptPreprocessingResultsKey] as? [String: Any],
                           let urlString = jsResult["activityPubURL"] as? String ?? jsResult["url"] as? String,
@@ -58,13 +53,13 @@ class ActionViewController: UIViewController {
         completion(nil)
     }
     
-    private func findURLItem(completion: @escaping @Sendable (URLComponents?) -> Void) {
+    private func findURLItem(completion: @escaping (URLComponents?) -> Void) {
         for item in extensionContext!.inputItems as! [NSExtensionItem] {
             for provider in item.attachments! {
-                guard provider.hasItemConformingToTypeIdentifier(UTType.url.identifier) else {
+                guard provider.hasItemConformingToTypeIdentifier(kUTTypeURL as String) else {
                     continue
                 }
-                provider.loadItem(forTypeIdentifier: UTType.url.identifier, options: nil) { (result, error) in
+                provider.loadItem(forTypeIdentifier: kUTTypeURL as String, options: nil) { (result, error) in
                     guard let result = result as? URL,
                           let components = URLComponents(url: result, resolvingAgainstBaseURL: false) else {
                         completion(nil)

OpenInTusker/Info.plist

@@ -24,8 +24,6 @@
 	<dict>
 		<key>NSExtensionAttributes</key>
 		<dict>
-			<key>NSExtensionServiceRoleType</key>
-			<string>NSExtensionServiceRoleTypeViewer</string>
 			<key>NSExtensionActivationRule</key>
 			<dict>
 				<key>NSExtensionActivationSupportsAttachmentsWithMinCount</key>

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

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

Packages/ComposeUI/Package.swift

@@ -19,14 +19,13 @@ let package = Package(
         .package(path: "../Pachyderm"),
         .package(path: "../InstanceFeatures"),
         .package(path: "../TuskerComponents"),
-        .package(path: "../MatchedGeometryPresentation"),
     ],
     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", "MatchedGeometryPresentation"]),
+            dependencies: ["Pachyderm", "InstanceFeatures", "TuskerComponents"]),
         .testTarget(
             name: "ComposeUITests",
             dependencies: ["ComposeUI"]),

Packages/ComposeUI/Sources/ComposeUI/API/PostService.swift

@@ -1,6 +1,6 @@
 //
 //  PostService.swift
-//  ComposeUI
+//  Tusker
 //
 //  Created by Shadowfacts on 4/27/22.
 //  Copyright © 2022 Shadowfacts. All rights reserved.
@@ -10,120 +10,87 @@ import Foundation
 import Pachyderm
 import UniformTypeIdentifiers
 
-@MainActor
 class PostService: ObservableObject {
     private let mastodonController: ComposeMastodonContext
     private let config: ComposeUIConfig
     private let draft: Draft
+    let totalSteps: Int
     
     @Published var currentStep = 1
-    @Published private(set) var totalSteps = 2
     
     init(mastodonController: ComposeMastodonContext, config: ComposeUIConfig, 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)
     }
     
+    @MainActor
     func post() async throws {
-        guard draft.hasContent || draft.editedStatusID != nil else {
+        guard draft.hasContent else {
             return
         }
         
         // save before posting, so if a crash occurs during network request, the status won't be lost
-        DraftsPersistentContainer.shared.save()
+        DraftsManager.save()
         
         let uploadedAttachments = try await uploadAttachments()
         
-        let contentWarning = draft.contentWarningEnabled ? draft.contentWarning : ""
+        let contentWarning = draft.contentWarningEnabled ? draft.contentWarning : nil
-        let sensitive = !contentWarning.isEmpty
+        let sensitive = contentWarning != nil
         
-        let request: Request<Status>
+        let request = Client.createStatus(
-        
-        if let editedStatusID = draft.editedStatusID {
-            if mastodonController.instanceFeatures.needsEditAttachmentsInSeparateRequest {
-                await updateEditedAttachments()
-            }
-            
-            request = Client.editStatus(
-                id: editedStatusID,
-                text: textForPosting(),
-                contentType: config.contentType,
-                spoilerText: contentWarning,
-                sensitive: sensitive,
-                language: mastodonController.instanceFeatures.createStatusWithLanguage ? draft.language : nil,
-                mediaIDs: uploadedAttachments,
-                mediaAttributes: draft.draftAttachments.compactMap {
-                    if let id = $0.editedAttachmentID {
-                        return EditStatusMediaAttributes(id: id, description: $0.attachmentDescription, focus: nil)
-                    } else {
-                        return nil
-                    }
-                },
-                poll: draft.poll.map {
-                    EditPollParameters(options: $0.pollOptions.map(\.text), expiresIn: Int($0.duration), multiple: $0.multiple)
-                }
-            )
-        } else {
-            request = Client.createStatus(
             text: textForPosting(),
             contentType: config.contentType,
             inReplyTo: draft.inReplyToID,
-                mediaIDs: uploadedAttachments,
+            media: uploadedAttachments,
             sensitive: sensitive,
             spoilerText: contentWarning,
-                visibility: draft.localOnly && mastodonController.instanceFeatures.localOnlyPostsVisibility ? Status.localPostVisibility : draft.visibility.rawValue,
+            visibility: draft.visibility,
-                language: mastodonController.instanceFeatures.createStatusWithLanguage ? draft.language : nil,
+            language: nil,
-                pollOptions: draft.poll?.pollOptions.map(\.text),
+            pollOptions: draft.poll?.options.map(\.text),
             pollExpiresIn: draft.poll == nil ? nil : Int(draft.poll!.duration),
             pollMultiple: draft.poll?.multiple,
-                localOnly: mastodonController.instanceFeatures.localOnlyPosts && !mastodonController.instanceFeatures.localOnlyPostsVisibility ? draft.localOnly : nil,
+            localOnly: mastodonController.instanceFeatures.localOnlyPosts ? draft.localOnly : nil
-                idempotencyKey: draft.id.uuidString
         )
-        }
-        
         do {
-            let (status, _) = try await mastodonController.run(request)
+            let (_, _) = try await mastodonController.run(request)
             currentStep += 1
-            mastodonController.storeCreatedStatus(status)
+            
+            DraftsManager.shared.remove(self.draft)
+            DraftsManager.save()
         } catch let error as Client.Error {
             throw Error.posting(error)
         }
     }
     
-    private func uploadAttachments() async throws -> [String] {
+    private func uploadAttachments() async throws -> [Attachment] {
-        // 2 steps (request data, then upload) for each attachment
+        var attachments: [Attachment] = []
-        self.totalSteps += 2 * draft.attachments.count
-        
-        var attachments: [String] = []
         attachments.reserveCapacity(draft.attachments.count)
-        for (index, attachment) in draft.draftAttachments.enumerated() {
+        for (index, attachment) in draft.attachments.enumerated() {
-            // if this attachment already exists and is being edited, we don't do anything
-            // edits to the description are handled as part of the edit status request
-            if let editedAttachmentID = attachment.editedAttachmentID {
-                attachments.append(editedAttachmentID)
-                currentStep += 2
-                continue
-            }
-            
             let data: Data
             let utType: UTType
             do {
                 (data, utType) = try await getData(for: attachment)
                 currentStep += 1
-            } catch let error as DraftAttachment.ExportError {
+            } catch let error as AttachmentData.Error {
                 throw Error.attachmentData(index: index, cause: error)
             }
-            let uploaded = try await uploadAttachment(index: index, data: data, utType: utType, description: attachment.attachmentDescription)
+            do {
-            attachments.append(uploaded.id)
+                let uploaded = try await uploadAttachment(data: data, utType: utType, description: attachment.attachmentDescription)
+                attachments.append(uploaded)
                 currentStep += 1
+            } catch let error as Client.Error {
+                throw Error.attachmentUpload(index: index, cause: error)
+            }
         }
         return attachments
     }
     
     private func getData(for attachment: DraftAttachment) async throws -> (Data, UTType) {
         return try await withCheckedThrowingContinuation { continuation in
-            attachment.getData(features: mastodonController.instanceFeatures) { result in
+            attachment.data.getData(features: mastodonController.instanceFeatures) { result in
                 switch result {
                 case let .success(res):
                     continuation.resume(returning: res)
@@ -134,21 +101,10 @@ class PostService: ObservableObject {
         }
     }
     
-    private func uploadAttachment(index: Int, data: Data, utType: UTType, description: String?) async throws -> Attachment {
+    private func uploadAttachment(data: Data, utType: UTType, description: String?) async throws -> Attachment {
-        guard let mimeType = utType.preferredMIMEType else {
+        let formAttachment = FormAttachment(mimeType: utType.preferredMIMEType!, data: data, fileName: "file.\(utType.preferredFilenameExtension!)")
-            throw Error.attachmentMissingMimeType(index: index, type: utType)
-        }
-        var filename = "file"
-        if let ext = utType.preferredFilenameExtension {
-            filename.append(".\(ext)")
-        }
-        let formAttachment = FormAttachment(mimeType: mimeType, data: data, fileName: filename)
         let req = Client.upload(attachment: formAttachment, description: description)
-        do {
         return try await mastodonController.run(req).0
-        } catch let error as Client.Error {
-            throw Error.attachmentUpload(index: index, cause: error)
-        }
     }
     
     private func textForPosting() -> String {
@@ -164,20 +120,8 @@ class PostService: ObservableObject {
         return text
     }
     
-    // only needed for akkoma, not used on regular mastodon
-    private func updateEditedAttachments() async {
-        for attachment in draft.draftAttachments {
-            guard let id = attachment.editedAttachmentID else {
-                continue
-            }
-            let req = Client.updateAttachment(id: id, description: attachment.attachmentDescription, focus: nil)
-            _ = try? await mastodonController.run(req)
-        }
-    }
-    
     enum Error: Swift.Error, LocalizedError {
-        case attachmentData(index: Int, cause: DraftAttachment.ExportError)
+        case attachmentData(index: Int, cause: AttachmentData.Error)
-        case attachmentMissingMimeType(index: Int, type: UTType)
         case attachmentUpload(index: Int, cause: Client.Error)
         case posting(Client.Error)
         
@@ -185,8 +129,6 @@ class PostService: ObservableObject {
             switch self {
             case let .attachmentData(index: index, cause: cause):
                 return "Attachment \(index + 1): \(cause.localizedDescription)"
-            case let .attachmentMissingMimeType(index: index, type: type):
-                return "Attachment \(index + 1): unknown MIME type for \(type.identifier)"
             case let .attachmentUpload(index: index, cause: cause):
                 return "Attachment \(index + 1): \(cause.localizedDescription)"
             case let .posting(error):

Packages/ComposeUI/Sources/ComposeUI/ComposeInput.swift

@@ -7,11 +7,9 @@
 
 import Foundation
 import Combine
-import UIKit
 
 protocol ComposeInput: AnyObject, ObservableObject {
     var toolbarElements: [ToolbarElement] { get }
-    var textInputMode: UITextInputMode? { get }
     
     var autocompleteState: AutocompleteState? { get }
     var autocompleteStatePublisher: Published<AutocompleteState?>.Publisher { get }

Packages/ComposeUI/Sources/ComposeUI/ComposeMastodonContext.swift

@@ -15,8 +15,7 @@ public protocol ComposeMastodonContext {
     var instanceFeatures: InstanceFeatures { get }
     
     func run<Result: Sendable>(_ request: Request<Result>) async throws -> (Result, Pagination?)
-    
+    func getCustomEmojis(completion: @escaping ([Emoji]) -> Void)
-    func getCustomEmojis() async -> [Emoji]
     
     @MainActor
     func searchCachedAccounts(query: String) -> [AccountProtocol]
@@ -24,6 +23,4 @@ public protocol ComposeMastodonContext {
     func cachedRelationship(for accountID: String) -> RelationshipProtocol?
     @MainActor
     func searchCachedHashtags(query: String) -> [Hashtag]
-    
-    func storeCreatedStatus(_ status: Status)
 }

Packages/ComposeUI/Sources/ComposeUI/ComposeUIConfig.swift

@@ -12,23 +12,16 @@ import PencilKit
 import TuskerComponents
 
 public struct ComposeUIConfig {
-    // Config
-    public var allowSwitchingDrafts = true
-    public var textSelectionStartsAtBeginning = false
-    
-    // Style
     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
-    
-    // Preferences
     public var useTwitterKeyboard = false
     public var contentType = StatusContentType.plain
+    public var automaticallySaveDrafts = false
     public var requireAttachmentDescriptions = false
     
-    // Host callbacks
     public var dismiss: @MainActor (DismissMode) -> Void = { _ in }
     public var presentAssetPicker: ((@MainActor @escaping ([PHPickerResult]) -> Void) -> Void)?
     public var presentDrawing: ((PKDrawing, @escaping (PKDrawing) -> Void) -> Void)?

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

@@ -8,7 +8,6 @@
 import SwiftUI
 import TuskerComponents
 import Vision
-import MatchedGeometryPresentation
 
 class AttachmentRowController: ViewController {
     let parent: ComposeController
@@ -16,31 +15,10 @@ class AttachmentRowController: ViewController {
     
     @Published var descriptionMode: DescriptionMode = .allowEntry
     @Published var textRecognitionError: Error?
-    @Published var focusAttachmentOnTextEditorUnfocus = false
-    
-    let thumbnailController: AttachmentThumbnailController
-    
-    private var descriptionObservation: NSKeyValueObservation?
     
     init(parent: ComposeController, attachment: DraftAttachment) {
         self.parent = parent
         self.attachment = attachment
-        self.thumbnailController = AttachmentThumbnailController(attachment: attachment, parent: parent)
-        
-        descriptionObservation = attachment.observe(\.attachmentDescription, changeHandler: { [unowned self] _, _ in
-            // the faultingState is non-zero for objects that are being cascade deleted when the draft is deleted
-            if attachment.faultingState == 0 {
-                self.updateAttachmentDescriptionState()
-            }
-        })
-    }
-    
-    private func updateAttachmentDescriptionState() {
-        if attachment.attachmentDescription.isEmpty {
-            parent.attachmentsMissingDescriptions.insert(attachment.id)
-        } else {
-            parent.attachmentsMissingDescriptions.remove(attachment.id)
-        }
     }
     
     var view: some View {
@@ -49,9 +27,7 @@ class AttachmentRowController: ViewController {
     
     private func removeAttachment() {
         withAnimation {
-            var newAttachments = parent.draft.draftAttachments
+            parent.draft.attachments.removeAll(where: { $0.id == attachment.id })
-            newAttachments.removeAll(where: { $0.id == attachment.id })
-            parent.draft.attachments = NSMutableOrderedSet(array: newAttachments)
         }
     }
     
@@ -60,20 +36,15 @@ class AttachmentRowController: ViewController {
             return
         }
         parent.config.presentDrawing?(drawing) { newDrawing in
-            self.attachment.drawing = newDrawing
+            self.attachment.data = .drawing(newDrawing)
         }
     }
     
-    private func focusAttachment() {
-        focusAttachmentOnTextEditorUnfocus = false
-        parent.focusedAttachment = (attachment, thumbnailController)
-    }
-    
     private func recognizeText() {
         descriptionMode = .recognizingText
         
-        self.attachment.getData(features: self.parent.mastodonController.instanceFeatures, skipAllConversion: true) { result in
+        DispatchQueue.global(qos: .userInitiated).async {
-            DispatchQueue.main.async {
+            self.attachment.data.getData(features: self.parent.mastodonController.instanceFeatures, skipAllConversion: true) { result in
                 let data: Data
                 switch result {
                 case .success((let d, _)):
@@ -121,7 +92,6 @@ class AttachmentRowController: ViewController {
     struct AttachmentView: View {
         @ObservedObject private var attachment: DraftAttachment
         @EnvironmentObject private var controller: AttachmentRowController
-        @FocusState private var textEditorFocused: Bool
         
         init(attachment: DraftAttachment) {
             self.attachment = attachment
@@ -129,25 +99,15 @@ class AttachmentRowController: ViewController {
         
         var body: some View {
             HStack(alignment: .center, spacing: 4) {
-                ControllerView(controller: { controller.thumbnailController })
+                AttachmentThumbnailView(attachment: attachment, fullSize: false)
-                    .clipShape(RoundedRectangle(cornerRadius: 8))
+                    .frame(width: 80, height: 80)
-                    .environment(\.attachmentThumbnailConfiguration, .init(contentMode: .fit, fullSize: false))
+                    .cornerRadius(8)
-                    .matchedGeometrySource(id: attachment.id, presentationID: attachment.id)
-                    .overlay {
-                        thumbnailFocusedOverlay
-                    }
-                    .frame(width: thumbnailSize, height: thumbnailSize)
-                    .onTapGesture {
-                        textEditorFocused = false
-                        // if we just focus the attachment immediately, the text editor doesn't actually unfocus
-                        controller.focusAttachmentOnTextEditorUnfocus = true
-                    }
                     .contextMenu {
-                        if attachment.drawingData != nil {
+                        if case .drawing(_) = attachment.data {
                             Button(action: controller.editDrawing) {
                                 Label("Edit Drawing", systemImage: "hand.draw")
                             }
-                        } else if attachment.type == .image {
+                        } else if attachment.data.type == .image {
                             Button(action: controller.recognizeText) {
                                 Label("Recognize Text", systemImage: "doc.text.viewfinder")
                             }
@@ -157,14 +117,16 @@ class AttachmentRowController: ViewController {
                             Label("Delete", systemImage: "trash")
                         }
                     } previewIfAvailable: {
-                        ControllerView(controller: { controller.thumbnailController })
+                       AttachmentThumbnailView(attachment: attachment, fullSize: true)
                     }
                 
                 switch controller.descriptionMode {
                 case .allowEntry:
-                    InlineAttachmentDescriptionView(attachment: attachment, minHeight: thumbnailSize)
+                    AttachmentDescriptionTextView(
-                        .matchedGeometrySource(id: AttachmentDescriptionTextViewID(attachment), presentationID: attachment.id)
+                        text: $attachment.attachmentDescription,
-                        .focused($textEditorFocused)
+                        placeholder: Text("Describe for the visually impaired…"),
+                        minHeight: 80
+                    )
                     
                 case .recognizingText:
                     ProgressView()
@@ -176,43 +138,8 @@ class AttachmentRowController: ViewController {
             } message: { error in
                 Text(error.localizedDescription)
             }
-            .onAppear(perform: controller.updateAttachmentDescriptionState)
-            #if os(visionOS)
-            .onChange(of: textEditorFocused) {
-                if !textEditorFocused && controller.focusAttachmentOnTextEditorUnfocus {
-                    controller.focusAttachment()
         }
     }
-            #else
-            .onChange(of: textEditorFocused) { newValue in
-                if !newValue && controller.focusAttachmentOnTextEditorUnfocus {
-                    controller.focusAttachment()
-                }
-            }
-            #endif
-        }
-        
-        private var thumbnailSize: CGFloat {
-            #if os(visionOS)
-            120
-            #else
-            80
-            #endif
-        }
-        
-        @ViewBuilder
-        private var thumbnailFocusedOverlay: some View {
-            Image(systemName: "arrow.up.backward.and.arrow.down.forward")
-                .foregroundColor(.white)
-                .frame(maxWidth: .infinity, maxHeight: .infinity)
-                .background(Color.black.opacity(0.35))
-                .clipShape(RoundedRectangle(cornerRadius: 8))
-                // use .opacity and an animation, because .transition doesn't seem to play nice with @FocusState
-                .opacity(textEditorFocused ? 1 : 0)
-                .animation(.linear(duration: 0.1), value: textEditorFocused)
-        }
-
-    }
     
 }
 
@@ -224,7 +151,6 @@ extension AttachmentRowController {
 
 private extension View {
     @available(iOS, obsoleted: 16.0)
-    @available(visionOS 1.0, *)
     @ViewBuilder
     func contextMenu<M: View, P: View>(@ViewBuilder menuItems: () -> M, @ViewBuilder previewIfAvailable preview: () -> P) -> some View {
         if #available(iOS 16.0, *) {

Packages/ComposeUI/Sources/ComposeUI/Controllers/AttachmentThumbnailController.swift

@@ -1,201 +0,0 @@
-//
-//  AttachmentThumbnailController.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 11/10/21.
-//  Copyright © 2021 Shadowfacts. All rights reserved.
-//
-
-import SwiftUI
-import Photos
-import TuskerComponents
-
-class AttachmentThumbnailController: ViewController {
-    unowned let parent: ComposeController
-    let attachment: DraftAttachment
-    
-    @Published private var image: UIImage?
-    @Published private var gifController: GIFController?
-    @Published private var fullSize: Bool = false
-    
-    init(attachment: DraftAttachment, parent: ComposeController) {
-        self.attachment = attachment
-        self.parent = parent
-    }
-    
-    func loadImageIfNecessary(fullSize: Bool) {
-        if (gifController != nil) || (image != nil && self.fullSize) {
-            return
-        }
-        self.fullSize = fullSize
-        
-        switch attachment.data {
-        case .editing(_, let kind, let url):
-            switch kind {
-            case .image:
-                Task { @MainActor in
-                    self.image = await parent.fetchAttachment(url)
-                }
-                
-            case .video, .gifv:
-                let asset = AVURLAsset(url: url)
-                let imageGenerator = AVAssetImageGenerator(asset: asset)
-                imageGenerator.appliesPreferredTrackTransform = true
-                #if os(visionOS)
-                #warning("Use async AVAssetImageGenerator.image(at:)")
-                #else
-                if let cgImage = try? imageGenerator.copyCGImage(at: .zero, actualTime: nil) {
-                    self.image = UIImage(cgImage: cgImage)
-                }
-                #endif
-
-            case .audio, .unknown:
-                break
-            }
-            
-        case .asset(let id):
-            guard let asset = PHAsset.fetchAssets(withLocalIdentifiers: [id], options: nil).firstObject else {
-                return
-            }
-            let isGIF = PHAssetResource.assetResources(for: asset).contains(where: { $0.uniformTypeIdentifier == UTType.gif.identifier })
-            if isGIF {
-                PHImageManager.default().requestImageDataAndOrientation(for: asset, options: nil) { data, typeIdentifier, orientation, info in
-                    guard let data else { return }
-                    if typeIdentifier == UTType.gif.identifier {
-                        self.gifController = GIFController(gifData: data)
-                    } else {
-                        let image = UIImage(data: data)
-                        DispatchQueue.main.async {
-                            self.image = image
-                        }
-                    }
-                }
-            } else {
-                let size: CGSize
-                if fullSize {
-                    size = PHImageManagerMaximumSize
-                } else {
-                    // currently only used as thumbnail in ComposeAttachmentRow
-                    size = CGSize(width: 80, height: 80)
-                }
-                PHImageManager.default().requestImage(for: asset, targetSize: size, contentMode: .aspectFill, options: nil) { (image, _) in
-                    DispatchQueue.main.async {
-                        self.image = image
-                    }
-                }
-            }
-            
-        case .drawing(let drawing):
-            image = drawing.imageInLightMode(from: drawing.bounds)
-
-        case .file(let url, let type):
-            if type.conforms(to: .movie) {
-                let asset = AVURLAsset(url: url)
-                let imageGenerator = AVAssetImageGenerator(asset: asset)
-                imageGenerator.appliesPreferredTrackTransform = true
-                #if os(visionOS)
-                #warning("Use async AVAssetImageGenerator.image(at:)")
-                #else
-                if let cgImage = try? imageGenerator.copyCGImage(at: .zero, actualTime: nil) {
-                    self.image = UIImage(cgImage: cgImage)
-                }
-                #endif
-            } else if let data = try? Data(contentsOf: url) {
-                if type == .gif {
-                    self.gifController = GIFController(gifData: data)
-                } else if type.conforms(to: .image),
-                   let image = UIImage(data: data) {
-                    // using prepareThumbnail on images from PHPicker results in extremely high memory usage,
-                    // crashing share extension. see FB12186346
-//                    if fullSize {
-                        image.prepareForDisplay { prepared in
-                            DispatchQueue.main.async {
-                                self.image = image
-                            }
-                        }
-//                    } else {
-//                        image.prepareThumbnail(of: CGSize(width: 80, height: 80)) { prepared in
-//                            DispatchQueue.main.async {
-//                                self.image = prepared
-//                            }
-//                        }
-//                    }
-                }
-            }
-            
-        case .none:
-            break
-        }
-    }
-    
-    var view: some SwiftUI.View {
-        View()
-    }
-    
-    struct View: SwiftUI.View {
-        @EnvironmentObject private var controller: AttachmentThumbnailController
-        @Environment(\.attachmentThumbnailConfiguration) private var config
-        
-        var body: some SwiftUI.View {
-            content
-                .onAppear {
-                    controller.loadImageIfNecessary(fullSize: config.fullSize)
-                }
-        }
-        
-        @ViewBuilder
-        private var content: some SwiftUI.View {
-            if let gifController = controller.gifController {
-                GIFViewWrapper(controller: gifController)
-            } else if let image = controller.image {
-                Image(uiImage: image)
-                    .resizable()
-                    .aspectRatio(config.aspectRatio, contentMode: config.contentMode)
-            } else {
-                Image(systemName: "photo")
-            }
-        }
-    }
-}
-
-struct AttachmentThumbnailConfiguration {
-    let aspectRatio: CGFloat?
-    let contentMode: ContentMode
-    let fullSize: Bool
-    
-    init(aspectRatio: CGFloat? = nil, contentMode: ContentMode = .fit, fullSize: Bool = false) {
-        self.aspectRatio = aspectRatio
-        self.contentMode = contentMode
-        self.fullSize = fullSize
-    }
-}
-
-private struct AttachmentThumbnailConfigurationEnvironmentKey: EnvironmentKey {
-    static let defaultValue = AttachmentThumbnailConfiguration()
-}
-
-extension EnvironmentValues {
-    var attachmentThumbnailConfiguration: AttachmentThumbnailConfiguration {
-        get { self[AttachmentThumbnailConfigurationEnvironmentKey.self] }
-        set { self[AttachmentThumbnailConfigurationEnvironmentKey.self] = newValue }
-    }
-}
-
-private struct GIFViewWrapper: UIViewRepresentable {
-    typealias UIViewType = GIFImageView
-
-    @State var controller: GIFController
-
-    func makeUIView(context: Context) -> GIFImageView {
-        let view = GIFImageView()
-        controller.attach(to: view)
-        controller.startAnimating()
-        view.contentMode = .scaleAspectFit
-        view.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
-        view.setContentCompressionResistancePriority(.defaultLow, for: .vertical)
-        return view
-    }
-
-    func updateUIView(_ uiView: GIFImageView, context: Context) {
-    }
-}

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

@@ -20,21 +20,19 @@ class AttachmentsListController: ViewController {
     
     private var requiresAttachmentDescriptions: Bool {
         if parent.config.requireAttachmentDescriptions {
-            if draft.attachments.count == 0 {
+            return draft.attachments.allSatisfy {
-                return false
+                !$0.attachmentDescription.isEmpty
-            } else {
-                return !parent.attachmentsMissingDescriptions.isEmpty
             }
         } else {
             return false
         }
     }
     
-    var validAttachmentCombination: Bool {
+    private var validAttachmentCombination: Bool {
         if !parent.mastodonController.instanceFeatures.mastodonAttachmentRestrictions {
             return true
-        } else if draft.attachments.count > 1,
+        } else if draft.attachments.contains(where: { $0.data.type == .video }) &&
-                  draft.draftAttachments.contains(where: { $0.type == .video }) {
+                    draft.attachments.count > 1 {
             return false
         } else if draft.attachments.count > 4 {
             return false
@@ -46,9 +44,9 @@ class AttachmentsListController: ViewController {
         self.parent = parent
     }
     
-    var canAddAttachment: Bool {
+    private var canAddAttachment: Bool {
         if parent.mastodonController.instanceFeatures.mastodonAttachmentRestrictions {
-            return draft.attachments.count < 4 && draft.draftAttachments.allSatisfy { $0.type == .image } && draft.poll == nil
+            return draft.attachments.count < 4 && draft.attachments.allSatisfy { $0.data.type == .image } && draft.poll == nil
         } else {
             return true
         }
@@ -58,7 +56,7 @@ class AttachmentsListController: ViewController {
         if parent.mastodonController.instanceFeatures.pollsAndAttachments {
             return true
         } else {
-            return draft.attachments.count == 0
+            return draft.attachments.isEmpty
         }
     }
     
@@ -67,52 +65,37 @@ class AttachmentsListController: ViewController {
     }
     
     private func moveAttachments(from source: IndexSet, to destination: Int) {
-        // just using moveObjects(at:to:) on the draft.attachments NSMutableOrderedSet
+        draft.attachments.move(fromOffsets: source, toOffset: destination)
-        // results in the order switching back to the previous order and then to the correct one
-        // on the subsequent 2 view updates. creating a new set with the proper order doesn't have that problem
-        var array = draft.draftAttachments
-        array.move(fromOffsets: source, toOffset: destination)
-        draft.attachments = NSMutableOrderedSet(array: array)
     }
     
     private func deleteAttachments(at indices: IndexSet) {
-        var array = draft.draftAttachments
+        draft.attachments.remove(atOffsets: indices)
-        array.remove(atOffsets: indices)
-        draft.attachments = NSMutableOrderedSet(array: array)
     }
     
-    private func insertAttachments(at offset: Int, itemProviders: [NSItemProvider]) {
+    @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 { [weak self] in
+                DispatchQueue.main.async {
-                    guard let self,
+                    guard self.canAddAttachment else { return }
-                          self.canAddAttachment else {
+                    self.draft.attachments.append(attachment)
-                        return
-                    }
-                    DraftsPersistentContainer.shared.viewContext.insert(attachment)
-                    attachment.draft = self.draft
-                    self.draft.attachments.add(attachment)
                 }
             }
         }
     }
     
     private func addImage() {
-        parent.deleteDraftOnDisappear = false
         parent.config.presentAssetPicker?({ results in
-            self.insertAttachments(at: self.draft.attachments.count, itemProviders: results.map(\.itemProvider))
+            Task {
+                await self.insertAttachments(at: self.draft.attachments.count, itemProviders: results.map(\.itemProvider))
+            }
         })
     }
     
     private func addDrawing() {
-        parent.deleteDraftOnDisappear = false
         parent.config.presentDrawing?(PKDrawing()) { drawing in
-            let attachment = DraftAttachment(context: DraftsPersistentContainer.shared.viewContext)
+            self.draft.attachments.append(DraftAttachment(data: .drawing(drawing)))
-            attachment.id = UUID()
-            attachment.drawing = drawing
-            attachment.draft = self.draft
-            self.draft.attachments.add(attachment)
         }
     }
     
@@ -120,7 +103,7 @@ class AttachmentsListController: ViewController {
         UIApplication.shared.sendAction(#selector(UIView.resignFirstResponder), to: nil, from: nil, for: nil)
         
         withAnimation {
-            draft.poll = draft.poll == nil ? Poll(context: DraftsPersistentContainer.shared.viewContext) : nil
+            draft.poll = draft.poll == nil ? Draft.Poll() : nil
         }
     }
     
@@ -134,9 +117,9 @@ class AttachmentsListController: ViewController {
         @Environment(\.horizontalSizeClass) private var horizontalSizeClass
         
         var body: some View {
+            Group {
                 attachmentsList
                 
-            Group {
                 if controller.parent.config.presentAssetPicker != nil {
                     addImageButton
                         .listRowInsets(EdgeInsets(top: cellPadding / 2, leading: cellPadding / 2, bottom: cellPadding / 2, trailing: cellPadding / 2))
@@ -150,29 +133,24 @@ class AttachmentsListController: ViewController {
                 togglePollButton
                     .listRowInsets(EdgeInsets(top: cellPadding / 2, leading: cellPadding / 2, bottom: cellPadding / 2, trailing: cellPadding / 2))
             }
-            #if os(visionOS)
-            .buttonStyle(.bordered)
-            .labelStyle(AttachmentButtonLabelStyle())
-            #endif
         }
         
         private var attachmentsList: some View {
-            ForEach(draft.attachments.array as! [DraftAttachment]) { attachment in
+            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))
-                    .id(attachment.id)
+                    .onDrag {
+                        NSItemProvider(object: attachment)
+                    }
             }
             .onMove(perform: controller.moveAttachments)
             .onDelete(perform: controller.deleteAttachments)
             .conditionally(controller.canAddAttachment) {
                 $0.onInsert(of: DraftAttachment.readableTypeIdentifiersForItemProvider, perform: { offset, providers in
-                    controller.insertAttachments(at: offset, itemProviders: providers)
+                    Task {
-                })
+                        await controller.insertAttachments(at: offset, itemProviders: providers)
                     }
-            // only sort of works, see #240
+                })
-            .onDrop(of: DraftAttachment.readableTypeIdentifiersForItemProvider, isTargeted: nil) { providers in
-                controller.insertAttachments(at: 0, itemProviders: providers)
-                return true
             }
         }
         
@@ -253,11 +231,3 @@ fileprivate struct SheetOrPopover<V: View>: ViewModifier {
         }
     }
 }
-
-@available(visionOS 1.0, *)
-fileprivate struct AttachmentButtonLabelStyle: LabelStyle {
-    func makeBody(configuration: Configuration) -> some View {
-        DefaultLabelStyle().makeBody(configuration: configuration)
-            .foregroundStyle(.white)
-    }
-}

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

@@ -8,7 +8,6 @@
 import SwiftUI
 import Pachyderm
 import Combine
-import TuskerComponents
 
 class AutocompleteEmojisController: ViewController {
     unowned let composeController: ComposeController
@@ -19,7 +18,19 @@ class AutocompleteEmojisController: ViewController {
     
     @Published var expanded = false
     @Published var emojis: [Emoji] = []
-    @Published var emojisBySection: [String: [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
@@ -37,15 +48,19 @@ class AutocompleteEmojisController: ViewController {
             .removeDuplicates()
             .sink { [unowned self] query in
                 self.searchTask?.cancel()
-                self.searchTask = Task { [weak self] in
+                self.searchTask = Task {
-                    await self?.queryChanged(query)
+                    await self.queryChanged(query)
                 }
             }
     }
     
     @MainActor
     private func queryChanged(_ query: String) async {
-        var emojis = await composeController.mastodonController.getCustomEmojis()
+        var emojis = await withCheckedContinuation { continuation in
+            composeController.mastodonController.getCustomEmojis {
+                continuation.resume(returning: $0)
+            }
+        }
         guard !Task.isCancelled else {
             return
         }
@@ -62,20 +77,11 @@ class AutocompleteEmojisController: ViewController {
         
         var shortcodes = Set<String>()
         var newEmojis = [Emoji]()
-        var newEmojisBySection = [String: [Emoji]]()
         for emoji in emojis where !shortcodes.contains(emoji.shortcode) {
             newEmojis.append(emoji)
             shortcodes.insert(emoji.shortcode)
-            
-            let category = emoji.category ?? ""
-            if newEmojisBySection.keys.contains(category) {
-                newEmojisBySection[category]!.append(emoji)
-            } else {
-                newEmojisBySection[category] = [emoji]
-            }
         }
         self.emojis = newEmojis
-        self.emojisBySection = newEmojisBySection
     }
     
     private func toggleExpanded() {
@@ -154,7 +160,7 @@ class AutocompleteEmojisController: ViewController {
         
         private var horizontalScrollView: some View {
             ScrollView(.horizontal) {
-                LazyHStack(spacing: 8) {
+                HStack(spacing: 8) {
                     ForEach(controller.emojis, id: \.shortcode) { emoji in
                         Button(action: { controller.autocomplete(with: emoji) }) {
                             HStack(spacing: 4) {
@@ -168,6 +174,8 @@ class AutocompleteEmojisController: ViewController {
                         .frame(height: emojiSize)
                     }
                     .animation(.linear(duration: 0.2), value: controller.emojis)
+                    
+                    Spacer(minLength: emojiSize)
                 }
                 .padding(.horizontal, 8)
                 .frame(height: emojiSize + 16)

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

@@ -8,7 +8,6 @@
 import SwiftUI
 import Combine
 import Pachyderm
-import TuskerComponents
 
 class AutocompleteHashtagsController: ViewController {
     unowned let composeController: ComposeController
@@ -35,8 +34,8 @@ class AutocompleteHashtagsController: ViewController {
             .debounce(for: .milliseconds(250), scheduler: DispatchQueue.main)
             .sink { [unowned self] query in
                 self.searchTask?.cancel()
-                self.searchTask = Task { [weak self] in
+                self.searchTask = Task {
-                    await self?.queryChanged(query)
+                    await self.queryChanged(query)
                 }
             }
     }

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

@@ -36,9 +36,8 @@ class AutocompleteMentionsController: ViewController {
             .debounce(for: .milliseconds(250), scheduler: DispatchQueue.main)
             .sink { [unowned self] query in
                 self.searchTask?.cancel()
-                // weak in case the autocomplete controller is dealloc'd racing with the task starting
+                self.searchTask = Task {
-                self.searchTask = Task { [weak self] in
+                    await self.queryChanged(query)
-                    await self?.queryChanged(query)
                 }
             }
     }

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

@@ -9,45 +9,29 @@ import SwiftUI
 import Combine
 import Pachyderm
 import TuskerComponents
-import MatchedGeometryPresentation
-import CoreData
 
 public final class ComposeController: ViewController {
-    public typealias FetchAttachment = (URL) async  -> UIImage?
     public typealias FetchStatus = (String) -> (any StatusProtocol)?
     public typealias DisplayNameLabel = (any AccountProtocol, Font.TextStyle, CGFloat) -> AnyView
-    public typealias CurrentAccountContainerView = (AnyView) -> AnyView
     public typealias ReplyContentView = (any StatusProtocol, @escaping (CGFloat) -> Void) -> AnyView
     public typealias EmojiImageView = (Emoji) -> AnyView
     
-    @Published public private(set) var draft: Draft {
+    @Published public private(set) var draft: Draft
-        didSet {
-            assert(draft.managedObjectContext == DraftsPersistentContainer.shared.viewContext)
-        }
-    }
     @Published public var config: ComposeUIConfig
-    @Published public var mastodonController: ComposeMastodonContext
+    let mastodonController: ComposeMastodonContext
     let fetchAvatar: AvatarImageView.FetchAvatar
-    let fetchAttachment: FetchAttachment
     let fetchStatus: FetchStatus
     let displayNameLabel: DisplayNameLabel
-    let currentAccountContainerView: CurrentAccountContainerView
     let replyContentView: ReplyContentView
     let emojiImageView: EmojiImageView
     
     @Published public var currentAccount: (any AccountProtocol)?
     @Published public var showToolbar = true
-    @Published public var deleteDraftOnDisappear = true
     
     @Published var autocompleteController: AutocompleteController!
     @Published var toolbarController: ToolbarController!
     @Published var attachmentsListController: AttachmentsListController!
     
-    // this property is here rather than on the AttachmentsListController so that the ComposeView
-    // updates when it changes, because changes to it may alter postButtonEnabled
-    @Published var attachmentsMissingDescriptions = Set<UUID>()
-    @Published var focusedAttachment: (DraftAttachment, AttachmentThumbnailController)?
-    let scrollToAttachment = PassthroughSubject<UUID, Never>()
     @Published var contentWarningBecomeFirstResponder = false
     @Published var mainComposeTextViewBecomeFirstResponder = false
     @Published var currentInput: (any ComposeInput)? = nil
@@ -55,14 +39,9 @@ public final class ComposeController: ViewController {
     @Published var isShowingSaveDraftSheet = false
     @Published var isShowingDraftsList = false
     @Published var poster: PostService?
-    @Published var postError: PostService.Error?
+    @Published var postError: (any Error)?
-    @Published public private(set) var didPostSuccessfully = false
-    @Published var hasChangedLanguageSelection = false
     
-    private var isDisappearing = false
+    var isPosting: Bool {
-    private var userConfirmedDelete = false
-    
-    public var isPosting: Bool {
         poster != nil
     }
     
@@ -74,27 +53,15 @@ public final class ComposeController: ViewController {
     }
     
     var postButtonEnabled: Bool {
-        draft.editedStatusID != nil ||
+        draft.hasContent
-            (draft.hasContent
             && charactersRemaining >= 0
             && !isPosting
             && attachmentsListController.isValid
-                && isPollValid)
+            && isPollValid
     }
     
     private var isPollValid: Bool {
-        draft.poll == nil || draft.poll!.pollOptions.allSatisfy { !$0.text.isEmpty }
+        draft.poll == nil || draft.poll!.options.allSatisfy { !$0.text.isEmpty }
-    }
-    
-    public var navigationTitle: String {
-        if let id = draft.inReplyToID,
-           let status = fetchStatus(id) {
-            return "Reply to @\(status.account.acct)"
-        } else if draft.editedStatusID != nil {
-            return "Edit Post"
-        } else {
-            return "New Post"
-        }
     }
     
     public init(
@@ -102,50 +69,29 @@ public final class ComposeController: ViewController {
         config: ComposeUIConfig,
         mastodonController: ComposeMastodonContext,
         fetchAvatar: @escaping AvatarImageView.FetchAvatar,
-        fetchAttachment: @escaping FetchAttachment,
         fetchStatus: @escaping FetchStatus,
         displayNameLabel: @escaping DisplayNameLabel,
-        currentAccountContainerView: @escaping CurrentAccountContainerView = { $0 },
         replyContentView: @escaping ReplyContentView,
         emojiImageView: @escaping EmojiImageView
     ) {
         self.draft = draft
-        assert(draft.managedObjectContext == DraftsPersistentContainer.shared.viewContext)
         self.config = config
         self.mastodonController = mastodonController
         self.fetchAvatar = fetchAvatar
-        self.fetchAttachment = fetchAttachment
         self.fetchStatus = fetchStatus
         self.displayNameLabel = displayNameLabel
-        self.currentAccountContainerView = currentAccountContainerView
         self.replyContentView = replyContentView
         self.emojiImageView = emojiImageView
         
         self.autocompleteController = AutocompleteController(parent: self)
         self.toolbarController = ToolbarController(parent: self)
         self.attachmentsListController = AttachmentsListController(parent: self)
-        
-        if #available(iOS 16.0, *) {
-            NotificationCenter.default.addObserver(self, selector: #selector(currentInputModeChanged), name: UITextInputMode.currentInputModeDidChangeNotification, object: nil)
-        }
-        NotificationCenter.default.addObserver(self, selector: #selector(managedObjectsDidChange), name: .NSManagedObjectContextObjectsDidChange, object: DraftsPersistentContainer.shared.viewContext)
     }
     
     public var view: some View {
         ComposeView(poster: poster)
-            .environment(\.managedObjectContext, DraftsPersistentContainer.shared.viewContext)
             .environmentObject(draft)
             .environmentObject(mastodonController.instanceFeatures)
-            .environment(\.composeUIConfig, config)
-    }
-    
-    @MainActor
-    @objc private func managedObjectsDidChange(_ notification: Foundation.Notification) {
-        if let deleted = notification.userInfo?[NSDeletedObjectsKey] as? Set<NSManagedObject>,
-           deleted.contains(where: { $0.objectID == self.draft.objectID }),
-           !isDisappearing {
-            self.config.dismiss(.cancel)
-        }
     }
     
     public func canPaste(itemProviders: [NSItemProvider]) -> Bool {
@@ -153,7 +99,7 @@ public final class ComposeController: ViewController {
             return false
         }
         if mastodonController.instanceFeatures.mastodonAttachmentRestrictions {
-            if draft.draftAttachments.allSatisfy({ $0.type == .image }) {
+            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 {
@@ -169,10 +115,7 @@ public final class ComposeController: ViewController {
             provider.loadObject(ofClass: DraftAttachment.self) { object, error in
                 guard let attachment = object as? DraftAttachment else { return }
                 DispatchQueue.main.async {
-                    guard self.attachmentsListController.canAddAttachment else { return }
+                    self.draft.attachments.append(attachment)
-                    DraftsPersistentContainer.shared.viewContext.insert(attachment)
-                    attachment.draft = self.draft
-                    self.draft.attachments.add(attachment)
                 }
             }
         }
@@ -180,24 +123,21 @@ public final class ComposeController: ViewController {
     
     @MainActor
     func cancel() {
+        if config.automaticallySaveDrafts {
+            config.dismiss(.cancel)
+        } else {
             if draft.hasContent {
                 isShowingSaveDraftSheet = true
             } else {
-            deleteDraftOnDisappear = true
+                DraftsManager.shared.remove(draft)
                 config.dismiss(.cancel)
             }
         }
-    
-    @MainActor
-    func cancel(deleteDraft: Bool) {
-        deleteDraftOnDisappear = true
-        userConfirmedDelete = deleteDraft
-        config.dismiss(.cancel)
     }
     
     func postStatus() {
         guard !isPosting,
-              draft.editedStatusID != nil || draft.hasContent else {
+              draft.hasContent else {
             return
         }
         
@@ -213,16 +153,13 @@ public final class ComposeController: ViewController {
             do {
                 try await poster.post()
                 
-                deleteDraftOnDisappear = true
-                didPostSuccessfully = true
-                
                 // wait .25 seconds so the user can see the progress bar has completed
                 try? await Task.sleep(nanoseconds: 250_000_000)
                 
-                // don't unset the poster, so the ui remains disabled while dismissing
-                
                 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
@@ -236,22 +173,20 @@ public final class ComposeController: ViewController {
         isShowingDraftsList = true
     }
     
-    func selectDraft(_ newDraft: Draft) {
+    func selectDraft(_ draft: Draft) {
-        let oldDraft = self.draft
+        if !self.draft.hasContent {
-        self.draft = newDraft
+            DraftsManager.shared.remove(self.draft)
-        
-        if !oldDraft.hasContent {
-            DraftsPersistentContainer.shared.viewContext.delete(oldDraft)
         }
-        DraftsPersistentContainer.shared.save()
+        DraftsManager.save()
+        
+        self.draft = draft
     }
     
     func onDisappear() {
-        isDisappearing = true
+        if !draft.hasContent {
-        if deleteDraftOnDisappear && (!draft.hasContent || didPostSuccessfully || userConfirmedDelete) {
+            DraftsManager.shared.remove(draft)
-            DraftsPersistentContainer.shared.viewContext.delete(draft)
         }
-        DraftsPersistentContainer.shared.save()
+        DraftsManager.save()
     }
     
     func toggleContentWarning() {
@@ -261,23 +196,11 @@ public final class ComposeController: ViewController {
         }
     }
     
-    @available(iOS 16.0, *)
-    @objc private func currentInputModeChanged() {
-        guard let mode = currentInput?.textInputMode,
-              let code = LanguagePicker.codeFromInputMode(mode),
-              !hasChangedLanguageSelection && !draft.hasContent else {
-            return
-        }
-        draft.language = code.identifier
-    }
-    
     struct ComposeView: View {
         @OptionalObservedObject var poster: PostService?
         @EnvironmentObject var controller: ComposeController
         @EnvironmentObject var draft: Draft
-        #if !os(visionOS)
         @StateObject private var keyboardReader = KeyboardReader()
-        #endif
         @State private var globalFrameOutsideList = CGRect.zero
         
         init(poster: PostService?) {
@@ -289,24 +212,12 @@ public final class ComposeController: ViewController {
         }
         
         var body: some View {
-            NavigationView {
-                navRoot
-            }
-            .navigationViewStyle(.stack)
-        }
-        
-        private var navRoot: some View {
             ZStack(alignment: .top) {
                 // just using .background doesn't work; for some reason it gets inset immediately after the software keyboard is dismissed
                 config.backgroundColor
                     .edgesIgnoringSafeArea(.all)
                 
-                ScrollViewReader { proxy in
                 mainList
-                        .onReceive(controller.scrollToAttachment) { id in
-                            proxy.scrollTo(id, anchor: .center)
-                        }
-                }
                 
                 if let poster = poster {
                     // can't use SwiftUI.ProgressView because there's no UIProgressView.Style.bar equivalent, see FB8587149
@@ -320,25 +231,16 @@ public final class ComposeController: ViewController {
                             .transition(.move(edge: .bottom))
                             .animation(.default, value: controller.currentInput?.autocompleteState)
                         
-                        #if !os(visionOS)
                         ControllerView(controller: { controller.toolbarController })
-                        #endif
                     }
-                    #if !os(visionOS)
                     // on iPadOS15, the toolbar ends up below the keyboard's toolbar without this
                     .padding(.bottom, keyboardInset)
-                    #endif
                     .transition(.move(edge: .bottom))
                 }
             }
             .toolbar {
                 ToolbarItem(placement: .cancellationAction) { cancelButton }
                 ToolbarItem(placement: .confirmationAction) { postButton }
-                #if os(visionOS)
-                ToolbarItem(placement: .bottomOrnament) {
-                    ControllerView(controller: { controller.toolbarController })
-                }
-                #endif
             }
             .background(GeometryReader { proxy in
                 Color.clear
@@ -355,28 +257,17 @@ public final class ComposeController: ViewController {
             }, message: { error in
                 Text(error.localizedDescription)
             })
-            .matchedGeometryPresentation(id: Binding(get: { () -> UUID?? in
-                let id = controller.focusedAttachment?.0.id
-                // this needs to be a double optional, since the type used for for the presentationID in the geom source is a UUID?
-                return id.map { Optional.some($0) }
-            }, set: {
-                if $0 == nil {
-                    controller.focusedAttachment = nil
-                } else {
-                    fatalError()
-                }
-            }), backgroundColor: .black) {
-                ControllerView(controller: {
-                    FocusedAttachmentController(
-                        parent: controller,
-                        attachment: controller.focusedAttachment!.0,
-                        thumbnailController: controller.focusedAttachment!.1
-                    )
-                })
-            }
             .onDisappear(perform: controller.onDisappear)
-            .navigationTitle(controller.navigationTitle)
+            .navigationTitle(navTitle)
-            .navigationBarTitleDisplayMode(.inline)
+        }
+        
+        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 {
@@ -388,14 +279,12 @@ public final class ComposeController: ViewController {
                         rowTopInset: 8,
                         globalFrameOutsideList: globalFrameOutsideList
                     )
-                    // i don't know why swiftui can't infer this from the status that's passed into the ReplyStatusView changing
-                    .id(id)
                     .listRowInsets(EdgeInsets(top: 8, leading: 8, bottom: 4, trailing: 8))
                     .listRowSeparator(.hidden)
                     .listRowBackground(config.backgroundColor)
                 }
                 
-                HeaderView(currentAccount: controller.currentAccount, charsRemaining: controller.charactersRemaining)
+                HeaderView()
                     .listRowInsets(EdgeInsets(top: draft.inReplyToID == nil ? 8 : 4, leading: 8, bottom: 4, trailing: 8))
                     .listRowSeparator(.hidden)
                     .listRowBackground(config.backgroundColor)
@@ -430,9 +319,7 @@ public final class ComposeController: ViewController {
                     .listRowBackground(config.backgroundColor)
             }
             .listStyle(.plain)
-            #if !os(visionOS)
             .scrollDismissesKeyboardInteractivelyIfAvailable()
-            #endif
             .disabled(controller.isPosting)
         }
         
@@ -442,29 +329,13 @@ public final class ComposeController: ViewController {
                     // otherwise all Buttons in the nav bar are made semibold
                     .font(.system(size: 17, weight: .regular))
             }
-            .disabled(controller.isPosting)
-            .confirmationDialog("Are you sure?", isPresented: $controller.isShowingSaveDraftSheet) {
-                // edit drafts can't be saved
-                if draft.editedStatusID == nil {
-                    Button(action: { controller.cancel(deleteDraft: false) }) {
-                        Text("Save Draft")
-                    }
-                    Button(role: .destructive, action: { controller.cancel(deleteDraft: true) }) {
-                        Text("Delete Draft")
-                    }
-                } else {
-                    Button(role: .destructive, action: { controller.cancel(deleteDraft: true) }) {
-                        Text("Cancel Edit")
-                    }
-                }
-            }
         }
         
         @ViewBuilder
         private var postButton: some View {
-            if draft.hasContent || draft.editedStatusID != nil || !controller.config.allowSwitchingDrafts {
+            if draft.hasContent {
                 Button(action: controller.postStatus) {
-                    Text(draft.editedStatusID == nil ? "Post" : "Edit")
+                    Text("Post")
                 }
                 .keyboardShortcut(.return, modifiers: .command)
                 .disabled(!controller.postButtonEnabled)
@@ -475,7 +346,6 @@ public final class ComposeController: ViewController {
             }
         }
         
-        #if !os(visionOS)
         @available(iOS, obsoleted: 16.0)
         private var keyboardInset: CGFloat {
             if #unavailable(iOS 16.0),
@@ -486,7 +356,6 @@ public final class ComposeController: ViewController {
                 return 0
             }
         }
-        #endif
     }
 }
 
@@ -508,13 +377,3 @@ private struct GlobalFrameOutsideListPrefKey: PreferenceKey {
         value = nextValue()
     }
 }
-
-private struct ComposeUIConfigEnvironmentKey: EnvironmentKey {
-    static let defaultValue = ComposeUIConfig()
-}
-extension EnvironmentValues {
-    var composeUIConfig: ComposeUIConfig {
-        get { self[ComposeUIConfigEnvironmentKey.self] }
-        set { self[ComposeUIConfigEnvironmentKey.self] = newValue }
-    }
-}

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

@@ -7,7 +7,6 @@
 
 import SwiftUI
 import TuskerComponents
-import CoreData
 
 class DraftsController: ViewController {
     
@@ -44,12 +43,12 @@ class DraftsController: ViewController {
     }
     
     func deleteDraft(_ draft: Draft) {
-        DraftsPersistentContainer.shared.viewContext.delete(draft)
+        DraftsManager.shared.remove(draft)
     }
     
     func closeDrafts() {
         isPresented = false
-        DraftsPersistentContainer.shared.save()
+        DraftsManager.save()
     }
     
     struct DraftsRepresentable: UIViewControllerRepresentable {
@@ -66,12 +65,18 @@ class DraftsController: ViewController {
     struct DraftsView: View {
         @EnvironmentObject private var controller: DraftsController
         @EnvironmentObject private var currentDraft: Draft
-        @FetchRequest(sortDescriptors: [SortDescriptor(\Draft.lastModified, order: .reverse)]) private var drafts: FetchedResults<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(drafts) { draft in
+                    ForEach(visibleDrafts) { draft in
                         Button(action: { controller.maybeSelectDraft(draft) }) {
                             DraftRow(draft: draft)
                         }
@@ -85,7 +90,7 @@ class DraftsController: ViewController {
                         })
                     }
                     .onDelete { indices in
-                        indices.map { drafts[$0] }.forEach(controller.deleteDraft)
+                        indices.map { visibleDrafts[$0] }.forEach(controller.deleteDraft)
                     }
                 }
                 .listStyle(.plain)
@@ -105,9 +110,6 @@ class DraftsController: ViewController {
             } message: { _ in
                 Text("The selected draft is a reply to a different post, do you wish to use it?")
             }
-            .onAppear {
-                drafts.nsPredicate = NSPredicate(format: "accountID == %@ AND id != %@ AND lastModified != nil", controller.parent.mastodonController.accountInfo!.id, currentDraft.id as NSUUID)
-            }
         }
         
         private var cancelButton: some View {
@@ -120,18 +122,10 @@ class DraftsController: ViewController {
 
 private struct DraftRow: View {
     @ObservedObject var draft: Draft
-    @EnvironmentObject private var controller: DraftsController
     
     var body: some View {
         HStack {
             VStack(alignment: .leading) {
-                if draft.editedStatusID != nil {
-                    // shouldn't happen unless the app crashed/was killed during an edit
-                    Text("Edit")
-                        .font(.body.bold())
-                        .foregroundColor(.orange)
-                }
-                
                 if draft.contentWarningEnabled {
                     Text(draft.contentWarning)
                         .font(.body.bold())
@@ -142,25 +136,22 @@ private struct DraftRow: View {
                     .font(.body)
                 
                 HStack(spacing: 8) {
-                    ForEach(draft.draftAttachments) { attachment in
+                    ForEach(draft.attachments) { attachment in
-                        ControllerView(controller: { AttachmentThumbnailController(attachment: attachment, parent: controller.parent) })
+                        AttachmentThumbnailView(attachment: attachment, fullSize: false)
-                            .aspectRatio(contentMode: .fit)
+                            .frame(width: 50, height: 50)
-                            .clipShape(RoundedRectangle(cornerRadius: 5))
+                            .cornerRadius(5)
-                            .frame(height: 50)
                     }
                 }
             }
             
             Spacer()
             
-            if let lastModified = draft.lastModified {
+            Text(draft.lastModified.formatted(.abbreviatedTimeAgo))
-                Text(lastModified.formatted(.abbreviatedTimeAgo))
                 .font(.body)
                 .foregroundColor(.secondary)
         }
     }
 }
-}
 
 private extension View {
     @ViewBuilder

Packages/ComposeUI/Sources/ComposeUI/Controllers/FocusedAttachmentController.swift

@@ -1,122 +0,0 @@
-//
-//  FocusedAttachmentController.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 4/29/23.
-//
-
-import SwiftUI
-import MatchedGeometryPresentation
-import AVKit
-
-class FocusedAttachmentController: ViewController {
-    
-    unowned let parent: ComposeController
-    let attachment: DraftAttachment
-    let thumbnailController: AttachmentThumbnailController
-    private let player: AVPlayer?
-    
-    init(parent: ComposeController, attachment: DraftAttachment, thumbnailController: AttachmentThumbnailController) {
-        self.parent = parent
-        self.attachment = attachment
-        self.thumbnailController = thumbnailController
-        
-        if case let .file(url, type) = attachment.data,
-           type.conforms(to: .movie) {
-            self.player = AVPlayer(url: url)
-            self.player!.isMuted = true
-        } else {
-            self.player = nil
-        }
-    }
-    
-    var view: some View {
-        FocusedAttachmentView(attachment: attachment)
-    }
-    
-    struct FocusedAttachmentView: View {
-        @ObservedObject var attachment: DraftAttachment
-        @EnvironmentObject private var controller: FocusedAttachmentController
-        @Environment(\.dismiss) private var dismiss
-        @FocusState private var textEditorFocused: Bool
-        @EnvironmentObject private var matchedGeomState: MatchedGeometryState
-        
-        var body: some View {
-            VStack(spacing: 0) {
-                Spacer(minLength: 0)
-                
-                if let player = controller.player {
-                    VideoPlayer(player: player)
-                        .matchedGeometryDestination(id: attachment.id)
-                        .onAppear {
-                            player.play()
-                        }
-                } else if #available(iOS 16.0, *) {
-                    ZoomableScrollView {
-                        attachmentView
-                            .matchedGeometryDestination(id: attachment.id)
-                    }
-                } else {
-                    attachmentView
-                        .matchedGeometryDestination(id: attachment.id)
-                }
-                
-                Spacer(minLength: 0)
-                
-                FocusedAttachmentDescriptionView(attachment: attachment)
-                    .environment(\.colorScheme, .dark)
-                    .matchedGeometryDestination(id: AttachmentDescriptionTextViewID(attachment))
-                    .frame(height: 150)
-                    .focused($textEditorFocused)
-            }
-            .background(.black)
-            .overlay(alignment: .topLeading, content: {
-                Button {
-                    // set the mode to dismissing immediately, so that layout changes due to the keyboard hiding
-                    // (which happens before the dismiss animation controller starts running) don't alter the destination frames
-                    if textEditorFocused {
-                        matchedGeomState.mode = .dismissing
-                    }
-                    dismiss()
-                } label: {
-                    Image(systemName: "arrow.down.forward.and.arrow.up.backward")
-                }
-                .buttonStyle(DismissFocusedAttachmentButtonStyle())
-                .padding([.top, .leading], 4)
-            })
-        }
-        
-        private var attachmentView: some View {
-            ControllerView(controller: { controller.thumbnailController })
-                .environment(\.attachmentThumbnailConfiguration, .init(contentMode: .fit, fullSize: true))
-        }
-    }
-}
-
-private struct DismissFocusedAttachmentButtonStyle: ButtonStyle {
-    func makeBody(configuration: Configuration) -> some View {
-        ZStack {
-            RoundedRectangle(cornerRadius: 4)
-                .fill(.black.opacity(0.5))
-            
-            configuration.label
-                .foregroundColor(.white)
-                .imageScale(.large)
-        }
-        .frame(width: 40, height: 40)
-    }
-}
-
-struct AttachmentDescriptionTextViewID: Hashable {
-    let attachmentID: UUID!
-    
-    init(_ attachment: DraftAttachment) {
-        self.attachmentID = attachment.id
-    }
-    
-    func hash(into hasher: inout Hasher) {
-        hasher.combine(attachmentID)
-        hasher.combine("descriptionTextView")
-    }
-}
-

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

@@ -12,11 +12,11 @@ class PollController: ViewController {
     
     unowned let parent: ComposeController
     var draft: Draft { parent.draft }
-    let poll: Poll
+    let poll: Draft.Poll
     
     @Published var duration: Duration
     
-    init(parent: ComposeController, poll: Poll) {
+    init(parent: ComposeController, poll: Draft.Poll) {
         self.parent = parent
         self.poll = poll
         self.duration = .fromTimeInterval(poll.duration) ?? .oneDay
@@ -34,16 +34,11 @@ class PollController: ViewController {
     }
     
     private func moveOptions(indices: IndexSet, newIndex: Int) {
-        // see AttachmentsListController.moveAttachments
+        poll.options.move(fromOffsets: indices, toOffset: newIndex)
-        var array = poll.pollOptions
-        array.move(fromOffsets: indices, toOffset: newIndex)
-        poll.options = NSMutableOrderedSet(array: array)
     }
     
-    private func removeOption(_ option: PollOption) {
+    private func removeOption(_ option: Draft.Poll.Option) {
-        var array = poll.pollOptions
+        poll.options.removeAll(where: { $0.id == option.id })
-        array.remove(at: poll.options.index(of: option))
-        poll.options = NSMutableOrderedSet(array: array)
     }
     
     private var canAddOption: Bool {
@@ -55,14 +50,12 @@ class PollController: ViewController {
     }
     
     private func addOption() {
-        let option = PollOption(context: DraftsPersistentContainer.shared.viewContext)
+        poll.options.append(.init(""))
-        option.poll = poll
-        poll.options.add(option)
     }
     
     struct PollView: View {
         @EnvironmentObject private var controller: PollController
-        @EnvironmentObject private var poll: Poll
+        @EnvironmentObject private var poll: Draft.Poll
         @Environment(\.colorScheme) private var colorScheme
         
         var body: some View {
@@ -86,7 +79,7 @@ class PollController: ViewController {
                 }
                 
                 List {
-                    ForEach($poll.pollOptions) { $option in
+                    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))
@@ -125,18 +118,12 @@ class PollController: ViewController {
             }
             .padding(8)
             .background(
-                RoundedRectangle(cornerRadius: 10, style: .continuous)
+                backgroundColor
-                    .foregroundColor(backgroundColor)
+                    .cornerRadius(10)
             )
-            #if os(visionOS)
-            .onChange(of: controller.duration) {
-                poll.duration = controller.duration.timeInterval
-            }
-            #else
             .onChange(of: controller.duration) { newValue in
                 poll.duration = newValue.timeInterval
             }
-            #endif
         }
         
         private var backgroundColor: Color {

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

@@ -11,6 +11,9 @@ 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
     
@@ -45,66 +48,21 @@ class ToolbarController: ViewController {
         @EnvironmentObject private var composeController: ComposeController
         @ScaledMetric(relativeTo: .body) private var imageSize: CGFloat = 22
         
-        #if !os(visionOS)
         @State private var minWidth: CGFloat?
         @State private var realWidth: CGFloat?
-        #endif
         
         var body: some View {
-            #if os(visionOS)
-            buttons
-            #else
             ScrollView(.horizontal, showsIndicators: false) {
-                buttons
-                    .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, .leading, .trailing])
-            .overlay(alignment: .top) {
-                Divider()
-                    .edgesIgnoringSafeArea([.leading, .trailing])
-            }
-            .background(GeometryReader { proxy in
-                Color.clear
-                    .preference(key: ToolbarWidthPrefKey.self, value: proxy.size.width)
-                    .onPreferenceChange(ToolbarWidthPrefKey.self) { width in
-                        minWidth = width
-                    }
-            })
-            #endif
-        }
-        
-        @ViewBuilder
-        private var buttons: some View {
                 HStack(spacing: 0) {
                     cwButton
                     
-                MenuPicker(selection: visibilityBinding, options: visibilityOptions, buttonStyle: .iconOnly)
+                    MenuPicker(selection: $draft.visibility, options: ToolbarController.visibilityOptions, buttonStyle: .iconOnly)
-                    #if !targetEnvironment(macCatalyst) && !os(visionOS)
                     // the button has a bunch of extra space by default, but combined with what we add it's too much
                         .padding(.horizontal, -8)
-                    #endif
-                    .disabled(draft.editedStatusID != nil)
-                    .disabled(composeController.mastodonController.instanceFeatures.localOnlyPostsVisibility && draft.localOnly)
                     
                     if composeController.mastodonController.instanceFeatures.localOnlyPosts {
                         localOnlyPicker
-                        #if targetEnvironment(macCatalyst)
-                        .padding(.leading, 4)
-                        #elseif !os(visionOS)
                             .padding(.horizontal, -8)
-                        #endif
-                        .disabled(draft.editedStatusID != nil)
                     }
                     
                     if let currentInput = composeController.currentInput,
@@ -121,12 +79,31 @@ class ToolbarController: ViewController {
                     }
                     
                     Spacer()
-                
-                if #available(iOS 16.0, *),
-                   composeController.mastodonController.instanceFeatures.createStatusWithLanguage {
-                    LanguagePicker(draftLanguage: $draft.language, hasChangedSelection: $composeController.hasChangedLanguageSelection)
                 }
+                .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 {
@@ -136,29 +113,6 @@ class ToolbarController: ViewController {
                 .hoverEffect()
         }
         
-        private var visibilityBinding: Binding<Pachyderm.Visibility> {
-            // On instances that conflate visibliity and local only, we still show two separate controls but don't allow
-            // changing the visibility when local-only.
-            if draft.localOnly,
-               composeController.mastodonController.instanceFeatures.localOnlyPostsVisibility {
-                return .constant(.public)
-            } else {
-                return $draft.visibility
-            }
-        }
-        
-        private var visibilityOptions: [MenuPicker<Pachyderm.Visibility>.Option] {
-            let visibilities: [Pachyderm.Visibility]
-            if !composeController.mastodonController.instanceFeatures.composeDirectStatuses {
-                visibilities = [.public, .unlisted, .private]
-            } else {
-                visibilities = Pachyderm.Visibility.allCases
-            }
-            return visibilities.map { vis in
-                    .init(value: vis, title: vis.displayName, subtitle: vis.subtitle, image: UIImage(systemName: vis.unfilledImageName), accessibilityLabel: "Visibility: \(vis.displayName)")
-            }
-        }
-        
         private var localOnlyPicker: some View {
             let domain = composeController.mastodonController.accountInfo!.instanceURL.host!
             return MenuPicker(selection: $draft.localOnly, options: [
@@ -181,8 +135,13 @@ class ToolbarController: ViewController {
         private var formatButtons: some View {
             ForEach(StatusFormat.allCases, id: \.rawValue) { format in
                 Button(action: controller.formatAction(format)) {
-                    Image(systemName: format.imageName)
+                    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)

Packages/ComposeUI/Sources/ComposeUI/CoreData/Draft.swift

@@ -1,73 +0,0 @@
-//
-//  Draft.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 4/22/23.
-//
-
-import CoreData
-import Pachyderm
-
-@objc
-public class Draft: NSManagedObject, Identifiable {
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<Draft> {
-        return NSFetchRequest<Draft>(entityName: "Draft")
-    }
-    
-    @nonobjc public class func fetchRequest(id: UUID) -> NSFetchRequest<Draft> {
-        let req = NSFetchRequest<Draft>(entityName: "Draft")
-        req.predicate = NSPredicate(format: "id = %@", id as NSUUID)
-        return req
-    }
-    
-    @NSManaged public var accountID: String
-    @NSManaged public var contentWarning: String
-    @NSManaged public var contentWarningEnabled: Bool
-    @NSManaged public var editedStatusID: String?
-    @NSManaged public var id: UUID
-    @NSManaged public var initialContentWarning: String?
-    @NSManaged public var initialText: String
-    @NSManaged public var inReplyToID: String?
-    @NSManaged public var language: String? // ISO 639 language code
-    @NSManaged public var lastModified: Date!
-    @NSManaged public var localOnly: Bool
-    @NSManaged public var text: String
-    @NSManaged private var visibilityStr: String
-    
-    @NSManaged internal var attachments: NSMutableOrderedSet
-    @NSManaged public var poll: Poll?
-    
-    public var visibility: Visibility {
-        get {
-            Visibility(rawValue: visibilityStr) ?? .public
-        }
-        set {
-            visibilityStr = newValue.rawValue
-        }
-    }
-    
-    public var draftAttachments: [DraftAttachment] {
-        get {
-            attachments.array as! [DraftAttachment]
-        }
-        set {
-            attachments = NSMutableOrderedSet(array: newValue)
-        }
-    }
-    
-    public override func awakeFromInsert() {
-        super.awakeFromInsert()
-        id = UUID()
-        lastModified = Date()
-    }
-    
-}
-
-extension Draft {
-    public var hasContent: Bool {
-        (!text.isEmpty && text != initialText) ||
-            (contentWarningEnabled && !contentWarning.isEmpty && contentWarning != initialContentWarning) ||
-            attachments.count > 0 ||
-            poll?.hasContent == true
-    }
-}

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

@@ -1,329 +0,0 @@
-//
-//  DraftAttachment.swift
-//  CoreData
-//
-//  Created by Shadowfacts on 4/22/23.
-//
-
-import CoreData
-import PencilKit
-import UniformTypeIdentifiers
-import Photos
-import InstanceFeatures
-import Pachyderm
-
-private let decoder = PropertyListDecoder()
-private let encoder = PropertyListEncoder()
-
-@objc
-public final class DraftAttachment: NSManagedObject, Identifiable {
-    
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<DraftAttachment> {
-        return NSFetchRequest<DraftAttachment>(entityName: "DraftAttachment")
-    }
-    
-    @NSManaged internal var assetID: String?
-    @NSManaged public var attachmentDescription: String
-    @NSManaged internal private(set) var drawingData: Data?
-    @NSManaged public var editedAttachmentID: String?
-    @NSManaged private var editedAttachmentKindString: String?
-    @NSManaged public var editedAttachmentURL: URL?
-    @NSManaged public var fileURL: URL?
-    @NSManaged internal var fileType: String?
-    @NSManaged public var id: UUID!
-    
-    @NSManaged internal var draft: Draft
-    
-    public var drawing: PKDrawing? {
-        get {
-            if let drawingData,
-               let drawing = try? decoder.decode(PKDrawing.self, from: drawingData) {
-                return drawing
-            } else {
-                return nil
-            }
-        }
-        set {
-            drawingData = try! encoder.encode(newValue)
-        }
-    }
-    
-    public var data: AttachmentData {
-        if let editedAttachmentID {
-            return .editing(editedAttachmentID, editedAttachmentKind!, editedAttachmentURL!)
-        } else if let assetID {
-            return .asset(assetID)
-        } else if let drawing {
-            return .drawing(drawing)
-        } else if let fileURL, let fileType {
-            return .file(fileURL, UTType(fileType)!)
-        } else {
-            return .none
-        }
-    }
-    
-    public var editedAttachmentKind: Attachment.Kind? {
-        get {
-            editedAttachmentKindString.flatMap(Attachment.Kind.init(rawValue:))
-        }
-        set {
-            editedAttachmentKindString = newValue?.rawValue
-        }
-    }
-    
-    public enum AttachmentData {
-        case asset(String)
-        case drawing(PKDrawing)
-        case file(URL, UTType)
-        case editing(String, Attachment.Kind, URL)
-        case none
-    }
-    
-    public override func prepareForDeletion() {
-        super.prepareForDeletion()
-        if let fileURL {
-            try? FileManager.default.removeItem(at: fileURL)
-        }
-    }
-    
-}
-
-extension DraftAttachment {
-    var type: AttachmentType {
-        if let editedAttachmentKind {
-            switch editedAttachmentKind {
-            case .image:
-                return .image
-            case .video:
-                return .video
-            case .gifv:
-                return .video
-            case .audio, .unknown:
-                return .unknown
-            }
-        } else if let assetID {
-            guard let asset = PHAsset.fetchAssets(withLocalIdentifiers: [assetID], options: nil).firstObject else {
-                return .unknown
-            }
-            switch asset.mediaType {
-            case .image:
-                return .image
-            case .video:
-                return .video
-            default:
-                return .unknown
-            }
-        } else if drawingData != nil {
-            return .image
-        } else if let fileType,
-                  let type = UTType(fileType) {
-            if type.conforms(to: .image) {
-                return .image
-            } else if type.conforms(to: .movie) {
-                return .video
-            } else {
-                return .unknown
-            }
-        } else {
-            return .unknown
-        }
-    }
-    
-    enum AttachmentType {
-        case image, video, unknown
-    }
-}
-
-//private let attachmentTypeIdentifier = "space.vaccor.Tusker.composition-attachment"
-
-private let imageType = UTType.image.identifier
-private let heifType = UTType.heif.identifier
-private let heicType = UTType.heic.identifier
-private let jpegType = UTType.jpeg.identifier
-private let pngType = UTType.png.identifier
-private let mp4Type = UTType.mpeg4Movie.identifier
-private let quickTimeType = UTType.quickTimeMovie.identifier
-private let gifType = UTType.gif.identifier
-
-extension DraftAttachment: NSItemProviderReading {
-    public 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, */ gifType, heifType, heicType, jpegType, pngType, imageType, mp4Type, quickTimeType]
-    }
-    
-    public static func object(withItemProviderData data: Data, typeIdentifier: String) throws -> DraftAttachment {
-        var data = data
-        var type = UTType(typeIdentifier)!
-        
-        // the type is .image in certain circumstances:
-        // - macOS: image copied from macOS Safari -> only UIImage(data: data) works
-        // - iOS: sharing screenshot from markup -> only NSKeyedUnarchiver works
-        if type == .image,
-           let image = UIImage(data: data) ?? (try? NSKeyedUnarchiver.unarchivedObject(ofClass: UIImage.self, from: data)),
-           let pngData = image.pngData() {
-            data = pngData
-            type = .png
-        }
-        
-        let attachment = DraftAttachment(entity: DraftsPersistentContainer.shared.persistentStoreCoordinator.managedObjectModel.entitiesByName["DraftAttachment"]!, insertInto: nil)
-        attachment.id = UUID()
-        attachment.fileURL = try writeDataToFile(data, id: attachment.id, type: type)
-        attachment.fileType = type.identifier
-        attachment.attachmentDescription = ""
-        return attachment
-    }
-    
-    static var attachmentsDirectory: URL {
-        let containerURL = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: "group.space.vaccor.Tusker")!
-        return containerURL.appendingPathComponent("Documents").appendingPathComponent("attachments")
-    }
-    
-    static func writeDataToFile(_ data: Data, id: UUID, type: UTType) throws -> URL {
-        let directoryURL = attachmentsDirectory
-        try FileManager.default.createDirectory(at: directoryURL, withIntermediateDirectories: true)
-        let attachmentURL = directoryURL.appendingPathComponent(id.uuidString, conformingTo: type)
-        try data.write(to: attachmentURL)
-        return attachmentURL
-    }
-}
-
-// MARK: Exporting
-
-extension DraftAttachment {
-    func getData(features: InstanceFeatures, skipAllConversion: Bool = false, completion: @escaping (Result<(Data, UTType), ExportError>) -> Void) {
-        if let assetID {
-            guard let asset = PHAsset.fetchAssets(withLocalIdentifiers: [assetID], options: nil).firstObject else {
-                completion(.failure(.noAsset))
-                return
-            }
-            if asset.mediaType == .image {
-                let options = PHImageRequestOptions()
-                options.version = .current
-                options.deliveryMode = .highQualityFormat
-                options.resizeMode = .none
-                options.isNetworkAccessAllowed = true
-                PHImageManager.default().requestImageDataAndOrientation(for: asset, options: options) { data, dataUTI, orientation, info in
-                    guard let data, let dataUTI else {
-                        completion(.failure(.missingAssetData))
-                        return
-                    }
-                    let processed = Self.processImageData(data, type: UTType(dataUTI)!, features: features, skipAllConversion: skipAllConversion)
-                    completion(.success(processed))
-                }
-            } else if asset.mediaType == .video {
-                let options = PHVideoRequestOptions()
-                options.version = .current
-                options.deliveryMode = .automatic
-                options.isNetworkAccessAllowed = true
-                PHImageManager.default().requestExportSession(forVideo: asset, options: options, exportPreset: AVAssetExportPresetHighestQuality) { exportSession, info in
-                    if let exportSession {
-                        Self.exportVideoData(session: exportSession, features: features, completion: completion)
-                    } else if let error = info?[PHImageErrorKey] as? Error {
-                        completion(.failure(.videoExport(error)))
-                    } else {
-                        completion(.failure(.noVideoExportSession))
-                    }
-                }
-            } else {
-                completion(.failure(.unknownAssetType))
-            }
-        } else if let drawingData {
-            guard let drawing = try? decoder.decode(PKDrawing.self, from: drawingData) else {
-                completion(.failure(.loadingDrawing))
-                return
-            }
-            let image = drawing.imageInLightMode(from: drawing.bounds, scale: 1)
-            completion(.success((image.pngData()!, .png)))
-        } else if let fileURL, let fileType {
-            let type = UTType(fileType)!
-            
-            if type.conforms(to: .movie) {
-                let asset = AVURLAsset(url: fileURL)
-                guard let session = AVAssetExportSession(asset: asset, presetName: AVAssetExportPresetHighestQuality) else {
-                    completion(.failure(.noVideoExportSession))
-                    return
-                }
-                Self.exportVideoData(session: session, features: features, completion: completion)
-            } else {
-                let fileData: Data
-                do {
-                    fileData = try Data(contentsOf: fileURL)
-                } catch {
-                    completion(.failure(.loadingData))
-                    return
-                }
-                
-                if type != .gif,
-                   type.conforms(to: .image) {
-                    let result = Self.processImageData(fileData, type: type, features: features, skipAllConversion: skipAllConversion)
-                    completion(.success(result))
-                } else {
-                    completion(.success((fileData, type)))
-                }
-            }
-        } else {
-            completion(.failure(.noData))
-        }
-    }
-    
-    private static 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 || type == .heif {
-            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, features: InstanceFeatures, completion: @escaping (Result<(Data, UTType), ExportError>) -> Void) {
-        session.outputFileType = .mp4
-        session.outputURL = FileManager.default.temporaryDirectory.appendingPathComponent("exported_video_\(UUID())").appendingPathExtension("mp4")
-        if let configuration = features.mediaAttachmentsConfiguration {
-            session.fileLengthLimit = Int64(configuration.videoSizeLimit)
-        }
-        session.exportAsynchronously {
-            guard session.status == .completed else {
-                completion(.failure(.videoExport(session.error!)))
-                return
-            }
-            do {
-                let data = try Data(contentsOf: session.outputURL!)
-                completion(.success((data, .mpeg4Movie)))
-            } catch {
-                completion(.failure(.videoExport(error)))
-            }
-        }
-    }
-    
-    enum ExportError: Error {
-        case noAsset
-        case unknownAssetType
-        case missingAssetData
-        case videoExport(Error)
-        case noVideoExportSession
-        case loadingDrawing
-        case loadingData
-        case noData
-    }
-}

Packages/ComposeUI/Sources/ComposeUI/CoreData/Drafts.xcdatamodeld/Drafts.xcdatamodel/contents

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="22222" systemVersion="22G91" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
-    <entity name="Draft" representedClassName="ComposeUI.Draft" syncable="YES">
-        <attribute name="accountID" attributeType="String"/>
-        <attribute name="contentWarning" attributeType="String" defaultValueString=""/>
-        <attribute name="contentWarningEnabled" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
-        <attribute name="editedStatusID" optional="YES" attributeType="String"/>
-        <attribute name="id" attributeType="UUID" usesScalarValueType="NO"/>
-        <attribute name="initialContentWarning" optional="YES" attributeType="String"/>
-        <attribute name="initialText" attributeType="String"/>
-        <attribute name="inReplyToID" optional="YES" attributeType="String"/>
-        <attribute name="language" optional="YES" attributeType="String"/>
-        <attribute name="lastModified" attributeType="Date" usesScalarValueType="NO"/>
-        <attribute name="localOnly" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
-        <attribute name="text" attributeType="String" defaultValueString=""/>
-        <attribute name="visibilityStr" optional="YES" attributeType="String"/>
-        <relationship name="attachments" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="DraftAttachment" inverseName="draft" inverseEntity="DraftAttachment"/>
-        <relationship name="poll" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="Poll" inverseName="draft" inverseEntity="Poll"/>
-    </entity>
-    <entity name="DraftAttachment" representedClassName="ComposeUI.DraftAttachment" syncable="YES">
-        <attribute name="assetID" optional="YES" attributeType="String"/>
-        <attribute name="attachmentDescription" attributeType="String" defaultValueString=""/>
-        <attribute name="drawingData" optional="YES" attributeType="Binary"/>
-        <attribute name="editedAttachmentID" optional="YES" attributeType="String"/>
-        <attribute name="editedAttachmentKindString" optional="YES" attributeType="String"/>
-        <attribute name="editedAttachmentURL" optional="YES" attributeType="URI"/>
-        <attribute name="fileType" optional="YES" attributeType="String"/>
-        <attribute name="fileURL" optional="YES" attributeType="URI"/>
-        <attribute name="id" attributeType="UUID" usesScalarValueType="NO"/>
-        <relationship name="draft" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Draft" inverseName="attachments" inverseEntity="Draft"/>
-    </entity>
-    <entity name="Poll" representedClassName="ComposeUI.Poll" syncable="YES">
-        <attribute name="duration" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="multiple" attributeType="Boolean" usesScalarValueType="YES"/>
-        <relationship name="draft" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Draft" inverseName="poll" inverseEntity="Draft"/>
-        <relationship name="options" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="PollOption" inverseName="poll" inverseEntity="PollOption"/>
-    </entity>
-    <entity name="PollOption" representedClassName="ComposeUI.PollOption" syncable="YES">
-        <attribute name="text" attributeType="String" defaultValueString=""/>
-        <relationship name="poll" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Poll" inverseName="options" inverseEntity="Poll"/>
-    </entity>
-</model>

Packages/ComposeUI/Sources/ComposeUI/CoreData/DraftsPersistentContainer.swift

@@ -1,214 +0,0 @@
-//
-//  DraftsPersistentContainer.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 4/22/23.
-//
-
-import Foundation
-import CoreData
-import OSLog
-import Pachyderm
-
-private let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "DraftsPersistentContainer")
-
-public class DraftsPersistentContainer: NSPersistentContainer {
-    
-    public static let shared = DraftsPersistentContainer()
-    
-    private static let managedObjectModel: NSManagedObjectModel = {
-        let url = Bundle.module.url(forResource: "Drafts", withExtension: "momd")!
-        return NSManagedObjectModel(contentsOf: url)!
-    }()
-    
-    private var lastHistoryToken: NSPersistentHistoryToken!
-    
-    init() {
-        super.init(name: "Drafts", managedObjectModel: DraftsPersistentContainer.managedObjectModel)
-        
-        let containerURL = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: "group.space.vaccor.Tusker")!
-        let documentsURL = containerURL.appendingPathComponent("Documents")
-        let storeDesc = NSPersistentStoreDescription(url: documentsURL.appendingPathComponent("drafts").appendingPathExtension("sqlite"))
-        storeDesc.type = NSSQLiteStoreType
-        storeDesc.setOption(true as NSNumber, forKey: NSPersistentHistoryTrackingKey)
-        storeDesc.setOption(true as NSNumber, forKey: NSPersistentStoreRemoteChangeNotificationPostOptionKey)
-        
-        persistentStoreDescriptions = [
-            storeDesc
-        ]
-        
-        loadPersistentStores { _, error in
-            if let error {
-                fatalError("Loading persistent store: \(error)")
-            }
-        }
-        
-        viewContext.automaticallyMergesChangesFromParent = true
-        viewContext.mergePolicy = NSMergePolicy.mergeByPropertyObjectTrump
-        
-        lastHistoryToken = persistentStoreCoordinator.currentPersistentHistoryToken(fromStores: nil)
-        
-        NotificationCenter.default.addObserver(self, selector: #selector(remoteChanges(_:)), name: .NSPersistentStoreRemoteChange, object: persistentStoreCoordinator)
-    }
-    
-    public func save() {
-        guard viewContext.hasChanges else {
-            return
-        }
-        do {
-            try viewContext.save()
-        } catch {
-            logger.error("Failed to save: \(String(describing: error))")
-        }
-    }
-    
-    public func migrate(from url: URL, completion: @escaping (Result<(), any Error>) -> Void) {
-        performBackgroundTask { context in
-            let result = DraftsMigrator.migrate(from: url, to: context)
-            completion(result)
-            try! context.save()
-        }
-    }
-    
-    public func getDraft(id: UUID) -> Draft? {
-        let req = Draft.fetchRequest(id: id)
-        return try? viewContext.fetch(req).first
-    }
-    
-    public func createDraft(
-        accountID: String,
-        text: String,
-        contentWarning: String,
-        inReplyToID: String?,
-        visibility: Visibility,
-        language: String?,
-        localOnly: Bool
-    ) -> Draft {
-        let draft = Draft(context: viewContext)
-        draft.accountID = accountID
-        draft.text = text
-        draft.initialText = text
-        draft.contentWarning = contentWarning
-        draft.initialContentWarning = contentWarning
-        draft.contentWarningEnabled = !contentWarning.isEmpty
-        draft.inReplyToID = inReplyToID
-        draft.visibility = visibility
-        draft.language = language
-        draft.localOnly = localOnly
-        save()
-        return draft
-    }
-    
-    public func createEditDraft(
-        accountID: String,
-        source: StatusSource,
-        inReplyToID: String?,
-        visibility: Visibility,
-        localOnly: Bool,
-        attachments: [Attachment],
-        poll: Pachyderm.Poll?
-    ) -> Draft {
-        let draft = Draft(context: viewContext)
-        draft.accountID = accountID
-        draft.editedStatusID = source.id
-        draft.text = source.text
-        draft.initialText = source.text
-        draft.contentWarning = source.spoilerText
-        draft.contentWarningEnabled = !source.spoilerText.isEmpty
-        draft.initialContentWarning = source.spoilerText
-        draft.inReplyToID = inReplyToID
-        draft.visibility = visibility
-        draft.localOnly = localOnly
-        for attachment in attachments {
-            createEditDraftAttachment(attachment, in: draft)
-        }
-        if let existingPoll = poll {
-            let poll = Poll(context: viewContext)
-            poll.draft = draft
-            draft.poll = poll
-            if let expiresAt = existingPoll.expiresAt,
-               !existingPoll.effectiveExpired {
-                poll.duration = PollController.Duration.allCases.max(by: {
-                    (expiresAt.timeIntervalSinceNow - $0.timeInterval) < (expiresAt.timeIntervalSinceNow - $1.timeInterval)
-                })!.timeInterval
-            } else {
-                poll.duration = PollController.Duration.oneDay.timeInterval
-            }
-            poll.multiple = existingPoll.multiple
-            // rmeove default empty options
-            for opt in poll.pollOptions {
-                viewContext.delete(opt)
-            }
-            for existingOpt in existingPoll.options {
-                let opt = PollOption(context: viewContext)
-                opt.poll = poll
-                poll.options.add(opt)
-                opt.text = existingOpt.title
-            }
-        }
-        save()
-        return draft
-    }
-    
-    private func createEditDraftAttachment(_ attachment: Attachment, in draft: Draft) {
-        let draftAttachment = DraftAttachment(context: viewContext)
-        draftAttachment.id = UUID()
-        draftAttachment.attachmentDescription = attachment.description ?? ""
-        draftAttachment.editedAttachmentID = attachment.id
-        draftAttachment.editedAttachmentKind = attachment.kind
-        draftAttachment.editedAttachmentURL = attachment.url
-        draftAttachment.draft = draft
-        draft.attachments.add(draftAttachment)
-    }
-    
-    public func removeOrphanedAttachments(completion: @escaping () -> Void) {
-        guard let files = try? FileManager.default.contentsOfDirectory(at: DraftAttachment.attachmentsDirectory, includingPropertiesForKeys: nil),
-              !files.isEmpty else {
-            return
-        }
-        performBackgroundTask { context in
-            let allAttachmentsReq = DraftAttachment.fetchRequest()
-            allAttachmentsReq.predicate = NSPredicate(format: "fileURL != nil")
-            guard let allAttachments = try? context.fetch(allAttachmentsReq) else {
-                return
-            }
-            let orphaned = Set(files).subtracting(allAttachments.lazy.compactMap(\.fileURL))
-            for url in orphaned {
-                do {
-                    try FileManager.default.removeItem(at: url)
-                } catch {
-                    logger.error("Failed to remove orphaned attachment: \(String(describing: error), privacy: .public)")
-                }
-            }
-            completion()
-        }
-    }
-    
-    @objc private func remoteChanges(_ notification: Foundation.Notification) {
-        guard let newHistoryToken = notification.userInfo?[NSPersistentHistoryTokenKey] as? NSPersistentHistoryToken else {
-            return
-        }
-        
-        // todo: should this be on a background context?
-        let context = viewContext
-        context.perform {
-            let predicate = NSPredicate(format: "(%@ < token) AND (token <= %@)", self.lastHistoryToken, newHistoryToken)
-            
-            let historyRequest = NSPersistentHistoryTransaction.fetchRequest!
-            historyRequest.predicate = predicate
-            let request = NSPersistentHistoryChangeRequest.fetchHistory(withFetch: historyRequest)
-            if let result = try? context.execute(request) as? NSPersistentHistoryResult,
-               let transactions = result.result as? [NSPersistentHistoryTransaction] {
-                for transaction in transactions {
-                    guard let userInfo = transaction.objectIDNotification().userInfo else {
-                        continue
-                    }
-                    NSManagedObjectContext.mergeChanges(fromRemoteContextSave: userInfo, into: [context])
-                }
-            }
-            
-            self.lastHistoryToken = newHistoryToken
-        }
-    }
-    
-}

Packages/ComposeUI/Sources/ComposeUI/CoreData/Poll.swift

@@ -1,46 +0,0 @@
-//
-//  Poll.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 4/22/23.
-//
-
-import CoreData
-
-@objc
-public class Poll: NSManagedObject {
-    
-    @NSManaged public var duration: TimeInterval
-    @NSManaged public var multiple: Bool
-    
-    @NSManaged public var draft: Draft
-    @NSManaged public var options: NSMutableOrderedSet
-    
-    public var pollOptions: [PollOption] {
-        get {
-            options.array as! [PollOption]
-        }
-        set {
-            options = NSMutableOrderedSet(array: newValue)
-        }
-    }
-    
-    public override func awakeFromInsert() {
-        super.awakeFromInsert()
-        self.multiple = false
-        self.duration = 24 * 60 * 60 // 1 day
-        if let managedObjectContext {
-            self.options = [
-                PollOption(context: managedObjectContext),
-                PollOption(context: managedObjectContext),
-            ]
-        }
-    }
-    
-}
-
-extension Poll {
-    public var hasContent: Bool {
-        pollOptions.allSatisfy { !$0.text.isEmpty }
-    }
-}

Packages/ComposeUI/Sources/ComposeUI/CoreData/PollOption.swift

@@ -1,21 +0,0 @@
-//
-//  PollOption.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 4/22/23.
-//
-
-import CoreData
-
-@objc
-public class PollOption: NSManagedObject, Identifiable {
-    
-    public var id: NSManagedObjectID {
-        objectID
-    }
-    
-    @NSManaged public var text: String
-    
-    @NSManaged public var poll: Poll
-    
-}

Packages/ComposeUI/Sources/ComposeUI/DraftsMigrator.swift

@@ -1,255 +0,0 @@
-//
-//  DraftsMigrator.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 4/22/23.
-//
-
-import Foundation
-import OSLog
-import UniformTypeIdentifiers
-import Pachyderm
-import PencilKit
-import CoreData
-
-struct DraftsMigrator {
-    private init() {}
-    
-    private static let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "DraftsMigrator")
-    private static let decoder = PropertyListDecoder()
-    
-    static func migrate(from url: URL, to context: NSManagedObjectContext) -> Result<(), any Error> {
-        do {
-            let data = try Data(contentsOf: url)
-            let container = try decoder.decode(DraftsContainer.self, from: data)
-            for old in container.drafts.values {
-                let new = Draft(context: context)
-                new.id = old.id
-                new.lastModified = old.lastModified
-                new.accountID = old.accountID
-                new.text = old.text
-                new.contentWarningEnabled = old.contentWarningEnabled
-                new.contentWarning = old.contentWarning
-                new.inReplyToID = old.inReplyToID
-                new.visibility = old.visibility
-                new.localOnly = old.localOnly
-                new.initialText = old.initialText
-                
-                if let oldPoll = old.poll {
-                    let newPoll = Poll(context: context)
-                    newPoll.draft = new
-                    new.poll = newPoll
-                    newPoll.multiple = oldPoll.multiple
-                    newPoll.duration = oldPoll.duration
-                    for oldOption in oldPoll.options {
-                        let newOption = PollOption(context: context)
-                        newOption.text = oldOption.text
-                        newOption.poll = newPoll
-                        newPoll.options.add(newOption)
-                    }
-                }
-                
-                for oldAttachment in old.attachments {
-                    let newAttachment = DraftAttachment(context: context)
-                    newAttachment.draft = new
-                    new.attachments.add(newAttachment)
-                    newAttachment.id = oldAttachment.id
-                    newAttachment.attachmentDescription = oldAttachment.attachmentDescription
-                    switch oldAttachment.data {
-                    case .asset(let assetID):
-                        newAttachment.assetID = assetID
-                    case .image(let data, originalType: let type):
-                        newAttachment.fileURL = try? DraftAttachment.writeDataToFile(data, id: newAttachment.id, type: type)
-                        newAttachment.fileType = type.identifier
-                    case .video(_):
-                        fatalError("unreachable, video attachments weren't encodable")
-                    case .drawing(let drawing):
-                        newAttachment.drawing = drawing
-                    case .gif(let data):
-                        newAttachment.fileURL = try? DraftAttachment.writeDataToFile(data, id: newAttachment.id, type: .gif)
-                        newAttachment.fileType = UTType.gif.identifier
-                    }
-                }
-            }
-            
-            try FileManager.default.removeItem(at: url)
-        } catch {
-            logger.error("Error migrating: \(String(describing: error))")
-            return .failure(error)
-        }
-        return .success(())
-    }
-    
-    // MARK: Supporting Types
-    
-    struct DraftsContainer: Decodable {
-        let drafts: [UUID: OldDraft]
-        
-        init(drafts: [UUID: OldDraft]) {
-            self.drafts = drafts
-        }
-        
-        init(from decoder: Decoder) throws {
-            let container = try decoder.container(keyedBy: CodingKeys.self)
-            self.drafts = try container.decode([UUID: SafeDraft].self, forKey: .drafts).compactMapValues(\.draft)
-        }
-        
-        enum CodingKeys: 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: OldDraft?
-
-        init(from decoder: Decoder) throws {
-            let container = try decoder.singleValueContainer()
-            self.draft = try? container.decode(OldDraft.self)
-        }
-    }
-    
-    struct OldDraft: Decodable {
-        let id: UUID
-        let lastModified: Date
-        let accountID: String
-        let text: String
-        let contentWarningEnabled: Bool
-        let contentWarning: String
-        let attachments: [OldDraftAttachment]
-        let inReplyToID: String?
-        let visibility: Visibility
-        let poll: OldPoll?
-        let localOnly: Bool
-        let initialText: String
-        
-        init(from decoder: Decoder) throws {
-            let container = try decoder.container(keyedBy: CodingKeys.self)
-            
-            self.id = try container.decode(UUID.self, forKey: .id)
-            self.lastModified = try container.decode(Date.self, forKey: .lastModified)
-            
-            self.accountID = try container.decode(String.self, forKey: .accountID)
-            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([OldDraftAttachment].self, forKey: .attachments)
-            self.inReplyToID = try container.decode(String?.self, forKey: .inReplyToID)
-            self.visibility = try container.decode(Visibility.self, forKey: .visibility)
-            self.poll = try container.decode(OldPoll?.self, forKey: .poll)
-            self.localOnly = try container.decodeIfPresent(Bool.self, forKey: .localOnly) ?? false
-            
-            self.initialText = try container.decode(String.self, forKey: .initialText)
-        }
-        
-        enum CodingKeys: String, CodingKey {
-            case id
-            case lastModified
-            
-            case accountID
-            case text
-            case contentWarningEnabled
-            case contentWarning
-            case attachments
-            case inReplyToID
-            case visibility
-            case poll
-            case localOnly
-            
-            case initialText
-        }
-    }
-    
-    struct OldDraftAttachment: Decodable {
-        let id: UUID
-        let data: OldDraftAttachmentData
-        let attachmentDescription: String
-        
-        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(OldDraftAttachmentData.self, forKey: .data)
-            self.attachmentDescription = try container.decode(String.self, forKey: .attachmentDescription)
-        }
-    
-        enum CodingKeys: String, CodingKey {
-            case id
-            case data
-            case attachmentDescription
-        }
-    }
-    
-    enum OldDraftAttachmentData: Decodable {
-        case asset(String)
-        case image(Data, originalType: UTType)
-        case video(URL)
-        case drawing(PKDrawing)
-        case gif(Data)
-        
-        init(from decoder: Decoder) throws {
-            let container = try decoder.container(keyedBy: CodingKeys.self)
-            
-            switch try container.decode(String.self, forKey: .type) {
-            case "asset":
-                let identifier = try container.decode(String.self, forKey: .assetIdentifier)
-                self = .asset(identifier)
-            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)
-                }
-            case "drawing":
-                let drawingData = try container.decode(Data.self, forKey: .drawing)
-                let drawing = try PKDrawing(data: drawingData)
-                self = .drawing(drawing)
-            default:
-                throw DecodingError.dataCorruptedError(forKey: .type, in: container, debugDescription: "CompositionAttachment type must be one of image, asset, or drawing")
-            }
-        }
-        
-        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.
-            case drawing
-        }
-    }
-    
-    struct OldPoll: Decodable {
-        let options: [OldPollOption]
-        let multiple: Bool
-        let duration: TimeInterval
-        
-        init(from decoder: Decoder) throws {
-            let container = try decoder.container(keyedBy: CodingKeys.self)
-            self.options = try container.decode([OldPollOption].self, forKey: .options)
-            self.multiple = try container.decode(Bool.self, forKey: .multiple)
-            self.duration = try container.decode(TimeInterval.self, forKey: .duration)
-        }
-        
-        enum CodingKeys: String, CodingKey {
-            case options
-            case multiple
-            case duration
-        }
-    }
-    
-    struct OldPollOption: Decodable {
-        let text: String
-        
-        init(from decoder: Decoder) throws {
-            self.text = try decoder.singleValueContainer().decode(String.self)
-        }
-    }
-}

Packages/ComposeUI/Sources/ComposeUI/FuzzyMatcher.swift

@@ -1,6 +1,6 @@
 //
 //  FuzzyMatcher.swift
-//  TuskerComponents
+//  ComposeUI
 //
 //  Created by Shadowfacts on 10/10/20.
 //  Copyright © 2020 Shadowfacts. All rights reserved.
@@ -8,7 +8,7 @@
 
 import Foundation
 
-public struct FuzzyMatcher {
+struct FuzzyMatcher {
     
     private init() {}
     
@@ -21,7 +21,7 @@ public struct FuzzyMatcher {
     /// +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`
-    public static func match(pattern: String, str: String) -> (matched: Bool, score: Int) {
+    static func match(pattern: String, str: String) -> (matched: Bool, score: Int) {
         let pattern = pattern.lowercased()
         let str = str.lowercased()
         

Packages/ComposeUI/Sources/ComposeUI/KeyboardReader.swift

@@ -5,20 +5,12 @@
 //  Created by Shadowfacts on 3/7/23.
 //
 
-#if !os(visionOS)
-
 import UIKit
 import Combine
 
 @available(iOS, obsoleted: 16.0)
 class KeyboardReader: ObservableObject {
-//    @Published var isVisible = false
+    @Published var isVisible = false
-    @Published var keyboardHeight: CGFloat = 0
-    
-    var isVisible: Bool {
-        // when a hardware keyboard is connected, the height is very short, so we don't consider that being "visible"
-        keyboardHeight > 72
-    }
     
     init() {
         NotificationCenter.default.addObserver(self, selector: #selector(willShow), name: UIResponder.keyboardWillShowNotification, object: nil)
@@ -26,18 +18,12 @@ class KeyboardReader: ObservableObject {
     }
     
     @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
+        isVisible = endFrame.height > 72
-        keyboardHeight = endFrame.height
     }
     
     @objc func willHide() {
-        // sometimes willHide is called during a SwiftUI view update
+        isVisible = false
-        DispatchQueue.main.async {
-//            self.isVisible = false
-            self.keyboardHeight = 0
     }
 }
-}
-
-#endif

Packages/ComposeUI/Sources/ComposeUI/Model/AttachmentData.swift

@@ -0,0 +1,278 @@
+//
+//  AttachmentData.swift
+//  ComposeUI
+//
+//  Created by Shadowfacts on 1/1/20.
+//  Copyright © 2020 Shadowfacts. All rights reserved.
+//
+
+import UIKit
+import Photos
+import UniformTypeIdentifiers
+import PencilKit
+import InstanceFeatures
+
+enum AttachmentData {
+    case asset(PHAsset)
+    case image(Data, originalType: UTType)
+    case video(URL)
+    case drawing(PKDrawing)
+    case gif(Data)
+    
+    var type: AttachmentType {
+        switch self {
+        case let .asset(asset):
+            return asset.attachmentType!
+        case .image(_, originalType: _):
+            return .image
+        case .video(_):
+            return .video
+        case .drawing(_):
+            return .image
+        case .gif(_):
+            return .image
+        }
+    }
+    
+    var isAsset: Bool {
+        switch self {
+        case .asset(_):
+            return true
+        default:
+            return false
+        }
+    }
+    
+    var canSaveToDraft: Bool {
+        switch self {
+        case .video(_):
+            return false
+        default:
+            return true
+        }
+    }
+    
+    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)!
+                // 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))
+        case let .asset(asset):
+            if asset.mediaType == .image {
+                let options = PHImageRequestOptions()
+                options.version = .current
+                options.deliveryMode = .highQualityFormat
+                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 {
+                        completion(.failure(.missingData))
+                        return
+                    }
+                    let processed = processImageData(data, type: UTType(dataUTI)!, features: features, skipAllConversion: skipAllConversion)
+                    completion(.success(processed))
+                }
+            } else if asset.mediaType == .video {
+                let options = PHVideoRequestOptions()
+                options.deliveryMode = .automatic
+                options.isNetworkAccessAllowed = true
+                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)
+                    } else if let error = info?[PHImageErrorKey] as? Error {
+                        completion(.failure(.videoExport(error)))
+                    } else {
+                        completion(.failure(.noVideoExportSession))
+                    }
+                }
+            } else {
+                fatalError("assetType must be either image or video")
+            }
+        case let .video(url):
+            let asset = AVURLAsset(url: url)
+            guard let session = AVAssetExportSession(asset: asset, presetName: AVAssetExportPresetHighestQuality) else {
+                completion(.failure(.noVideoExportSession))
+                return
+            }
+            AttachmentData.exportVideoData(session: session, completion: completion)
+            
+        case let .drawing(drawing):
+            let image = drawing.imageInLightMode(from: drawing.bounds, scale: 1)
+            completion(.success((image.pngData()!, .png)))
+        case let .gif(data):
+            completion(.success((data, .gif)))
+        }
+    }
+    
+    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")
+        session.exportAsynchronously {
+            guard session.status == .completed else {
+                completion(.failure(.videoExport(session.error!)))
+                return
+            }
+            do {
+                let data = try Data(contentsOf: session.outputURL!)
+                completion(.success((data, .mpeg4Movie)))
+            } catch {
+                completion(.failure(.videoExport(error)))
+            }
+        }
+    }
+    
+    enum AttachmentType {
+        case image, video
+    }
+    
+    enum Error: Swift.Error, LocalizedError {
+        case missingData
+        case videoExport(Swift.Error)
+        case noVideoExportSession
+        
+        var localizedDescription: String {
+            switch self {
+            case .missingData:
+                return "Missing Data"
+            case .videoExport(let error):
+                return "Exporting video: \(error)"
+            case .noVideoExportSession:
+                return "Couldn't create video export session"
+            }
+        }
+    }
+}
+
+extension PHAsset {
+    var attachmentType: AttachmentData.AttachmentType? {
+        switch self.mediaType {
+        case .image:
+            return .image
+        case .video:
+            return .video
+        default:
+            return nil
+        }
+    }
+}
+
+extension AttachmentData: Codable {
+    func encode(to encoder: Encoder) throws {
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        
+        switch self {
+        case let .asset(asset):
+            try container.encode("asset", forKey: .type)
+            try container.encode(asset.localIdentifier, forKey: .assetIdentifier)
+        case let .image(originalData, originalType):
+            try container.encode("image", forKey: .type)
+            try container.encode(originalType, forKey: .imageType)
+            try container.encode(originalData, forKey: .imageData)
+        case .video(_):
+            throw EncodingError.invalidValue(self, EncodingError.Context(codingPath: encoder.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"))
+        }
+    }
+    
+    init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        
+        switch try container.decode(String.self, forKey: .type) {
+        case "asset":
+            let identifier = try container.decode(String.self, forKey: .assetIdentifier)
+            guard let asset = PHAsset.fetchAssets(withLocalIdentifiers: [identifier], options: nil).firstObject else {
+                throw DecodingError.dataCorruptedError(forKey: .assetIdentifier, in: container, debugDescription: "Could not fetch asset with local identifier")
+            }
+            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)
+            }
+        case "drawing":
+            let drawingData = try container.decode(Data.self, forKey: .drawing)
+            let drawing = try PKDrawing(data: drawingData)
+            self = .drawing(drawing)
+        default:
+            throw DecodingError.dataCorruptedError(forKey: .type, in: container, debugDescription: "CompositionAttachment type must be one of image, asset, or drawing")
+        }
+    }
+    
+    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.
+        case drawing
+    }
+}
+
+extension AttachmentData: Equatable {
+    static func ==(lhs: AttachmentData, rhs: AttachmentData) -> 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 (.video(a), .video(b)):
+            return a == b
+        case let (.drawing(a), .drawing(b)):
+            return a == b
+        default:
+            return false
+        }
+    }
+}

Packages/ComposeUI/Sources/ComposeUI/Model/Draft.swift

@@ -0,0 +1,177 @@
+//
+//  Draft.swift
+//  ComposeUI
+//
+//  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
+    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
+    
+    var initialText: String
+    
+    public 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
+    ) {
+        self.id = UUID()
+        self.lastModified = Date()
+        
+        self.accountID = accountID
+        self.text = text
+        self.contentWarning = contentWarning
+        self.contentWarningEnabled = !contentWarning.isEmpty
+        self.attachments = []
+        self.inReplyToID = inReplyToID
+        self.visibility = visibility
+        self.localOnly = localOnly
+        
+        self.initialText = text
+    }
+    
+    public required init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        
+        self.id = try container.decode(UUID.self, forKey: .id)
+        self.lastModified = try container.decode(Date.self, forKey: .lastModified)
+        
+        self.accountID = try container.decode(String.self, forKey: .accountID)
+        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.inReplyToID = try container.decode(String?.self, forKey: .inReplyToID)
+        self.visibility = try container.decode(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 {
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        
+        try container.encode(id, forKey: .id)
+        try container.encode(lastModified, forKey: .lastModified)
+        
+        try container.encode(accountID, forKey: .accountID)
+        try container.encode(text, forKey: .text)
+        try container.encode(contentWarningEnabled, forKey: .contentWarningEnabled)
+        try container.encode(contentWarning, forKey: .contentWarning)
+        try container.encode(attachments, forKey: .attachments)
+        try container.encode(inReplyToID, forKey: .inReplyToID)
+        try container.encode(visibility, forKey: .visibility)
+        try container.encode(poll, forKey: .poll)
+        try container.encode(localOnly, forKey: .localOnly)
+        
+        try container.encode(initialText, forKey: .initialText)
+    }
+}
+
+extension Draft: Equatable {
+    public static func ==(lhs: Draft, rhs: Draft) -> Bool {
+        return lhs.id == rhs.id
+    }
+}
+
+extension Draft {
+    enum CodingKeys: String, CodingKey {
+        case id
+        case lastModified
+        
+        case accountID
+        case text
+        case contentWarningEnabled
+        case contentWarning
+        case attachments
+        case inReplyToID
+        case visibility
+        case poll
+        case localOnly
+        
+        case initialText
+    }
+}
+
+extension Draft {
+    public class Poll: Codable, ObservableObject {
+        @Published public var options: [Option]
+        @Published public var multiple: Bool
+        @Published public var duration: TimeInterval
+        
+        var hasContent: Bool {
+            options.contains { !$0.text.isEmpty }
+        }
+        
+        public init() {
+            self.options = [Option(""), Option("")]
+            self.multiple = false
+            self.duration = 24 * 60 * 60 // 1 day
+        }
+        
+        public 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 {
+            var container = encoder.container(keyedBy: CodingKeys.self)
+            try container.encode(options, forKey: .options)
+            try container.encode(multiple, forKey: .multiple)
+            try container.encode(duration, forKey: .duration)
+        }
+        
+        private enum CodingKeys: String, CodingKey {
+            case options
+            case multiple
+            case duration
+        }
+        
+        public class Option: Identifiable, Codable, ObservableObject {
+            public let id = UUID()
+            @Published public var text: String
+            
+            init(_ text: String) {
+                self.text = text
+            }
+            
+            public required init(from decoder: Decoder) throws {
+                self.text = try decoder.singleValueContainer().decode(String.self)
+            }
+            
+            public func encode(to encoder: Encoder) throws {
+                var container = encoder.singleValueContainer()
+                try container.encode(text)
+            }
+        }
+    }
+}

Packages/ComposeUI/Sources/ComposeUI/Model/DraftAttachment.swift

@@ -0,0 +1,117 @@
+//
+//  DraftAttachment.swift
+//  ComposeUI
+//
+//  Created by Shadowfacts on 3/14/20.
+//  Copyright © 2020 Shadowfacts. All rights reserved.
+//
+
+import Foundation
+import UIKit
+import UniformTypeIdentifiers
+
+public final class DraftAttachment: NSObject, Codable, ObservableObject, Identifiable {
+    static let typeIdentifier = "space.vaccor.Tusker.composition-attachment"
+    
+    public let id: UUID
+    @Published var data: AttachmentData
+    @Published var attachmentDescription: String
+    
+    init(data: AttachmentData, description: String = "") {
+        self.id = UUID()
+        self.data = data
+        self.attachmentDescription = description
+    }
+    
+    public 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.attachmentDescription = try container.decode(String.self, forKey: .attachmentDescription)
+    }
+    
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        
+        try container.encode(id, forKey: .id)
+        try container.encode(data, forKey: .data)
+        try container.encode(attachmentDescription, forKey: .attachmentDescription)
+    }
+    
+    static func ==(lhs: DraftAttachment, rhs: DraftAttachment) -> Bool {
+        return lhs.id == rhs.id
+    }
+    
+    enum CodingKeys: String, CodingKey {
+        case id
+        case data
+        case attachmentDescription
+    }
+}
+
+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] {
+        [typeIdentifier]
+    }
+    
+    public func loadData(withTypeIdentifier typeIdentifier: String, forItemProviderCompletionHandler completionHandler: @escaping (Data?, Error?) -> Void) -> Progress? {
+        if typeIdentifier == DraftAttachment.typeIdentifier {
+            do {
+                completionHandler(try PropertyListEncoder().encode(self), nil)
+            } catch {
+                completionHandler(nil, error)
+            }
+        } else {
+            completionHandler(nil, ItemProviderError.incompatibleTypeIdentifier)
+        }
+        return nil
+    }
+    
+    enum ItemProviderError: Error {
+        case incompatibleTypeIdentifier
+
+        var localizedDescription: String {
+            switch self {
+            case .incompatibleTypeIdentifier:
+                return "Cannot provide data for given type"
+            }
+        }
+    }
+}
+
+extension DraftAttachment: NSItemProviderReading {
+    public 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)
+        } else if typeIdentifier == gifType {
+            return DraftAttachment(data: .gif(data))
+        } else if UIImage.readableTypeIdentifiersForItemProvider.contains(typeIdentifier) {
+            return DraftAttachment(data: .image(data, originalType: UTType(typeIdentifier)!))
+        } 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))
+        } else if NSURL.readableTypeIdentifiersForItemProvider.contains(typeIdentifier), let url = try? NSURL.object(withItemProviderData: data, typeIdentifier: typeIdentifier) as URL {
+            return DraftAttachment(data: .video(url))
+        } else {
+            throw ItemProviderError.incompatibleTypeIdentifier
+        }
+    }
+}

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

@@ -0,0 +1,104 @@
+//
+//  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/Model/StatusFormat.swift

@@ -23,7 +23,7 @@ enum StatusFormat: Int, CaseIterable {
         }
     }
     
-    var imageName: String {
+    var imageName: String? {
         switch self {
         case .italics:
             return "italic"
@@ -31,8 +31,16 @@ enum StatusFormat: Int, CaseIterable {
             return "bold"
         case .strikethrough:
             return "strikethrough"
-        case .code:
+        default:
-            return "chevron.left.forwardslash.chevron.right"
+            return nil
+        }
+    }
+    
+    var title: (String, [NSAttributedString.Key: Any])? {
+        if self == .code {
+            return ("</>", [.font: UIFont(name: "Menlo", size: 17)!])
+        } else {
+            return nil
         }
     }
     

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

@@ -11,7 +11,7 @@ import PencilKit
 
 extension PKDrawing {
     
-    func imageInLightMode(from rect: CGRect, scale: CGFloat = 1) -> UIImage {
+    func imageInLightMode(from rect: CGRect, scale: CGFloat = UIScreen.main.scale) -> UIImage {
         let lightTraitCollection = UITraitCollection(userInterfaceStyle: .light)
         var drawingImage: UIImage!
         lightTraitCollection.performAsCurrent {

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

@@ -8,11 +8,6 @@
 import SwiftUI
 
 extension View {
-    #if os(visionOS)
-    func scrollDisabledIfAvailable(_ disabled: Bool) -> some View {
-        self.scrollDisabled(disabled)
-    }
-    #else
     @available(iOS, obsoleted: 16.0)
     @ViewBuilder
     func scrollDisabledIfAvailable(_ disabled: Bool) -> some View {
@@ -22,5 +17,4 @@ extension View {
             self
         }
     }
-    #endif
 }

Packages/ComposeUI/Sources/ComposeUI/Views/AttachmentDescriptionTextView.swift

@@ -7,42 +7,32 @@
 
 import SwiftUI
 
-private var placeholder: some View {
+struct AttachmentDescriptionTextView: View {
-    Text("Describe for the visually impaired…")
+    @Binding private var text: String
-}
+    private let placeholder: Text?
-
-struct InlineAttachmentDescriptionView: View {
-    @ObservedObject private var attachment: DraftAttachment
     private let minHeight: CGFloat
     
     @State private var height: CGFloat?
     
-    init(attachment: DraftAttachment, minHeight: CGFloat) {
+    init(text: Binding<String>, placeholder: Text?, minHeight: CGFloat) {
-        self.attachment = attachment
+        self._text = text
+        self.placeholder = placeholder
         self.minHeight = minHeight
     }
     
-    private var placeholderOffset: CGSize {
-        #if os(visionOS)
-        CGSize(width: 8, height: 8)
-        #else
-        CGSize(width: 4, height: 8)
-        #endif
-    }
-    
     var body: some View {
         ZStack(alignment: .topLeading) {
-            if attachment.attachmentDescription.isEmpty {
+            if text.isEmpty, let placeholder {
                 placeholder
                     .font(.body)
                     .foregroundColor(.secondary)
-                    .offset(placeholderOffset)
+                    .offset(x: 4, y: 8)
             }
             
             WrappedTextView(
-                text: $attachment.attachmentDescription,
+                text: $text,
-                backgroundColor: .clear,
+                textDidChange: self.textDidChange,
-                textDidChange: self.textDidChange
+                font: .preferredFont(forTextStyle: .body)
             )
             .frame(height: height ?? minHeight)
         }
@@ -53,49 +43,22 @@ struct InlineAttachmentDescriptionView: View {
     }
 }
 
-struct FocusedAttachmentDescriptionView: View {
-    @ObservedObject var attachment: DraftAttachment
-    
-    var body: some View {
-        ZStack(alignment: .topLeading) {
-            WrappedTextView(
-                text: $attachment.attachmentDescription,
-                backgroundColor: .secondarySystemBackground,
-                textDidChange: nil
-            )
-            .edgesIgnoringSafeArea([.bottom, .leading, .trailing])
-            
-            if attachment.attachmentDescription.isEmpty {
-                placeholder
-                    .font(.body)
-                    .foregroundColor(.secondary)
-                    .offset(x: 4, y: 8)
-                    .allowsHitTesting(false)
-            }
-        }
-    }
-}
-
 private struct WrappedTextView: UIViewRepresentable {
     typealias UIViewType = UITextView
     
     @Binding var text: String
-    let backgroundColor: UIColor
+    let textDidChange: ((UITextView) -> Void)
-    let textDidChange: (((UITextView) -> Void))?
+    let font: UIFont
     
     @Environment(\.isEnabled) private var isEnabled
     
     func makeUIView(context: Context) -> UITextView {
         let view = UITextView()
         view.delegate = context.coordinator
-        view.backgroundColor = backgroundColor
+        view.backgroundColor = .clear
-        view.font = .preferredFont(forTextStyle: .body)
+        view.font = font
         view.adjustsFontForContentSizeCategory = true
         view.textContainer.lineBreakMode = .byWordWrapping
-        #if os(visionOS)
-        view.borderStyle = .roundedRect
-        view.textContainerInset = UIEdgeInsets(top: 8, left: 4, bottom: 8, right: 4)
-        #endif
         return view
     }
     
@@ -105,12 +68,10 @@ private struct WrappedTextView: UIViewRepresentable {
         context.coordinator.textView = uiView
         context.coordinator.text = $text
         context.coordinator.didChange = textDidChange
-        if let textDidChange {
         // 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)
+            self.textDidChange(uiView)
-            }
         }
     }
     
@@ -121,10 +82,10 @@ private struct WrappedTextView: UIViewRepresentable {
     class Coordinator: NSObject, UITextViewDelegate, TextViewCaretScrolling {
         weak var textView: UITextView?
         var text: Binding<String>
-        var didChange: ((UITextView) -> Void)?
+        var didChange: (UITextView) -> Void
         var caretScrollPositionAnimator: UIViewPropertyAnimator?
         
-        init(text: Binding<String>, didChange: ((UITextView) -> Void)?) {
+        init(text: Binding<String>, didChange: @escaping (UITextView) -> Void) {
             self.text = text
             self.didChange = didChange
             
@@ -143,7 +104,7 @@ private struct WrappedTextView: UIViewRepresentable {
         
         func textViewDidChange(_ textView: UITextView) {
             text.wrappedValue = textView.text
-            didChange?(textView)
+            didChange(textView)
             
             ensureCursorVisible(textView: textView)
         }

Packages/ComposeUI/Sources/ComposeUI/Views/AttachmentThumbnailView.swift

@@ -0,0 +1,117 @@
+//
+//  AttachmentThumbnailView.swift
+//  ComposeUI
+//
+//  Created by Shadowfacts on 11/10/21.
+//  Copyright © 2021 Shadowfacts. All rights reserved.
+//
+
+import SwiftUI
+import Photos
+import TuskerComponents
+
+struct AttachmentThumbnailView: View {
+    let attachment: DraftAttachment
+    let fullSize: Bool
+    
+    @State private var gifData: Data? = nil
+    @State private var image: UIImage? = nil
+    @State private var imageContentMode: ContentMode = .fill
+    @State private var imageBackgroundColor: Color = .black
+    
+    @Environment(\.colorScheme) private var colorScheme: ColorScheme
+    
+    var body: some View {
+        if let gifData {
+            GIFViewWrapper(gifData: gifData)
+        } else if let image {
+            Image(uiImage: image)
+                .resizable()
+                .aspectRatio(contentMode: imageContentMode)
+                .background(imageBackgroundColor)
+        } else {
+            Image(systemName: placeholderImageName)
+                .onAppear(perform: self.loadImage)
+        }
+    }
+    
+    private var placeholderImageName: String {
+        switch colorScheme {
+        case .light:
+            return "photo"
+        case .dark:
+            return "photo.fill"
+        @unknown default:
+            return "photo"
+        }
+    }
+    
+    private func loadImage() {
+        switch attachment.data {
+        case let .image(originalData, originalType: _):
+            self.image = UIImage(data: originalData)
+        case let .asset(asset):
+            let size: CGSize
+            if fullSize {
+                size = PHImageManagerMaximumSize
+            } else {
+                // currently only used as thumbnail in ComposeAttachmentRow
+                size = CGSize(width: 80, height: 80)
+            }
+            let isGIF = PHAssetResource.assetResources(for: asset).contains(where: { $0.uniformTypeIdentifier == UTType.gif.identifier })
+            if isGIF {
+                PHImageManager.default().requestImageDataAndOrientation(for: asset, options: nil) { data, typeIdentifier, orientation, info in
+                    if typeIdentifier == UTType.gif.identifier {
+                        self.gifData = data
+                    } else if let data {
+                        let image = UIImage(data: data)
+                        DispatchQueue.main.async {
+                            self.image = image
+                        }
+                    }
+                }
+            } else {
+                PHImageManager.default().requestImage(for: asset, targetSize: size, contentMode: .aspectFill, options: nil) { (image, _) in
+                    DispatchQueue.main.async {
+                        self.image = image
+                    }
+                }
+            }
+        case let .video(url):
+            let asset = AVURLAsset(url: url)
+            let imageGenerator = AVAssetImageGenerator(asset: asset)
+            if let cgImage = try? imageGenerator.copyCGImage(at: .zero, actualTime: nil) {
+                self.image = UIImage(cgImage: cgImage)
+            }
+        case let .drawing(drawing):
+            image = drawing.imageInLightMode(from: drawing.bounds)
+            imageContentMode = .fit
+            imageBackgroundColor = .white
+        case let .gif(data):
+            self.gifData = data
+        }
+    }
+}
+
+private struct GIFViewWrapper: UIViewRepresentable {
+    typealias UIViewType = GIFImageView
+
+    @State private var controller: GIFController
+
+    init(gifData: Data) {
+        self._controller = State(wrappedValue: GIFController(gifData: gifData))
+    }
+
+    func makeUIView(context: Context) -> GIFImageView {
+        let view = GIFImageView()
+        controller.attach(to: view)
+        controller.startAnimating()
+        view.contentMode = .scaleAspectFit
+        view.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
+        view.setContentCompressionResistancePriority(.defaultLow, for: .vertical)
+        return view
+    }
+
+    func updateUIView(_ uiView: GIFImageView, context: Context) {
+    }
+}

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

@@ -14,10 +14,6 @@ struct CurrentAccountView: View {
     @EnvironmentObject private var controller: ComposeController
     
     var body: some View {
-        controller.currentAccountContainerView(AnyView(currentAccount))
-    }
-    
-    private var currentAccount: some View {
         HStack(alignment: .top) {
             AvatarImageView(
                 url: account?.avatar,

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

@@ -52,19 +52,12 @@ struct EmojiTextField: UIViewRepresentable {
         if text != uiView.text {
             uiView.text = text
         }
-        if placeholder != uiView.attributedPlaceholder?.string {
-            uiView.attributedPlaceholder = NSAttributedString(string: placeholder, attributes: [
-                .foregroundColor: UIColor.secondaryLabel,
-            ])
-        }
         
         context.coordinator.text = $text
         context.coordinator.maxLength = maxLength
         context.coordinator.focusNextView = focusNextView
         
-        #if !os(visionOS)
         uiView.backgroundColor = colorScheme == .dark ? UIColor(controller.config.fillColor) : .secondarySystemBackground
-        #endif
         
         if becomeFirstResponder?.wrappedValue == true {
             DispatchQueue.main.async {
@@ -130,10 +123,6 @@ struct EmojiTextField: UIViewRepresentable {
         
         var toolbarElements: [ToolbarElement] { [.emojiPicker] }
         
-        var textInputMode: UITextInputMode? {
-            textField?.textInputMode
-        }
-        
         func applyFormat(_ format: StatusFormat) {
         }
         

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

@@ -10,12 +10,15 @@ import Pachyderm
 import InstanceFeatures
 
 struct HeaderView: View {
-    let currentAccount: (any AccountProtocol)?
+    @EnvironmentObject private var controller: ComposeController
-    let charsRemaining: Int
+    @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: currentAccount)
+            CurrentAccountView(account: controller.currentAccount)
                 .accessibilitySortPriority(1)
             
             Spacer()

Packages/ComposeUI/Sources/ComposeUI/Views/LanguagePicker.swift

@@ -1,221 +0,0 @@
-//
-//  LanguagePicker.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 5/4/23.
-//
-
-import SwiftUI
-
-@available(iOS 16.0, *)
-struct LanguagePicker: View {
-    @Binding var draftLanguage: String?
-    @Binding var hasChangedSelection: Bool
-    @State private var isShowingSheet = false
-    
-    private var codeFromDraft: Locale.LanguageCode? {
-        draftLanguage.map(Locale.LanguageCode.init(_:))
-    }
-    
-    private var codeFromActiveInputMode: Locale.LanguageCode? {
-        UITextInputMode.activeInputModes.first.flatMap(Self.codeFromInputMode(_:))
-    }
-    
-    static func codeFromInputMode(_ mode: UITextInputMode) -> Locale.LanguageCode? {
-        guard let bcp47Lang = mode.primaryLanguage,
-              !bcp47Lang.isEmpty else {
-            return nil
-        }
-        var maybeIso639Code = bcp47Lang[..<bcp47Lang.index(bcp47Lang.startIndex, offsetBy: min(3, bcp47Lang.count))]
-        if maybeIso639Code.last == "-" {
-            maybeIso639Code = maybeIso639Code[..<maybeIso639Code.index(before: maybeIso639Code.endIndex)]
-        }
-        let identifier = String(maybeIso639Code)
-        // mul (for multiple languages) and unk (unknown) are ISO codes, but not ones that akkoma permits, so we ignore them on all platforms
-        guard identifier != "mul",
-              identifier != "und" else {
-            return nil
-        }
-        let code = Locale.LanguageCode(identifier)
-        if code.isISOLanguage {
-            return code
-        } else {
-            return nil
-        }
-    }
-    
-    private var codeFromPreferredLanguages: Locale.LanguageCode? {
-        if let identifier = Locale.preferredLanguages.first,
-           case let code = Locale.LanguageCode(identifier),
-           code.isISOLanguage {
-            return code
-        } else {
-            return nil
-        }
-    }
-    
-    private var languageCode: Binding<Locale.LanguageCode> {
-        Binding {
-            return codeFromDraft ?? codeFromActiveInputMode ?? codeFromPreferredLanguages ?? .english
-        } set: { newValue in
-            draftLanguage = newValue.identifier
-        }
-    }
-    
-    var body: some View {
-        Button {
-            isShowingSheet = true
-        } label: {
-            Text((languageCode.wrappedValue.identifier(.alpha2) ?? languageCode.wrappedValue.identifier).uppercased())
-        }
-        .accessibilityLabel("Post Language")
-        .padding(5)
-        .hoverEffect()
-        .sheet(isPresented: $isShowingSheet) {
-            NavigationStack {
-                LanguagePickerList(languageCode: languageCode, hasChangedSelection: $hasChangedSelection, isPresented: $isShowingSheet)
-            }
-            .presentationDetents([.large, .medium])
-        }
-    }
-}
-
-@available(iOS 16.0, *)
-private struct LanguagePickerList: View {
-    @Binding var languageCode: Locale.LanguageCode
-    @Binding var hasChangedSelection: Bool
-    @Binding var isPresented: Bool
-    @Environment(\.composeUIConfig.groupedBackgroundColor) private var groupedBackgroundColor
-    @Environment(\.composeUIConfig.groupedCellBackgroundColor) private var groupedCellBackgroundColor
-    @State private var recentLangs: [Lang] = []
-    @State private var langs: [Lang] = []
-    @State private var filteredLangs: [Lang]?
-    @State private var query = ""
-    
-    private var defaults: UserDefaults {
-        UserDefaults(suiteName: "group.space.vaccor.Tusker") ?? .standard
-    }
-    
-    private var recentIdentifiers: [String] {
-        get {
-            defaults.object(forKey: "LanguagePickerRecents") as? [String] ?? []
-        }
-        nonmutating set {
-            defaults.set(newValue, forKey: "LanguagePickerRecents")
-        }
-    }
-    
-    var body: some View {
-        List {
-            Section {
-                ForEach(recentLangs) { lang in
-                    button(for: lang)
-                }
-                .listRowBackground(groupedCellBackgroundColor)
-            } header: {
-                Text("Recently Used")
-            }
-            
-            Section {
-                ForEach(filteredLangs ?? langs) { lang in
-                    button(for: lang)
-                }
-                .listRowBackground(groupedCellBackgroundColor)
-            } header: {
-                Text("All Languages")
-            }
-        }
-        .listStyle(.insetGrouped)
-        .scrollContentBackground(.hidden)
-        .background(groupedBackgroundColor.edgesIgnoringSafeArea(.all))
-        .searchable(text: $query)
-        #if !os(visionOS)
-        .scrollDismissesKeyboard(.interactively)
-        #endif
-        .navigationTitle("Post Language")
-        .navigationBarTitleDisplayMode(.inline)
-        .toolbar {
-            ToolbarItem(placement: .confirmationAction) {
-                Button("Done") {
-                    isPresented = false
-                }
-            }
-        }
-        .onAppear {
-            // make sure recents always contains the currently selected lang
-            let recents = addRecentLang(languageCode)
-            recentLangs = recents
-                .filter { $0 != "mul" && $0 != "und" }
-                .map { Lang(code: .init($0)) }
-                .sorted { $0.name < $1.name }
-            
-            langs = Locale.LanguageCode.isoLanguageCodes
-                .filter { $0.identifier != "mul" && $0.identifier != "und" }
-                .map { Lang(code: $0) }
-                .sorted { $0.name < $1.name }
-        }
-        #if os(visionOS)
-        .onChange(of: query, initial: true) {
-            filteredLangsChanged(query: query)
-        }
-        #else
-        .onChange(of: query) { newValue in
-            filteredLangsChanged(query: newValue)
-        }
-        #endif
-    }
-    
-    private func filteredLangsChanged(query: String) {
-        if query.isEmpty {
-            filteredLangs = nil
-        } else {
-            filteredLangs = langs.filter {
-                $0.name.localizedCaseInsensitiveContains(query) || $0.code.identifier.localizedCaseInsensitiveContains(query)
-            }
-        }
-    }
-    
-    @discardableResult
-    private func addRecentLang(_ code: Locale.LanguageCode) -> [String] {
-        var recents = recentIdentifiers
-        if !recents.contains(languageCode.identifier) {
-            recents.insert(languageCode.identifier, at: 0)
-            if recents.count > 5 {
-                recents = Array(recents[..<5])
-            }
-            recentIdentifiers = recents
-        }
-        return recents
-    }
-    
-    private func button(for lang: Lang) -> some View {
-        Button {
-            languageCode = lang.code
-            hasChangedSelection = true
-            isPresented = false
-            addRecentLang(lang.code)
-        } label: {
-            HStack {
-                Text(lang.name)
-                Spacer()
-                if lang.code == languageCode {
-                    Image(systemName: "checkmark")
-                }
-            }
-        }
-    }
-    
-    struct Lang: Identifiable {
-        let code: Locale.LanguageCode
-        let name: String
-        
-        var id: String {
-            code.identifier
-        }
-        
-        init(code: Locale.LanguageCode) {
-            self.code = code
-            self.name = Locale.current.localizedString(forLanguageCode: code.identifier) ?? code.identifier
-        }
-    }
-}

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

@@ -15,7 +15,6 @@ struct MainTextView: View {
     
     @State private var hasFirstAppeared = false
     @State private var height: CGFloat?
-    @State private var updateSelection: ((UITextView) -> Void)?
     private let minHeight: CGFloat = 150
     private var effectiveHeight: CGFloat { height ?? minHeight }
     
@@ -23,41 +22,19 @@ struct MainTextView: View {
         controller.config
     }
     
-    private var placeholderOffset: CGSize {
-        #if os(visionOS)
-        CGSize(width: 8, height: 8)
-        #else
-        CGSize(width: 4, height: 8)
-        #endif
-    }
-    
-    private var textViewBackgroundColor: UIColor? {
-        #if os(visionOS)
-        nil
-        #else
-        colorScheme == .dark ? UIColor(config.fillColor) : .secondarySystemBackground
-        #endif
-    }
-    
     var body: some View {
         ZStack(alignment: .topLeading) {
-            MainWrappedTextViewRepresentable(
+            colorScheme == .dark ? config.fillColor : Color(uiColor: .secondarySystemBackground)
-                text: $draft.text,
-                backgroundColor: textViewBackgroundColor,
-                becomeFirstResponder: $controller.mainComposeTextViewBecomeFirstResponder,
-                updateSelection: $updateSelection,
-                textDidChange: textDidChange
-            )
             
             if draft.text.isEmpty {
                 ControllerView(controller: { PlaceholderController() })
                     .font(.system(size: fontSize))
                     .foregroundColor(.secondary)
-                    .offset(placeholderOffset)
+                    .offset(x: 4, y: 8)
                     .accessibilityHidden(true)
-                    .allowsHitTesting(false)
             }
             
+            MainWrappedTextViewRepresentable(text: $draft.text, becomeFirstResponder: $controller.mainComposeTextViewBecomeFirstResponder, textDidChange: textDidChange)
         }
         .frame(height: effectiveHeight)
         .onAppear(perform: becomeFirstResponderOnFirstAppearance)
@@ -67,11 +44,6 @@ struct MainTextView: View {
         if !hasFirstAppeared {
             hasFirstAppeared = true
             controller.mainComposeTextViewBecomeFirstResponder = true
-            if config.textSelectionStartsAtBeginning {
-                updateSelection = { textView in
-                    textView.selectedTextRange = textView.textRange(from: textView.beginningOfDocument, to: textView.beginningOfDocument)
-                }
-            }
         }
     }
     
@@ -84,9 +56,7 @@ fileprivate struct MainWrappedTextViewRepresentable: UIViewRepresentable {
     typealias UIViewType = UITextView
     
     @Binding var text: String
-    let backgroundColor: UIColor?
     @Binding var becomeFirstResponder: Bool
-    @Binding var updateSelection: ((UITextView) -> Void)?
     let textDidChange: (UITextView) -> Void
     
     @EnvironmentObject private var controller: ComposeController
@@ -97,16 +67,10 @@ fileprivate struct MainWrappedTextViewRepresentable: UIViewRepresentable {
         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
-        
-        #if os(visionOS)
-        textView.borderStyle = .roundedRect
-        // yes, the X inset is 4 less than the placeholder offset
-        textView.textContainerInset = UIEdgeInsets(top: 8, left: 4, bottom: 8, right: 4)
-        #endif
-        
         return textView
     }
     
@@ -119,15 +83,8 @@ fileprivate struct MainWrappedTextViewRepresentable: UIViewRepresentable {
         uiView.isEditable = isEnabled
         uiView.keyboardType = controller.config.useTwitterKeyboard ? .twitter : .default
         
-        uiView.backgroundColor = backgroundColor
-        
         context.coordinator.text = $text
         
-        if let updateSelection {
-            updateSelection(uiView)
-            self.updateSelection = nil
-        }
-        
         // 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 {
@@ -259,7 +216,11 @@ fileprivate struct MainWrappedTextViewRepresentable: UIViewRepresentable {
                 if range.length > 0 {
                     let formatMenu = suggestedActions[index] as! UIMenu
                     let newFormatMenu = formatMenu.replacingChildren(StatusFormat.allCases.map { fmt in
-                        return UIAction(title: fmt.accessibilityLabel, image: UIImage(systemName: fmt.imageName)) { [weak self] _ 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)
                         }
                     })
@@ -283,10 +244,6 @@ fileprivate struct MainWrappedTextViewRepresentable: UIViewRepresentable {
             [.emojiPicker, .formattingButtons]
         }
         
-        var textInputMode: UITextInputMode? {
-            textView?.textInputMode
-        }
-        
         func autocomplete(with string: String) {
             textView?.autocomplete(with: string, permittedModes: .all, autocompleteState: &autocompleteState)
         }

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

@@ -9,15 +9,19 @@ import SwiftUI
 
 struct PollOptionView: View {
     @EnvironmentObject private var controller: PollController
-    @EnvironmentObject private var poll: Poll
+    @EnvironmentObject private var poll: Draft.Poll
-    @ObservedObject private var option: PollOption
+    @ObservedObject private var option: Draft.Poll.Option
     let remove: () -> Void
     
-    init(option: PollOption, remove: @escaping () -> 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)
@@ -37,8 +41,7 @@ struct PollOptionView: View {
     }
     
     private var textField: some View {
-        let index = poll.options.index(of: option)
+        let placeholder = "Option \(optionIndex + 1)"
-        let placeholder = index != NSNotFound ? "Option \(index + 1)" : ""
         let maxLength = controller.parent.mastodonController.instanceFeatures.maxPollOptionChars
         return EmojiTextField(text: $option.text, placeholder: placeholder, maxLength: maxLength)
     }

Packages/ComposeUI/Sources/ComposeUI/Views/ZoomableScrollView.swift

@@ -1,111 +0,0 @@
-//
-//  ZoomableScrollView.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 4/29/23.
-//
-
-import SwiftUI
-
-@available(iOS 16.0, *)
-struct ZoomableScrollView<Content: View>: UIViewControllerRepresentable {
-    let content: Content
-    
-    init(@ViewBuilder content: () -> Content) {
-        self.content = content()
-    }
-    
-    func makeUIViewController(context: Context) -> Controller {
-        return Controller(content: content)
-    }
-
-    func updateUIViewController(_ uiViewController: Controller, context: Context) {
-        uiViewController.host.rootView = content
-    }
-    
-    class Controller: UIViewController, UIScrollViewDelegate {
-        let scrollView = UIScrollView()
-        let host: UIHostingController<Content>
-        
-        private var lastIntrinsicSize: CGSize?
-        private var contentViewTopConstraint: NSLayoutConstraint!
-        private var contentViewLeadingConstraint: NSLayoutConstraint!
-        private var hostBoundsObservation: NSKeyValueObservation?
-        
-        init(content: Content) {
-            self.host = UIHostingController(rootView: content)
-            
-            super.init(nibName: nil, bundle: nil)
-        }
-        
-        required init?(coder: NSCoder) {
-            fatalError("init(coder:) has not been implemented")
-        }
-        
-        override func viewDidLoad() {
-            super.viewDidLoad()
-            
-            scrollView.delegate = self
-            scrollView.bouncesZoom = true
-            scrollView.translatesAutoresizingMaskIntoConstraints = false
-            view.addSubview(scrollView)
-            
-            host.sizingOptions = .intrinsicContentSize
-            host.view.backgroundColor = .clear
-            host.view.translatesAutoresizingMaskIntoConstraints = false
-            addChild(host)
-            scrollView.addSubview(host.view)
-            host.didMove(toParent: self)
-            
-            contentViewLeadingConstraint = host.view.leadingAnchor.constraint(equalTo: scrollView.contentLayoutGuide.leadingAnchor)
-            contentViewTopConstraint = host.view.topAnchor.constraint(equalTo: scrollView.contentLayoutGuide.topAnchor)
-            
-            NSLayoutConstraint.activate([
-                scrollView.frameLayoutGuide.leadingAnchor.constraint(equalTo: view.leadingAnchor),
-                scrollView.frameLayoutGuide.trailingAnchor.constraint(equalTo: view.trailingAnchor),
-                scrollView.frameLayoutGuide.topAnchor.constraint(equalTo: view.topAnchor),
-                scrollView.frameLayoutGuide.bottomAnchor.constraint(equalTo: view.bottomAnchor),
-                
-                contentViewLeadingConstraint,
-                contentViewTopConstraint,
-            ])
-        }
-        
-        override func viewDidLayoutSubviews() {
-            super.viewDidLayoutSubviews()
-            
-            if !host.view.intrinsicContentSize.equalTo(.zero),
-               host.view.intrinsicContentSize != lastIntrinsicSize {
-                self.lastIntrinsicSize = host.view.intrinsicContentSize
-                
-                let maxHeight = view.bounds.height - view.safeAreaInsets.top - view.safeAreaInsets.bottom
-                let maxWidth = view.bounds.width - view.safeAreaInsets.left - view.safeAreaInsets.right
-                let heightScale = maxHeight / host.view.intrinsicContentSize.height
-                let widthScale = maxWidth / host.view.intrinsicContentSize.width
-                let minScale = min(widthScale, heightScale)
-                let maxScale = minScale >= 1 ? minScale + 2 : 2
-                scrollView.minimumZoomScale = minScale
-                scrollView.maximumZoomScale = maxScale
-                scrollView.zoomScale = minScale
-            }
-            
-            centerImage()
-        }
-        
-        func viewForZooming(in scrollView: UIScrollView) -> UIView? {
-            return host.view
-        }
-        
-        func scrollViewDidZoom(_ scrollView: UIScrollView) {
-            centerImage()
-        }
-        
-        func centerImage() {
-            let yOffset = max(0, (view.bounds.size.height - host.view.bounds.height * scrollView.zoomScale) / 2)
-            contentViewTopConstraint.constant = yOffset
-
-            let xOffset = max(0, (view.bounds.size.width - host.view.bounds.width * scrollView.zoomScale) / 2)
-            contentViewLeadingConstraint.constant = xOffset
-        }
-    }
-}

Packages/Duckable/Sources/Duckable/API.swift

@@ -7,9 +7,8 @@
 
 import UIKit
 
-@MainActor
 public protocol DuckableViewController: UIViewController {
-    func duckableViewControllerShouldDuck() -> DuckAttemptAction
+    var duckableDelegate: DuckableViewControllerDelegate? { get set }
     
     func duckableViewControllerMayAttemptToDuck()
     
@@ -19,16 +18,13 @@ public protocol DuckableViewController: UIViewController {
 }
 
 extension DuckableViewController {
-    public func duckableViewControllerShouldDuck() -> DuckAttemptAction { .duck }
     public func duckableViewControllerMayAttemptToDuck() {}
     public func duckableViewControllerWillAnimateDuck(withDuration duration: CGFloat, afterDelay delay: CGFloat) {}
     public func duckableViewControllerDidFinishAnimatingDuck() {}
 }
 
-public enum DuckAttemptAction {
+public protocol DuckableViewControllerDelegate: AnyObject {
-    case duck
+    func duckableViewControllerWillDismiss(animated: Bool)
-    case dismiss
-    case block
 }
 
 extension UIViewController {

Packages/Duckable/Sources/Duckable/DuckAnimationController.swift

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

Packages/Duckable/Sources/Duckable/DuckableContainerViewController.swift

@@ -11,7 +11,7 @@ let duckedCornerRadius: CGFloat = 10
 let detentHeight: CGFloat = 44
 
 @available(iOS 16.0, *)
-public class DuckableContainerViewController: UIViewController {
+public class DuckableContainerViewController: UIViewController, DuckableViewControllerDelegate {
     
     public let child: UIViewController
     private var bottomConstraint: NSLayoutConstraint!
@@ -62,9 +62,7 @@ public class DuckableContainerViewController: UIViewController {
         guard case .idle = state else {
             if animated,
                case .ducked(_, placeholder: let placeholder) = state {
-                #if !os(visionOS)
                 UIImpactFeedbackGenerator(style: .light).impactOccurred()
-                #endif
                 let origConstant = placeholder.topConstraint.constant
                 UIView.animateKeyframes(withDuration: 0.4, delay: 0) {
                     UIView.addKeyframe(withRelativeStartTime: 0, relativeDuration: 0.5) {
@@ -89,18 +87,17 @@ public class DuckableContainerViewController: UIViewController {
     }
     
     private func doPresentDuckable(_ viewController: DuckableViewController, animated: Bool, completion: (() -> Void)?) {
-        viewController.modalPresentationStyle = .custom
+        viewController.duckableDelegate = self
-        viewController.transitioningDelegate = self
+        let nav = UINavigationController(rootViewController: viewController)
-        present(viewController, animated: animated) {
+        nav.modalPresentationStyle = .custom
+        nav.transitioningDelegate = self
+        present(nav, animated: animated) {
             self.configureChildForDuckedPlaceholder()
             completion?()
         }
     }
     
-    func dismissalTransitionWillBegin() {
+    public func duckableViewControllerWillDismiss(animated: Bool) {
-        guard case .presentingDucked(_, _) = state else {
-            return
-        }
         state = .idle
         bottomConstraint.isActive = false
         bottomConstraint = child.view.bottomAnchor.constraint(equalTo: view.bottomAnchor)
@@ -139,18 +136,10 @@ public class DuckableContainerViewController: UIViewController {
         guard case .presentingDucked(let viewController, isFirstPresentation: _) = state else {
             return
         }
-        switch viewController.duckableViewControllerShouldDuck() {
-        case .duck:
         let placeholder = createPlaceholderForDuckedViewController(viewController)
         state = .ducked(viewController, placeholder: placeholder)
         configureChildForDuckedPlaceholder()
         dismiss(animated: true)
-        case .block:
-            viewController.sheetPresentationController!.selectedDetentIdentifier = .large
-        case .dismiss:
-//            duckableViewControllerWillDismiss()
-            dismiss(animated: true)
-        }
     }
     
     private func configureChildForDuckedPlaceholder() {
@@ -159,7 +148,6 @@ public class DuckableContainerViewController: UIViewController {
         bottomConstraint.isActive = true
         
         child.view.layer.cornerRadius = duckedCornerRadius
-        child.view.layer.cornerCurve = .continuous
         child.view.layer.maskedCorners = [.layerMinXMaxYCorner, .layerMaxXMaxYCorner]
         child.view.layer.masksToBounds = true
     }
@@ -193,7 +181,7 @@ public class DuckableContainerViewController: UIViewController {
 @available(iOS 16.0, *)
 extension DuckableContainerViewController: UIViewControllerTransitioningDelegate {
     public func presentationController(forPresented presented: UIViewController, presenting: UIViewController?, source: UIViewController) -> UIPresentationController? {
-        let controller = DuckableSheetPresentationController(presentedViewController: presented, presenting: presenting)
+        let controller = UISheetPresentationController(presentedViewController: presented, presenting: presenting)
         controller.delegate = self
         controller.prefersGrabberVisible = true
         controller.selectedDetentIdentifier = .large
@@ -219,14 +207,6 @@ extension DuckableContainerViewController: UIViewControllerTransitioningDelegate
     }
 }
 
-@available(iOS 16.0, *)
-class DuckableSheetPresentationController: UISheetPresentationController {
-    override func dismissalTransitionWillBegin() {
-        super.dismissalTransitionWillBegin()
-        (self.delegate as! DuckableContainerViewController).dismissalTransitionWillBegin()
-    }
-}
-
 @available(iOS 16.0, *)
 extension DuckableContainerViewController: UISheetPresentationControllerDelegate {
     public func presentationController(_ presentationController: UIPresentationController, willPresentWithAdaptiveStyle style: UIModalPresentationStyle, transitionCoordinator: UIViewControllerTransitionCoordinator?) {
@@ -256,3 +236,4 @@ extension DuckableContainerViewController: UISheetPresentationControllerDelegate
         }
     }
 }
+

Packages/GalleryVC/.gitignore

@@ -1,8 +0,0 @@
-.DS_Store
-/.build
-/Packages
-xcuserdata/
-DerivedData/
-.swiftpm/configuration/registries.json
-.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
-.netrc

Packages/GalleryVC/Package.swift

@@ -1,26 +0,0 @@
-// swift-tools-version: 5.10
-// The swift-tools-version declares the minimum version of Swift required to build this package.
-
-import PackageDescription
-
-let package = Package(
-    name: "GalleryVC",
-    platforms: [
-        .iOS(.v15),
-    ],
-    products: [
-        // Products define the executables and libraries a package produces, making them visible to other packages.
-        .library(
-            name: "GalleryVC",
-            targets: ["GalleryVC"]),
-    ],
-    targets: [
-        // Targets are the basic building blocks of a package, defining a module or a test suite.
-        // Targets can depend on other targets in this package and products from dependencies.
-        .target(
-            name: "GalleryVC"),
-        .testTarget(
-            name: "GalleryVCTests",
-            dependencies: ["GalleryVC"]),
-    ]
-)

Packages/GalleryVC/Sources/GalleryVC/GalleryContentViewController.swift

@@ -1,46 +0,0 @@
-//
-//  GalleryContentViewController.swift
-//  GalleryVC
-//
-//  Created by Shadowfacts on 3/17/24.
-//
-
-import UIKit
-
-@MainActor
-public protocol GalleryContentViewController: UIViewController {
-    var container: GalleryContentViewControllerContainer? { get set }
-    var contentSize: CGSize { get }
-    var activityItemsForSharing: [Any] { get }
-    var caption: String? { get }
-    var contentOverlayAccessoryViewController: UIViewController? { get }
-    var bottomControlsAccessoryViewController: UIViewController? { get }
-    var canAnimateFromSourceView: Bool { get }
-    
-    func setControlsVisible(_ visible: Bool, animated: Bool)
-    func galleryContentDidAppear()
-    func galleryContentWillDisappear()
-}
-
-public extension GalleryContentViewController {
-    var contentOverlayAccessoryViewController: UIViewController? {
-        nil
-    }
-
-    var bottomControlsAccessoryViewController: UIViewController? {
-        nil
-    }
-    
-    var canAnimateFromSourceView: Bool {
-        true
-    }
-    
-    func setControlsVisible(_ visible: Bool, animated: Bool) {
-    }
-    
-    func galleryContentDidAppear() {
-    }
-    
-    func galleryContentWillDisappear() {
-    }
-}

Packages/GalleryVC/Sources/GalleryVC/GalleryContentViewControllerContainer.swift

@@ -1,18 +0,0 @@
-//
-//  GalleryContentViewControllerContainer.swift
-//  GalleryVC
-//
-//  Created by Shadowfacts on 12/28/23.
-//
-
-import Foundation
-
-@MainActor
-public protocol GalleryContentViewControllerContainer: AnyObject {
-    var galleryControlsVisible: Bool { get }
-    
-    func setGalleryContentLoading(_ loading: Bool)
-    func galleryContentChanged()
-    func disableGalleryScrollAndZoom()
-    func setGalleryControlsVisible(_ visible: Bool, animated: Bool)
-}

Packages/GalleryVC/Sources/GalleryVC/GalleryDataSource.swift

@@ -1,22 +0,0 @@
-//
-//  GalleryDataSource.swift
-//  GalleryVC
-//
-//  Created by Shadowfacts on 12/28/23.
-//
-
-import UIKit
-
-@MainActor
-public protocol GalleryDataSource {
-    func galleryItemsCount() -> Int
-    func galleryContentViewController(forItemAt index: Int) -> GalleryContentViewController
-    func galleryContentTransitionSourceView(forItemAt index: Int) -> UIView?
-    func galleryApplicationActivities(forItemAt index: Int) -> [UIActivity]?
-}
-
-public extension GalleryDataSource {
-    func galleryApplicationActivities(forItemAt index: Int) -> [UIActivity]? {
-        nil
-    }
-}

Packages/GalleryVC/Sources/GalleryVC/GalleryDismissAnimationController.swift

@@ -1,140 +0,0 @@
-//
-//  GalleryDismissAnimationController.swift
-//  GalleryVC
-//
-//  Created by Shadowfacts on 3/1/24.
-//
-
-import UIKit
-
-class GalleryDismissAnimationController: NSObject, UIViewControllerAnimatedTransitioning {
-    private let sourceView: UIView
-    private let interactiveTranslation: CGPoint?
-    private let interactiveVelocity: CGPoint?
-    
-    init(sourceView: UIView, interactiveTranslation: CGPoint?, interactiveVelocity: CGPoint?) {
-        self.sourceView = sourceView
-        self.interactiveTranslation = interactiveTranslation
-        self.interactiveVelocity = interactiveVelocity
-    }
-    
-    func transitionDuration(using transitionContext: (any UIViewControllerContextTransitioning)?) -> TimeInterval {
-        return 0.3
-    }
-    
-    func animateTransition(using transitionContext: any UIViewControllerContextTransitioning) {
-        guard let to = transitionContext.viewController(forKey: .to),
-              let from = transitionContext.viewController(forKey: .from) as? GalleryViewController else {
-            fatalError()
-        }
-        
-        let itemViewController = from.currentItemViewController
-        
-        if !itemViewController.content.canAnimateFromSourceView || (UIAccessibility.prefersCrossFadeTransitions && interactiveVelocity == nil) {
-            animateCrossFadeTransition(using: transitionContext)
-            return
-        }
-        
-        let container = transitionContext.containerView
-        let sourceFrameInContainer = container.convert(sourceView.bounds, from: sourceView)
-        let destFrameInContainer = container.convert(itemViewController.content.view.bounds, from: itemViewController.content.view)
-        
-        let origSourceTransform = sourceView.transform
-        let appliedSourceToDestTransform: Bool
-        if destFrameInContainer.width > 0 && destFrameInContainer.height > 0 {
-            appliedSourceToDestTransform = true
-            let scale = min(destFrameInContainer.width / sourceFrameInContainer.width, destFrameInContainer.height / sourceFrameInContainer.height)
-            let sourceToDestTransform = origSourceTransform
-                .translatedBy(x: destFrameInContainer.midX - sourceFrameInContainer.midX, y: destFrameInContainer.midY - sourceFrameInContainer.midY)
-                .scaledBy(x: scale, y: scale)
-            sourceView.transform = sourceToDestTransform
-        } else {
-            appliedSourceToDestTransform = false
-        }
-        
-        // Moving `to.view` to the container is necessary when the presenting VC (i.e., `to`)
-        // is in the window's root presentation.
-        // But it breaks when the gallery is presented from a sheet-presented VC--in which case
-        // `to.view` is already in the view hierarchy at this point; and adding it to the
-        // container causees it to be removed when the transition completes.
-        if to.view.superview == nil {
-            to.view.frame = container.bounds
-            container.addSubview(to.view)
-        }
-        
-        from.view.frame = container.bounds
-        container.addSubview(from.view)
-
-        let content = itemViewController.takeContent()
-        content.view.translatesAutoresizingMaskIntoConstraints = true
-        content.view.layer.masksToBounds = true
-        container.addSubview(content.view)
-        
-        content.view.frame = destFrameInContainer
-        content.view.layer.opacity = 1
-        
-        container.layoutIfNeeded()
-        
-        let duration = self.transitionDuration(using: transitionContext)
-        var initialVelocity: CGVector
-        if let interactiveVelocity,
-           let interactiveTranslation,
-           // very short/fast flicks don't transfer their velocity, since it makes size change animation look wacky due to the springs initial undershoot
-           sqrt(pow(interactiveTranslation.x, 2) + pow(interactiveTranslation.y, 2)) > 100,
-           sqrt(pow(interactiveVelocity.x, 2) + pow(interactiveVelocity.y, 2)) < 2000 {
-            let xDistance = sourceFrameInContainer.midX - destFrameInContainer.midX
-            let yDistance = sourceFrameInContainer.midY - destFrameInContainer.midY
-            initialVelocity = CGVector(
-                dx: xDistance == 0 ? 0 : interactiveVelocity.x / xDistance,
-                dy: yDistance == 0 ? 0 : interactiveVelocity.y / yDistance
-            )
-        } else {
-            initialVelocity = .zero
-        }
-        initialVelocity.dx = max(-10, min(10, initialVelocity.dx))
-        initialVelocity.dy = max(-10, min(10, initialVelocity.dy))
-        // no bounce for the dismiss animation
-        let spring = UISpringTimingParameters(mass: 1, stiffness: 439, damping: 42, initialVelocity: initialVelocity)
-        let animator = UIViewPropertyAnimator(duration: duration, timingParameters: spring)
-        
-        animator.addAnimations {
-            from.view.layer.opacity = 0
-            
-            if appliedSourceToDestTransform {
-                self.sourceView.transform = origSourceTransform
-            }
-            content.view.frame = sourceFrameInContainer
-            content.view.layer.opacity = 0
-            
-            itemViewController.setControlsVisible(false, animated: false)
-        }
-        
-        animator.addCompletion { _ in
-            transitionContext.completeTransition(true)
-        }
-        
-        animator.startAnimation()
-    }
-    
-    private func animateCrossFadeTransition(using transitionContext: UIViewControllerContextTransitioning) {
-        guard let fromVC = transitionContext.viewController(forKey: .from),
-              let toVC = transitionContext.viewController(forKey: .to) else {
-            return
-        }
-        
-        toVC.view.frame = transitionContext.containerView.bounds
-        fromVC.view.frame = transitionContext.containerView.bounds
-        transitionContext.containerView.addSubview(toVC.view)
-        transitionContext.containerView.addSubview(fromVC.view)
-        
-        let duration = transitionDuration(using: transitionContext)
-        let animator = UIViewPropertyAnimator(duration: duration, curve: .easeInOut)
-        animator.addAnimations {
-            fromVC.view.alpha = 0
-        }
-        animator.addCompletion { _ in
-            transitionContext.completeTransition(!transitionContext.transitionWasCancelled)
-        }
-        animator.startAnimation()
-    }
-}

Packages/GalleryVC/Sources/GalleryVC/GalleryDismissInteraction.swift

@@ -1,83 +0,0 @@
-//
-//  GalleryDismissInteraction.swift
-//  GalleryVC
-//
-//  Created by Shadowfacts on 3/1/24.
-//
-
-import UIKit
-
-@MainActor
-class GalleryDismissInteraction: NSObject {
-    
-    private unowned let viewController: GalleryViewController
-    
-    private var content: GalleryContentViewController?
-    private var origContentFrameInGallery: CGRect?
-    private var origControlsVisible: Bool?
-
-    private(set) var isActive = false
-    private(set) var dismissVelocity: CGPoint?
-    private(set) var dismissTranslation: CGPoint?
-    
-    init(viewController: GalleryViewController) {
-        self.viewController = viewController
-        super.init()
-        let panRecognizer = UIPanGestureRecognizer(target: self, action: #selector(panRecognized))
-        panRecognizer.delegate = self
-        panRecognizer.allowedScrollTypesMask = .continuous
-        viewController.view.addGestureRecognizer(panRecognizer)
-    }
-    
-    @objc private func panRecognized(_ recognizer: UIPanGestureRecognizer) {
-        switch recognizer.state {
-        case .began:
-            isActive = true
-            
-            origContentFrameInGallery = viewController.view.convert(viewController.currentItemViewController.content.view.bounds, from: viewController.currentItemViewController.content.view)
-            content = viewController.currentItemViewController.takeContent()
-            content!.view.translatesAutoresizingMaskIntoConstraints = true
-            content!.view.frame = origContentFrameInGallery!
-            viewController.view.addSubview(content!.view)
-            
-            origControlsVisible = viewController.currentItemViewController.controlsVisible
-            if origControlsVisible! {
-                viewController.currentItemViewController.setControlsVisible(false, animated: true)
-            }
-            
-        case .changed:
-            let translation = recognizer.translation(in: viewController.view)
-            content!.view.frame = origContentFrameInGallery!.offsetBy(dx: translation.x, dy: translation.y)
-            
-        case .ended:
-            let translation = recognizer.translation(in: viewController.view)
-            let velocity = recognizer.velocity(in: viewController.view)
-            
-            dismissVelocity = velocity
-            dismissTranslation = translation
-            viewController.dismiss(animated: true)
-
-            // don't unset this until after dismiss is called, so that the dismiss animation controller can read it
-            isActive = false
-            
-        default:
-            break
-        }
-    }
-    
-}
-
-extension GalleryDismissInteraction: UIGestureRecognizerDelegate {
-    func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
-        let itemVC = viewController.currentItemViewController
-        if viewController.galleryDataSource.galleryContentTransitionSourceView(forItemAt: itemVC.itemIndex) == nil {
-            return false
-        } else if itemVC.scrollView.zoomScale > itemVC.scrollView.minimumZoomScale {
-            return false
-        } else if !itemVC.scrollAndZoomEnabled {
-            return false
-        } else {
-            return true
-        }
-    }
-}

Packages/GalleryVC/Sources/GalleryVC/GalleryItemViewController.swift

@@ -1,566 +0,0 @@
-//
-//  GalleryItemViewController.swift
-//  GalleryVC
-//
-//  Created by Shadowfacts on 12/28/23.
-//
-
-import UIKit
-import AVFoundation
-
-@MainActor
-protocol GalleryItemViewControllerDelegate: AnyObject {
-    func isGalleryBeingPresented() -> Bool
-    func addPresentationAnimationCompletion(_ block: @escaping () -> Void)
-    func galleryItemClose(_ item: GalleryItemViewController)
-    func galleryItemApplicationActivities(_ item: GalleryItemViewController) -> [UIActivity]?
-}
-
-class GalleryItemViewController: UIViewController {
-    private weak var delegate: GalleryItemViewControllerDelegate?
-    
-    let itemIndex: Int
-    let content: GalleryContentViewController
-    private var overlayVC: UIViewController?
-    
-    private var activityIndicator: UIActivityIndicatorView?
-    private(set) var scrollView: UIScrollView!
-    private var topControlsView: UIView!
-    private var shareButton: UIButton!
-    private var shareButtonLeadingConstraint: NSLayoutConstraint!
-    private var shareButtonTopConstraint: NSLayoutConstraint!
-    private var closeButtonTrailingConstraint: NSLayoutConstraint!
-    private var closeButtonTopConstraint: NSLayoutConstraint!
-    private var bottomControlsView: UIStackView!
-    private(set) var captionTextView: UITextView!
-    
-    private var singleTap: UITapGestureRecognizer!
-    private var doubleTap: UITapGestureRecognizer!
-
-    private var contentViewLeadingConstraint: NSLayoutConstraint?
-    private var contentViewTopConstraint: NSLayoutConstraint?
-
-    private(set) var controlsVisible: Bool = true
-    private(set) var scrollAndZoomEnabled = true
-    
-    private var scrollViewSizeForLastZoomScaleUpdate: CGSize?
-    override var prefersHomeIndicatorAutoHidden: Bool {
-        return !controlsVisible
-    }
-    
-    init(delegate: GalleryItemViewControllerDelegate, itemIndex: Int, content: GalleryContentViewController) {
-        self.delegate = delegate
-        self.itemIndex = itemIndex
-        self.content = content
-        
-        super.init(nibName: nil, bundle: nil)
-        
-        content.container = self
-    }
-    
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        
-        scrollView = UIScrollView()
-        scrollView.translatesAutoresizingMaskIntoConstraints = false
-        scrollView.delegate = self
-        
-        view.addSubview(scrollView)
-        
-        addContent()
-        centerContent()
-        
-        overlayVC = content.contentOverlayAccessoryViewController
-        if let overlayVC {
-            overlayVC.view.isHidden = activityIndicator != nil
-            overlayVC.view.translatesAutoresizingMaskIntoConstraints = false
-            view.addSubview(overlayVC.view)
-            NSLayoutConstraint.activate([
-                overlayVC.view.leadingAnchor.constraint(equalTo: content.view.leadingAnchor),
-                overlayVC.view.trailingAnchor.constraint(equalTo: content.view.trailingAnchor),
-                overlayVC.view.topAnchor.constraint(equalTo: content.view.topAnchor),
-                overlayVC.view.bottomAnchor.constraint(equalTo: content.view.bottomAnchor),
-            ])
-        }
-        
-        topControlsView = UIView()
-        topControlsView.translatesAutoresizingMaskIntoConstraints = false
-        view.addSubview(topControlsView)
-        
-        var shareConfig = UIButton.Configuration.gray()
-        shareConfig.cornerStyle = .dynamic
-        shareConfig.background.backgroundColor = .black.withAlphaComponent(0.25)
-        shareConfig.baseForegroundColor = .white
-        shareConfig.image = UIImage(systemName: "square.and.arrow.up")
-        shareConfig.contentInsets = NSDirectionalEdgeInsets(top: 4, leading: 4, bottom: 4, trailing: 4)
-        shareButton = UIButton(configuration: shareConfig)
-        shareButton.addTarget(self, action: #selector(shareButtonPressed), for: .touchUpInside)
-        shareButton.isPointerInteractionEnabled = true
-        shareButton.pointerStyleProvider = { button, effect, shape in
-            return UIPointerStyle(effect: .highlight(effect.preview), shape: .roundedRect(button.frame))
-        }
-        shareButton.preferredBehavioralStyle = .pad
-        shareButton.translatesAutoresizingMaskIntoConstraints = false
-        updateShareButton()
-        topControlsView.addSubview(shareButton)
-        
-        var closeConfig = UIButton.Configuration.gray()
-        closeConfig.cornerStyle = .dynamic
-        closeConfig.background.backgroundColor = .black.withAlphaComponent(0.25)
-        closeConfig.baseForegroundColor = .white
-        closeConfig.image = UIImage(systemName: "xmark")
-        closeConfig.contentInsets = NSDirectionalEdgeInsets(top: 4, leading: 4, bottom: 4, trailing: 4)
-        let closeButton = UIButton(configuration: closeConfig)
-        closeButton.addTarget(self, action: #selector(closeButtonPressed), for: .touchUpInside)
-        closeButton.isPointerInteractionEnabled = true
-        closeButton.pointerStyleProvider = { button, effect, shape in
-            return UIPointerStyle(effect: .highlight(effect.preview), shape: .roundedRect(button.frame))
-        }
-        closeButton.preferredBehavioralStyle = .pad
-        closeButton.translatesAutoresizingMaskIntoConstraints = false
-        topControlsView.addSubview(closeButton)
-        
-        bottomControlsView = UIStackView()
-        bottomControlsView.translatesAutoresizingMaskIntoConstraints = false
-        bottomControlsView.axis = .vertical
-        bottomControlsView.alignment = .fill
-        bottomControlsView.backgroundColor = .black.withAlphaComponent(0.5)
-        view.addSubview(bottomControlsView)
-        
-        if let controlsAccessory = content.bottomControlsAccessoryViewController {
-            addChild(controlsAccessory)
-            bottomControlsView.addArrangedSubview(controlsAccessory.view)
-            controlsAccessory.didMove(toParent: self)
-            
-            // Make sure the controls accessory is within the safe area.
-            let spacer = UIView()
-            bottomControlsView.addArrangedSubview(spacer)
-            let spacerTopConstraint = spacer.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.bottomAnchor)
-            spacerTopConstraint.priority = .init(999)
-            spacerTopConstraint.isActive = true
-        }
-        
-        captionTextView = UITextView()
-        captionTextView.backgroundColor = .clear
-        captionTextView.textColor = .white
-        captionTextView.isEditable = false
-        captionTextView.isSelectable = true
-        captionTextView.font = .preferredFont(forTextStyle: .body)
-        captionTextView.adjustsFontForContentSizeCategory = true
-        captionTextView.alwaysBounceVertical = true
-        updateCaptionTextView()
-        bottomControlsView.addArrangedSubview(captionTextView)
-        
-        #if targetEnvironment(macCatalyst)
-        closeButtonTopConstraint = closeButton.topAnchor.constraint(equalTo: topControlsView.safeAreaLayoutGuide.topAnchor)
-        shareButtonTopConstraint = shareButton.topAnchor.constraint(equalTo: topControlsView.safeAreaLayoutGuide.topAnchor)
-        #else
-        closeButtonTopConstraint = closeButton.topAnchor.constraint(equalTo: topControlsView.topAnchor)
-        shareButtonTopConstraint = shareButton.topAnchor.constraint(equalTo: topControlsView.topAnchor)
-        #endif
-        closeButtonTrailingConstraint = topControlsView.trailingAnchor.constraint(equalTo: closeButton.trailingAnchor)
-        shareButtonLeadingConstraint = shareButton.leadingAnchor.constraint(equalTo: topControlsView.leadingAnchor)
-
-        NSLayoutConstraint.activate([
-            scrollView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
-            scrollView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
-            scrollView.topAnchor.constraint(equalTo: view.topAnchor),
-            scrollView.bottomAnchor.constraint(equalTo: view.bottomAnchor),
-            
-            topControlsView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
-            topControlsView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
-            topControlsView.topAnchor.constraint(equalTo: view.topAnchor),
-
-            shareButtonLeadingConstraint,
-            shareButtonTopConstraint,
-            shareButton.bottomAnchor.constraint(equalTo: topControlsView.bottomAnchor),
-            shareButton.widthAnchor.constraint(equalTo: shareButton.heightAnchor),
-            
-            closeButtonTrailingConstraint,
-            closeButtonTopConstraint,
-            closeButton.bottomAnchor.constraint(equalTo: topControlsView.bottomAnchor),
-            closeButton.widthAnchor.constraint(equalTo: closeButton.heightAnchor),
-
-            bottomControlsView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
-            bottomControlsView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
-            bottomControlsView.bottomAnchor.constraint(equalTo: view.bottomAnchor),
-            
-            captionTextView.heightAnchor.constraint(equalToConstant: 150),
-        ])
-        
-        updateTopControlsInsets()
-        
-        singleTap = UITapGestureRecognizer(target: self, action: #selector(viewPressed))
-        singleTap.delegate = self
-        doubleTap = UITapGestureRecognizer(target: self, action: #selector(viewDoublePressed))
-        doubleTap.delegate = self
-        doubleTap.numberOfTapsRequired = 2
-        // This is needed to prevent a delay between tapping a button on and the action firing on Catalyst and Designed for iPad
-        doubleTap.delaysTouchesEnded = false
-        // this requirement is needed to make sure the double tap is ever recognized
-        singleTap.require(toFail: doubleTap)
-        view.addGestureRecognizer(singleTap)
-        view.addGestureRecognizer(doubleTap)
-    }
-    
-    override func viewSafeAreaInsetsDidChange() {
-        super.viewSafeAreaInsetsDidChange()
-        
-        updateZoomScale(resetZoom: false)
-        // Ensure the transform is correct if the controls are hidden
-        setControlsVisible(controlsVisible, animated: false)
-        
-        updateTopControlsInsets()
-    }
-    
-    override func viewDidLayoutSubviews() {
-        super.viewDidLayoutSubviews()
-        
-        // When the scrollView size changes, make sure the zoom scale is up-to-date since it depends on the scrollView's bounds.
-        // This might also fix an issue on macOS (Designed for iPad) where the content isn't placed correctly. See #446
-        if scrollViewSizeForLastZoomScaleUpdate != scrollView.bounds.size {
-            scrollViewSizeForLastZoomScaleUpdate = scrollView.bounds.size
-            updateZoomScale(resetZoom: true)
-        }
-        centerContent()
-    }
-    
-    override func viewDidAppear(_ animated: Bool) {
-        super.viewDidAppear(animated)
-        
-        if controlsVisible && !captionTextView.isHidden {
-            captionTextView.flashScrollIndicators()
-        }
-    }
-    
-    func takeContent() -> GalleryContentViewController {
-        content.willMove(toParent: nil)
-        content.removeFromParent()
-        content.view.removeFromSuperview()
-        return content
-    }
-    
-    func addContent() {
-        content.loadViewIfNeeded()
-        
-        content.setControlsVisible(controlsVisible, animated: false)
-        
-        content.view.translatesAutoresizingMaskIntoConstraints = false
-        if content.parent != self {
-            addChild(content)
-            content.didMove(toParent: self)
-        }
-        if scrollAndZoomEnabled {
-            scrollView.addSubview(content.view)
-            contentViewLeadingConstraint = content.view.leadingAnchor.constraint(equalTo: scrollView.leadingAnchor)
-            contentViewLeadingConstraint!.isActive = true
-            contentViewTopConstraint = content.view.topAnchor.constraint(equalTo: scrollView.topAnchor)
-            contentViewTopConstraint!.isActive = true
-            updateZoomScale(resetZoom: true)
-        } else {
-            // If the content was previously added, deactivate the old constraints.
-            contentViewLeadingConstraint?.isActive = false
-            contentViewTopConstraint?.isActive = false
-            
-            view.addSubview(content.view)
-            NSLayoutConstraint.activate([
-                content.view.leadingAnchor.constraint(equalTo: view.leadingAnchor),
-                content.view.trailingAnchor.constraint(equalTo: view.trailingAnchor),
-                content.view.topAnchor.constraint(equalTo: view.topAnchor),
-                content.view.bottomAnchor.constraint(equalTo: view.bottomAnchor),
-            ])
-        }
-        
-        if let overlayVC {
-            NSLayoutConstraint.activate([
-                overlayVC.view.leadingAnchor.constraint(equalTo: view.leadingAnchor),
-                overlayVC.view.trailingAnchor.constraint(equalTo: view.trailingAnchor),
-                overlayVC.view.topAnchor.constraint(equalTo: view.topAnchor),
-                overlayVC.view.bottomAnchor.constraint(equalTo: view.bottomAnchor),
-            ])
-        }
-        
-        content.view.layoutIfNeeded()
-    }
-    
-    func setControlsVisible(_ visible: Bool, animated: Bool) {
-        controlsVisible = visible
-        guard let topControlsView,
-              let bottomControlsView else {
-            return
-        }
-        func updateControlsViews() {
-            topControlsView.transform = CGAffineTransform(translationX: 0, y: visible ? 0 : -topControlsView.bounds.height)
-            bottomControlsView.transform = CGAffineTransform(translationX: 0, y: visible ? 0 : bottomControlsView.bounds.height)
-            content.setControlsVisible(visible, animated: animated)
-        }
-        if animated {
-            let animator = UIViewPropertyAnimator(duration: 0.2, timingParameters: UISpringTimingParameters())
-            animator.addAnimations(updateControlsViews)
-            animator.startAnimation()
-        } else {
-            updateControlsViews()
-        }
-        
-        setNeedsUpdateOfHomeIndicatorAutoHidden()
-    }
-    
-    func updateZoomScale(resetZoom: Bool) {
-        scrollView.contentSize = content.contentSize
-        
-        guard scrollAndZoomEnabled else {
-            scrollView.maximumZoomScale = 1
-            scrollView.minimumZoomScale = 1
-            scrollView.zoomScale = 1
-            return
-        }
-        
-        guard content.contentSize.width > 0 && content.contentSize.height > 0 else {
-            return
-        }
-        
-        let heightScale = view.bounds.height / content.contentSize.height
-        let widthScale = view.bounds.width / content.contentSize.width
-        let minScale = min(widthScale, heightScale)
-        let maxScale = minScale >= 1 ? minScale + 2 : 2
-        
-        scrollView.minimumZoomScale = minScale
-        scrollView.maximumZoomScale = maxScale
-        if resetZoom {
-            scrollView.zoomScale = minScale
-        } else {
-            scrollView.zoomScale = max(minScale, min(maxScale, scrollView.zoomScale))
-        }
-        
-        centerContent()
-    }
-    
-    private func centerContent() {
-        guard scrollAndZoomEnabled else {
-            return
-        }
-        
-        // Note: use frame for the content.view, because that's in the coordinate space of the scroll view
-        // which means it's already been scaled by the zoom factor.
-        let yOffset = max(0, (view.bounds.height - content.view.frame.height) / 2)
-        contentViewTopConstraint!.constant = yOffset
-        
-        let xOffset = max(0, (view.bounds.width - content.view.frame.width) / 2)
-        contentViewLeadingConstraint!.constant = xOffset
-    }
-    
-    private func updateShareButton() {
-        shareButton.isEnabled = !content.activityItemsForSharing.isEmpty
-    }
-    
-    private func updateCaptionTextView() {
-        guard let caption = content.caption,
-              !caption.isEmpty else {
-            captionTextView.isHidden = true
-            return
-        }
-        captionTextView.text = caption
-    }
-    
-    private func updateTopControlsInsets() {
-        let notchedDeviceTopInsets: [CGFloat] = [
-            44, // iPhone X, Xs, Xs Max, 11 Pro, 11 Pro Max
-            48, // iPhone XR, 11
-            47, // iPhone 12, 12 Pro, 12 Pro Max, 13, 13 Pro, 13 Pro Max, 14, 14 Plus
-            50, // iPhone 12 mini, 13 mini
-        ]
-        let islandDeviceTopInsets: [CGFloat] = [
-            59, // iPhone 14 Pro, 14 Pro Max, 15 Pro, 15 Pro Max
-        ]
-        if notchedDeviceTopInsets.contains(view.safeAreaInsets.top) {
-            // the notch width is not the same for the iPhones 13,
-            // but what we actually want is the same offset from the edges
-            // since the corner radius didn't change
-            let notchWidth: CGFloat = 210
-            let earWidth = (view.bounds.width - notchWidth) / 2
-            let offset = (earWidth - (shareButton.imageView?.bounds.width ?? 0)) / 2
-            shareButtonLeadingConstraint.constant = offset
-            closeButtonTrailingConstraint.constant = offset
-        } else if islandDeviceTopInsets.contains(view.safeAreaInsets.top) {
-            shareButtonLeadingConstraint.constant = 24
-            shareButtonTopConstraint.constant = 24
-            closeButtonTrailingConstraint.constant = 24
-            closeButtonTopConstraint.constant = 24
-        } else {
-            shareButtonLeadingConstraint.constant = 8
-            shareButtonTopConstraint.constant = 8
-            closeButtonTrailingConstraint.constant = 8
-            closeButtonTopConstraint.constant = 8
-        }
-    }
-    
-    private func zoomRectFor(scale: CGFloat, center: CGPoint) -> CGRect {
-        var zoomRect = CGRect.zero
-        zoomRect.size.width = content.view.frame.width / scale
-        zoomRect.size.height = content.view.frame.height / scale
-        let newCenter = scrollView.convert(center, to: content.view)
-        zoomRect.origin.x = newCenter.x - (zoomRect.width / 2)
-        zoomRect.origin.y = newCenter.y - (zoomRect.height / 2)
-        return zoomRect
-    }
-    
-    private func animateZoomOut() {
-        let animator = UIViewPropertyAnimator(duration: 0.3, timingParameters: UISpringTimingParameters())
-        animator.addAnimations {
-            self.scrollView.zoomScale = self.scrollView.minimumZoomScale
-            self.scrollView.layoutIfNeeded()
-        }
-        animator.startAnimation()
-    }
-
-    // MARK: Interaction
-    
-    @objc private func viewPressed() {
-        if scrollAndZoomEnabled,
-           scrollView.zoomScale > scrollView.minimumZoomScale {
-            animateZoomOut()
-        } else {
-            setControlsVisible(!controlsVisible, animated: true)
-        }
-    }
-    
-    @objc private func viewDoublePressed(_ recognizer: UITapGestureRecognizer) {
-        guard scrollAndZoomEnabled else {
-            return
-        }
-        if scrollView.zoomScale <= scrollView.minimumZoomScale {
-            let point = recognizer.location(in: recognizer.view)
-            let scale = min(
-                max(
-                    scrollView.bounds.width / content.contentSize.width,
-                    scrollView.bounds.height / content.contentSize.height,
-                    scrollView.zoomScale + 0.75
-                ),
-                scrollView.maximumZoomScale
-            )
-            let rect = zoomRectFor(scale: scale, center: point)
-            let animator = UIViewPropertyAnimator(duration: 0.3, timingParameters: UISpringTimingParameters())
-            animator.addAnimations {
-                self.scrollView.zoom(to: rect, animated: false)
-                self.view.layoutIfNeeded()
-            }
-            animator.startAnimation()
-        } else {
-            animateZoomOut()
-        }
-    }
-    
-    @objc private func closeButtonPressed() {
-        delegate?.galleryItemClose(self)
-    }
-    
-    @objc private func shareButtonPressed() {
-        let items = content.activityItemsForSharing
-        guard !items.isEmpty else {
-            return
-        }
-        let activityVC = UIActivityViewController(activityItems: items, applicationActivities: delegate?.galleryItemApplicationActivities(self))
-        activityVC.popoverPresentationController?.sourceView = shareButton
-        present(activityVC, animated: true)
-    }
-    
-}
-
-extension GalleryItemViewController: GalleryContentViewControllerContainer {
-    var galleryControlsVisible: Bool {
-        controlsVisible
-    }
-    
-    func setGalleryContentLoading(_ loading: Bool) {
-        if loading {
-            overlayVC?.view.isHidden = true
-            if activityIndicator == nil {
-                let activityIndicator = UIActivityIndicatorView(style: .large)
-                self.activityIndicator = activityIndicator
-                activityIndicator.startAnimating()
-                activityIndicator.translatesAutoresizingMaskIntoConstraints = false
-                view.addSubview(activityIndicator)
-                NSLayoutConstraint.activate([
-                    activityIndicator.centerXAnchor.constraint(equalTo: view.centerXAnchor),
-                    activityIndicator.centerYAnchor.constraint(equalTo: view.centerYAnchor),
-                ])
-            }
-        } else {
-            if let activityIndicator {
-                // If we're in the middle of the presentation animation,
-                // wait until it finishes to hide the loading indicator.
-                // Since the updated content frame won't affect the animation,
-                // make sure the loading indicator remains visible.
-                if let delegate,
-                   delegate.isGalleryBeingPresented() {
-                    delegate.addPresentationAnimationCompletion { [unowned self] in
-                        self.setGalleryContentLoading(false)
-                    }
-                } else {
-                    activityIndicator.removeFromSuperview()
-                    self.activityIndicator = nil
-                    self.overlayVC?.view.isHidden = false
-                }
-            }
-        }
-    }
-    
-    func galleryContentChanged() {
-        updateZoomScale(resetZoom: true)
-        updateShareButton()
-        updateCaptionTextView()
-    }
-    
-    func disableGalleryScrollAndZoom() {
-        scrollAndZoomEnabled = false
-        updateZoomScale(resetZoom: true)
-        scrollView.isScrollEnabled = false
-        // Make sure the content is re-added with the correct constraints
-        if content.parent == self {
-            addContent()
-        }
-    }
-    
-    func setGalleryControlsVisible(_ visible: Bool, animated: Bool) {
-        setControlsVisible(visible, animated: animated)
-    }
-}
-
-extension GalleryItemViewController: UIScrollViewDelegate {
-    func viewForZooming(in scrollView: UIScrollView) -> UIView? {
-        if scrollAndZoomEnabled {
-            return content.view
-        } else {
-            return nil
-        }
-    }
-    
-    func scrollViewDidZoom(_ scrollView: UIScrollView) {
-        if scrollView.zoomScale <= scrollView.minimumZoomScale {
-            setControlsVisible(true, animated: true)
-        } else {
-            setControlsVisible(false, animated: true)
-        }
-        
-        centerContent()
-        scrollView.layoutIfNeeded()
-    }
-}
-
-extension GalleryItemViewController: UIGestureRecognizerDelegate {
-    func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
-        if gestureRecognizer == singleTap {
-            let loc = gestureRecognizer.location(in: view)
-            return !topControlsView.frame.contains(loc) && !bottomControlsView.frame.contains(loc)
-        } else if gestureRecognizer == doubleTap {
-            let loc = gestureRecognizer.location(in: content.view)
-            return content.view.bounds.contains(loc)
-        } else {
-            return true
-        }
-    }
-}

Packages/GalleryVC/Sources/GalleryVC/GalleryPresentationAnimationController.swift

@@ -1,136 +0,0 @@
-//
-//  GalleryPresentationAnimationController.swift
-//  GalleryVC
-//
-//  Created by Shadowfacts on 12/28/23.
-//
-
-import UIKit
-
-class GalleryPresentationAnimationController: NSObject, UIViewControllerAnimatedTransitioning {
-    private let sourceView: UIView
-    
-    init(sourceView: UIView) {
-        self.sourceView = sourceView
-    }
-    
-    func transitionDuration(using transitionContext: UIViewControllerContextTransitioning?) -> TimeInterval {
-        return 0.4
-    }
-    
-    func animateTransition(using transitionContext: UIViewControllerContextTransitioning) {
-        guard let to = transitionContext.viewController(forKey: .to) as? GalleryViewController else {
-            fatalError()
-        }
-        
-        let itemViewController = to.currentItemViewController
-
-        if !itemViewController.content.canAnimateFromSourceView || UIAccessibility.prefersCrossFadeTransitions {
-            animateCrossFadeTransition(using: transitionContext)
-            return
-        }
-        
-        let container = transitionContext.containerView
-        to.view.frame = container.bounds
-        container.addSubview(to.view)
-        
-        container.layoutIfNeeded()
-        // Make sure the zoom scale is updated before getting the content view frame, since it needs to take into account the correct transform.
-        itemViewController.updateZoomScale(resetZoom: true)
-        
-        let sourceFrameInContainer = container.convert(sourceView.bounds, from: sourceView)
-        let destFrameInContainer = container.convert(itemViewController.content.view.bounds, from: itemViewController.content.view)
-
-        // Use a transformation to make the actual source view appear to move into the destination frame.
-        // Doing this while having the content view fade-in papers over the z-index change when
-        // there was something overlapping the source view.
-        let origSourceTransform = sourceView.transform
-        let sourceToDestTransform: CGAffineTransform?
-        if destFrameInContainer.width > 0 && destFrameInContainer.height > 0 {
-            // Scale evenly in both dimensions, to prevent the source view appearing to stretch/distort during the animation.
-            let scale = min(destFrameInContainer.width / sourceFrameInContainer.width, destFrameInContainer.height / sourceFrameInContainer.height)
-            sourceToDestTransform = origSourceTransform
-                .translatedBy(x: destFrameInContainer.midX - sourceFrameInContainer.midX, y: destFrameInContainer.midY - sourceFrameInContainer.midY)
-                .scaledBy(x: scale, y: scale)
-        } else {
-            sourceToDestTransform = nil
-        }
-        
-        let content = itemViewController.takeContent()
-        content.view.translatesAutoresizingMaskIntoConstraints = true
-        container.insertSubview(content.view, belowSubview: to.view)
-
-        // Use a separate dimming view from to.view, so that the gallery controls can be in front of the moving content.
-        let dimmingView = UIView()
-        dimmingView.backgroundColor = .black
-        dimmingView.frame = container.bounds
-        dimmingView.layer.opacity = 0
-        container.insertSubview(dimmingView, belowSubview: content.view)
-
-        to.view.backgroundColor = nil
-        to.view.layer.opacity = 0
-        content.view.frame = sourceFrameInContainer
-        content.view.layer.opacity = 0
-        
-        container.layoutIfNeeded()
-        
-        // This needs to take place after the layout, so that the transform is correct.
-        itemViewController.setControlsVisible(false, animated: false)
-
-        let duration = self.transitionDuration(using: transitionContext)
-        // rougly equivalent to duration: 0.35, bounce: 0.3
-        let spring = UISpringTimingParameters(mass: 1, stiffness: 322, damping: 25, initialVelocity: .zero)
-        let animator = UIViewPropertyAnimator(duration: duration, timingParameters: spring)
-        
-        animator.addAnimations {
-            dimmingView.layer.opacity = 1
-            
-            to.view.layer.opacity = 1
-            
-            content.view.frame = destFrameInContainer
-            content.view.layer.opacity = 1
-            
-            itemViewController.setControlsVisible(true, animated: false)
-
-            if let sourceToDestTransform {
-                self.sourceView.transform = sourceToDestTransform
-            }
-        }
-        
-        animator.addCompletion { _ in
-            dimmingView.removeFromSuperview()
-            
-            to.view.backgroundColor = .black
-            
-            if sourceToDestTransform != nil {
-                self.sourceView.transform = origSourceTransform
-            }
-            
-            itemViewController.addContent()
-            
-            transitionContext.completeTransition(true)
-        }
-        
-        animator.startAnimation()
-    }
-    
-    private func animateCrossFadeTransition(using transitionContext: UIViewControllerContextTransitioning) {
-        guard let to = transitionContext.viewController(forKey: .to) as? GalleryViewController else {
-            return
-        }
-        
-        to.view.alpha = 0
-        to.view.frame = transitionContext.containerView.bounds
-        transitionContext.containerView.addSubview(to.view)
-        
-        let duration = transitionDuration(using: transitionContext)
-        let animator = UIViewPropertyAnimator(duration: duration, curve: .easeInOut)
-        animator.addAnimations {
-            to.view.alpha = 1
-        }
-        animator.addCompletion { _ in
-            transitionContext.completeTransition(!transitionContext.transitionWasCancelled)
-        }
-        animator.startAnimation()
-    }
-}

Packages/GalleryVC/Sources/GalleryVC/GalleryViewController.swift

@@ -1,179 +0,0 @@
-//
-//  GalleryViewController.swift
-//  GalleryVC
-//
-//  Created by Shadowfacts on 12/28/23.
-//
-
-import UIKit
-
-public class GalleryViewController: UIPageViewController {
-    
-    let galleryDataSource: GalleryDataSource
-    let initialItemIndex: Int
-    private let _itemsCount: Int
-    private var itemsCount: Int {
-        get {
-            precondition(_itemsCount == galleryDataSource.galleryItemsCount(), "GalleryDataSource item count cannot change")
-            return _itemsCount
-        }
-    }
-    
-    var currentItemViewController: GalleryItemViewController {
-        viewControllers![0] as! GalleryItemViewController
-    }
-    
-    private var dismissInteraction: GalleryDismissInteraction!
-    private var presentationAnimationCompletionHandlers: [() -> Void] = []
-    
-    override public var prefersStatusBarHidden: Bool {
-        true
-    }
-    override public var preferredStatusBarUpdateAnimation: UIStatusBarAnimation {
-        .none
-    }
-    override public var childForHomeIndicatorAutoHidden: UIViewController? {
-        currentItemViewController
-    }
-    
-    public init(dataSource: GalleryDataSource, initialItemIndex: Int) {
-        self.galleryDataSource = dataSource
-        self.initialItemIndex = initialItemIndex
-        self._itemsCount = dataSource.galleryItemsCount()
-        precondition(initialItemIndex >= 0 && initialItemIndex < _itemsCount, "initialItemIndex is out of bounds")
-        
-        super.init(transitionStyle: .scroll, navigationOrientation: .horizontal, options: [
-            .interPageSpacing: 50
-        ])
-        
-        modalPresentationStyle = .fullScreen
-        transitioningDelegate = self
-    }
-    
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
-    public override func viewDidLoad() {
-        super.viewDidLoad()
-        
-        dismissInteraction = GalleryDismissInteraction(viewController: self)
-        
-        view.backgroundColor = .black
-        overrideUserInterfaceStyle = .dark
-        
-        dataSource = self
-        delegate = self
-        
-        setViewControllers([makeItemVC(index: initialItemIndex)], direction: .forward, animated: false)
-    }
-    
-    public override func viewDidAppear(_ animated: Bool) {
-        super.viewDidAppear(animated)
-        
-        if animated {
-            // Wait until the transition is no longer in-progress, otherwise things will just get deferred again.
-            DispatchQueue.main.async {
-                self.presentationAnimationCompleted()
-            }
-        }
-    }
-    
-    public override func viewWillDisappear(_ animated: Bool) {
-        super.viewWillDisappear(animated)
-        
-        if isBeingDismissed {
-            currentItemViewController.content.galleryContentWillDisappear()
-        }
-    }
-    
-    private func makeItemVC(index: Int) -> GalleryItemViewController {
-        let content = galleryDataSource.galleryContentViewController(forItemAt: index)
-        return GalleryItemViewController(delegate: self, itemIndex: index, content: content)
-    }
-    
-    func presentationAnimationCompleted() {
-        for block in presentationAnimationCompletionHandlers {
-            block()
-        }
-        currentItemViewController.content.galleryContentDidAppear()
-    }
-}
-
-extension GalleryViewController: UIPageViewControllerDataSource {
-    public func pageViewController(_ pageViewController: UIPageViewController, viewControllerBefore viewController: UIViewController) -> UIViewController? {
-        guard let viewController = viewController as? GalleryItemViewController else {
-            preconditionFailure("VC must be GalleryItemViewController")
-        }
-        guard viewController.itemIndex > 0 else {
-            return nil
-        }
-        return makeItemVC(index: viewController.itemIndex - 1)
-    }
-    
-    public func pageViewController(_ pageViewController: UIPageViewController, viewControllerAfter viewController: UIViewController) -> UIViewController? {
-        guard let viewController = viewController as? GalleryItemViewController else {
-            preconditionFailure("VC must be GalleryItemViewController")
-        }
-        guard viewController.itemIndex < itemsCount - 1 else {
-            return nil
-        }
-        return makeItemVC(index: viewController.itemIndex + 1)
-    }
-}
-
-extension GalleryViewController: UIPageViewControllerDelegate {
-    public func pageViewController(_ pageViewController: UIPageViewController, willTransitionTo pendingViewControllers: [UIViewController]) {
-        currentItemViewController.content.galleryContentWillDisappear()
-    }
-    
-    public func pageViewController(_ pageViewController: UIPageViewController, didFinishAnimating finished: Bool, previousViewControllers: [UIViewController], transitionCompleted completed: Bool) {
-        currentItemViewController.content.galleryContentDidAppear()
-    }
-}
-
-extension GalleryViewController: GalleryItemViewControllerDelegate {
-    func isGalleryBeingPresented() -> Bool {
-        isBeingPresented
-    }
-    
-    func addPresentationAnimationCompletion(_ block: @escaping () -> Void) {
-        presentationAnimationCompletionHandlers.append(block)
-    }
-    
-    func galleryItemClose(_ item: GalleryItemViewController) {
-        dismiss(animated: true)
-    }
-    
-    func galleryItemApplicationActivities(_ item: GalleryItemViewController) -> [UIActivity]? {
-        galleryDataSource.galleryApplicationActivities(forItemAt: item.itemIndex)
-    }
-}
-
-extension GalleryViewController: UIViewControllerTransitioningDelegate {
-    public func animationController(forPresented presented: UIViewController, presenting: UIViewController, source: UIViewController) -> UIViewControllerAnimatedTransitioning? {
-        if let sourceView = galleryDataSource.galleryContentTransitionSourceView(forItemAt: initialItemIndex) {
-            return GalleryPresentationAnimationController(sourceView: sourceView)
-        } else {
-            return nil
-        }
-    }
-    
-    public func animationController(forDismissed dismissed: UIViewController) -> UIViewControllerAnimatedTransitioning? {
-        if let sourceView = galleryDataSource.galleryContentTransitionSourceView(forItemAt: currentItemViewController.itemIndex) {
-            let translation: CGPoint?
-            let velocity: CGPoint?
-            if let dismissInteraction,
-               dismissInteraction.isActive {
-                translation = dismissInteraction.dismissTranslation
-                velocity = dismissInteraction.dismissVelocity
-            } else {
-                translation = nil
-                velocity = nil
-            }
-            return GalleryDismissAnimationController(sourceView: sourceView, interactiveTranslation: translation, interactiveVelocity: velocity)
-        } else {
-            return nil
-        }
-    }
-}

Packages/GalleryVC/Tests/GalleryVCTests/GalleryVCTests.swift

@@ -1,12 +0,0 @@
-import XCTest
-@testable import GalleryVC
-
-final class GalleryVCTests: XCTestCase {
-    func testExample() throws {
-        // XCTest Documentation
-        // https://developer.apple.com/documentation/xctest
-
-        // Defining Test Cases and Test Methods
-        // https://developer.apple.com/documentation/xctest/defining_test_cases_and_test_methods
-    }
-}

Packages/InstanceFeatures/Sources/InstanceFeatures/InstanceFeatures.swift

@@ -10,40 +10,29 @@ import Foundation
 import Combine
 import Pachyderm
 
-public final class InstanceFeatures: ObservableObject {
+public class InstanceFeatures: ObservableObject {
-    private static let pleromaVersionRegex = try! NSRegularExpression(pattern: "\\(compatible; (pleroma|akkoma) (.*)\\)", options: .caseInsensitive)
+    private static let pleromaVersionRegex = try! NSRegularExpression(pattern: "\\(compatible; pleroma (.*)\\)", options: .caseInsensitive)
+    private static let akkomaVersionRegex = try! NSRegularExpression(pattern: "\\(compatible; akkoma (.*)\\)", options: .caseInsensitive)
+    private static let calckeyVersionRegex = try! NSRegularExpression(pattern: "(.*) compatible \\((.*) calckey\\)", options: .caseInsensitive)
     
     private let _featuresUpdated = PassthroughSubject<Void, Never>()
     public var featuresUpdated: some Publisher<Void, Never> { _featuresUpdated }
     
-    @Published @_spi(InstanceType) public private(set) var instanceType: InstanceType = .mastodon(.vanilla, nil)
+    @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?
-    @Published public private(set) var mediaAttachmentsConfiguration: InstanceV1.MediaAttachmentsConfiguration?
-    @Published public private(set) var translation: Bool = false
     
     public var localOnlyPosts: Bool {
         switch instanceType {
         case .mastodon(.hometown(_), _), .mastodon(.glitch, _):
             return true
-        case .pleroma(.akkoma(_)):
-            return true
         default:
             return false
         }
     }
     
-    /// Instance types that use a separate visibility to indicate local-only posts.
-    public var localOnlyPostsVisibility: Bool {
-        if case .pleroma(.akkoma(_)) = instanceType {
-            return true
-        } else {
-            return false
-        }
-    }
-    
     public var mastodonAttachmentRestrictions: Bool {
         instanceType.isMastodon
     }
@@ -84,7 +73,7 @@ public final class InstanceFeatures: ObservableObject {
     
     public var probablySupportsMarkdown: Bool {
         switch instanceType {
-        case .pleroma(_), .mastodon(.glitch, _), .mastodon(.hometown(_), _), .firefish(_):
+        case .pleroma(_), .mastodon(.glitch, _), .mastodon(.hometown(_), _):
             return true
         default:
             return false
@@ -100,7 +89,7 @@ public final class InstanceFeatures: ObservableObject {
     }
     
     public var needsWideColorGamutHack: Bool {
-        if case .mastodon(_, let version) = instanceType {
+        if case .mastodon(_, .some(let version)) = instanceType {
             return version < Version(4, 0, 0)
         } else {
             return true
@@ -108,13 +97,7 @@ public final class InstanceFeatures: ObservableObject {
     }
     
     public var canFollowHashtags: Bool {
-        if case .mastodon(_, let version) = instanceType {
+        hasMastodonVersion(4, 0, 0)
-            return version >= Version(4, 0, 0)
-        } else if case .pleroma(.akkoma(let version)) = instanceType {
-            return version >= Version(3, 4, 0)
-        } else {
-            return false
-        }
     }
     
     public var filtersV2: Bool {
@@ -129,116 +112,13 @@ public final class InstanceFeatures: ObservableObject {
         instanceType.isMastodon
     }
     
-    public var createStatusWithLanguage: Bool {
-        instanceType.isMastodon || instanceType.isPleroma(.akkoma(nil))
-    }
-    
-    public var editStatuses: Bool {
-        switch instanceType {
-        case .mastodon(_, let v) where v >= Version(3, 5, 0):
-            return true
-        case .pleroma(.vanilla(let v)) where v >= Version(2, 5, 0):
-            return true
-        case .pleroma(.akkoma(_)):
-            return true
-        default:
-            return false
-        }
-    }
-    
-    public var statusEditNotifications: Bool {
-        // pleroma doesn't seem to support 'update' type notifications, even though it supports edits
-        hasMastodonVersion(3, 5, 0)
-    }
-    
-    public var statusNotifications: Bool {
-        // pleroma doesn't support notifications for new posts from an account
-        hasMastodonVersion(3, 3, 0)
-    }
-    
-    public var needsEditAttachmentsInSeparateRequest: Bool {
-        instanceType.isPleroma
-    }
-    
-    public var composeDirectStatuses: Bool {
-        if case .pixelfed = instanceType {
-            return false
-        } else {
-            return true
-        }
-    }
-    
-    public var searchOperators: Bool {
-        hasMastodonVersion(4, 2, 0)
-    }
-    
-    public var hasServerPreferences: Bool {
-        hasMastodonVersion(2, 8, 0)
-    }
-    
-    public var listRepliesPolicy: Bool {
-        hasMastodonVersion(3, 3, 0)
-    }
-    
-    public var exclusiveLists: Bool {
-        hasMastodonVersion(4, 2, 0) || instanceType.isMastodon(.hometown(nil))
-    }
-    
-    public var pushNotificationTypeStatus: Bool {
-        hasMastodonVersion(3, 3, 0)
-    }
-    
-    public var pushNotificationTypeFollowRequest: Bool {
-        hasMastodonVersion(3, 1, 0)
-    }
-    
-    public var pushNotificationTypeUpdate: Bool {
-        hasMastodonVersion(3, 5, 0)
-    }
-    
-    public var pushNotificationPolicy: Bool {
-        hasMastodonVersion(3, 5, 0)
-    }
-    
-    public var pushNotificationPolicyMissingFromResponse: Bool {
-        switch instanceType {
-        case .mastodon(_, let version):
-            return version >= Version(3, 5, 0) && version < Version(4, 1, 0)
-        default:
-            return false
-        }
-    }
-    
-    public var instanceAnnouncements: Bool {
-        hasMastodonVersion(3, 1, 0)
-    }
-    
-    public var emojiReactionNotifications: Bool {
-        instanceType.isPleroma
-    }
-    
-    public var muteNotifications: Bool {
-        !instanceType.isPixelfed
-    }
-    
-    public var blockDomains: Bool {
-        !instanceType.isPixelfed
-    }
-    
-    public var hideReblogs: Bool {
-        !instanceType.isPixelfed
-    }
-    
     public init() {
     }
     
-    public func update(instance: InstanceInfo, nodeInfo: NodeInfo?) {
+    public func update(instance: Instance, nodeInfo: NodeInfo?) {
         let ver = instance.version.lowercased()
-        // check glitch first b/c it still reports "mastodon" as the software in nodeinfo
         if ver.contains("glitch") {
             instanceType = .mastodon(.glitch, Version(string: ver))
-        } else if nodeInfo?.software.name == "mastodon" {
-            instanceType = .mastodon(.vanilla, Version(string: ver))
         } else if nodeInfo?.software.name == "hometown" {
             var mastoVersion: Version?
             var hometownVersion: Version?
@@ -260,21 +140,26 @@ public final class InstanceFeatures: ObservableObject {
                 mastoVersion = Version(string: ver)
             }
             instanceType = .mastodon(.hometown(hometownVersion), mastoVersion)
-        } else if let match = InstanceFeatures.pleromaVersionRegex.firstMatch(in: ver, range: NSRange(location: 0, length: ver.utf16.count)) {
+        } else if ver.contains("pleroma") {
             var pleromaVersion: Version?
-            let type = (ver as NSString).substring(with: match.range(at: 1))
+            if let match = InstanceFeatures.pleromaVersionRegex.firstMatch(in: ver, range: NSRange(location: 0, length: ver.utf16.count)) {
-            pleromaVersion = Version(string: (ver as NSString).substring(with: match.range(at: 2)))
+                pleromaVersion = Version(string: (ver as NSString).substring(with: match.range(at: 1)))
-            if type == "akkoma" {
-                instanceType = .pleroma(.akkoma(pleromaVersion))
-            } else {
-                instanceType = .pleroma(.vanilla(pleromaVersion))
             }
+            instanceType = .pleroma(.vanilla(pleromaVersion))
+        } else if ver.contains("akkoma") {
+            var akkomaVersion: Version?
+            if let match = InstanceFeatures.akkomaVersionRegex.firstMatch(in: ver, range: NSRange(location: 0, length: ver.utf16.count)) {
+                akkomaVersion = Version(string: (ver as NSString).substring(with: match.range(at: 1)))
+            }
+            instanceType = .pleroma(.akkoma(akkomaVersion))
         } else if ver.contains("pixelfed") {
             instanceType = .pixelfed
-        } else if nodeInfo?.software.name == "gotosocial" {
+        } else if ver.contains("calckey") {
-            instanceType = .gotosocial
+            var calckeyMastoVersion: Version?
-        } else if ver.contains("firefish") || ver.contains("iceshrimp") || ver.contains("calckey") {
+            if let match = InstanceFeatures.calckeyVersionRegex.firstMatch(in: ver, range: NSRange(location: 0, length: ver.utf16.count)) {
-            instanceType = .firefish(nodeInfo?.software.version)
+                calckeyMastoVersion = Version(string: (ver as NSString).substring(with: match.range(at: 1)))
+            }
+            instanceType = .calckey(mastodonCompatible: calckeyMastoVersion)
         } else {
             instanceType = .mastodon(.vanilla, Version(string: ver))
         }
@@ -285,14 +170,12 @@ public final class InstanceFeatures: ObservableObject {
             maxPollOptionChars = pollsConfig.maxCharactersPerOption
             maxPollOptionsCount = pollsConfig.maxOptions
         }
-        mediaAttachmentsConfiguration = instance.configuration?.mediaAttachments
-        translation = instance.translation
         
         _featuresUpdated.send()
     }
     
     public func hasMastodonVersion(_ major: Int, _ minor: Int, _ patch: Int) -> Bool {
-        if case .mastodon(_, let version) = instanceType {
+        if case .mastodon(_, .some(let version)) = instanceType {
             return version >= Version(major, minor, patch)
         } else {
             return false
@@ -301,7 +184,7 @@ public final class InstanceFeatures: ObservableObject {
     
     func hasPleromaVersion(_ major: Int, _ minor: Int, _ patch: Int) -> Bool {
         switch instanceType {
-        case .pleroma(.vanilla(let version)), .pleroma(.akkoma(let version)):
+        case .pleroma(.vanilla(.some(let version))), .pleroma(.akkoma(.some(let version))):
             return version >= Version(major, minor, patch)
         default:
             return false
@@ -310,12 +193,11 @@ public final class InstanceFeatures: ObservableObject {
 }
 
 extension InstanceFeatures {
-    @_spi(InstanceType) public enum InstanceType {
+    enum InstanceType {
         case mastodon(MastodonType, Version?)
         case pleroma(PleromaType)
         case pixelfed
-        case gotosocial
+        case calckey(mastodonCompatible: Version?)
-        case firefish(String?)
         
         var isMastodon: Bool {
             if case .mastodon(_, _) = self {
@@ -325,15 +207,6 @@ extension InstanceFeatures {
             }
         }
         
-        func isMastodon(_ subtype: MastodonType) -> Bool {
-            if case .mastodon(let t, _) = self,
-               t.equalsIgnoreVersion(subtype) {
-                return true
-            } else {
-                return false
-            }
-        }
-        
         var isPleroma: Bool {
             if case .pleroma(_) = self {
                 return true
@@ -341,55 +214,68 @@ extension InstanceFeatures {
                 return false
             }
         }
-        
-        func isPleroma(_ subtype: PleromaType) -> Bool {
-            if case .pleroma(let t) = self,
-               t.equalsIgnoreVersion(subtype) {
-                return true
-            } else {
-                return false
-            }
     }
     
-        var isPixelfed: Bool {
+    enum MastodonType {
-            if case .pixelfed = self {
-                return true
-            } else {
-                return false
-            }
-        }
-    }
-    
-    @_spi(InstanceType) public enum MastodonType {
         case vanilla
         case hometown(Version?)
         case glitch
-        
-        func equalsIgnoreVersion(_ other: MastodonType) -> Bool {
-            switch (self, other) {
-            case (.vanilla, .vanilla):
-                return true
-            case (.hometown(_), .hometown(_)):
-                return true
-            case (.glitch, .glitch):
-                return true
-            default:
-                return false
-            }
-        }
     }
     
-    @_spi(InstanceType) public enum PleromaType {
+    enum PleromaType {
         case vanilla(Version?)
         case akkoma(Version?)
+    }
+}
 
-        func equalsIgnoreVersion(_ other: PleromaType) -> Bool {
+extension InstanceFeatures {
-            switch (self, other) {
+    struct Version: Equatable, Comparable {
-            case (.vanilla(_), .vanilla(_)):
+        private static let regex = try! NSRegularExpression(pattern: "^(\\d+)\\.(\\d+)\\.(\\d+).*$")
+        
+        let major: Int
+        let minor: Int
+        let patch: Int
+        
+        init(_ major: Int, _ minor: Int, _ patch: Int) {
+            self.major = major
+            self.minor = minor
+            self.patch = patch
+        }
+        
+        init?(string: String) {
+            guard let match = Version.regex.firstMatch(in: string, range: NSRange(location: 0, length: string.utf16.count)),
+                  match.numberOfRanges == 4 else {
+                return nil
+            }
+            let majorStr = (string as NSString).substring(with: match.range(at: 1))
+            let minorStr = (string as NSString).substring(with: match.range(at: 2))
+            let patchStr = (string as NSString).substring(with: match.range(at: 3))
+            guard let major = Int(majorStr),
+                  let minor = Int(minorStr),
+                  let patch = Int(patchStr) else {
+                return nil
+            }
+            self.major = major
+            self.minor = minor
+            self.patch = patch
+        }
+        
+        static func ==(lhs: Version, rhs: Version) -> Bool {
+            return lhs.major == rhs.major && lhs.minor == rhs.minor && lhs.patch == rhs.patch
+        }
+        
+        static func < (lhs: InstanceFeatures.Version, rhs: InstanceFeatures.Version) -> Bool {
+            if lhs.major < rhs.major {
                 return true
-            case (.akkoma(_), .akkoma(_)):
+            } else if lhs.major > rhs.major {
+                return false
+            } else if lhs.minor < rhs.minor {
                 return true
-            default:
+            } else if lhs.minor > rhs.minor {
+                return false
+            } else if lhs.patch < rhs.patch {
+                return true
+            } else {
                 return false
             }
         }

Packages/InstanceFeatures/Sources/InstanceFeatures/InstanceInfo.swift

@@ -1,47 +0,0 @@
-//
-//  InstanceInfo.swift
-//  InstanceFeatures
-//
-//  Created by Shadowfacts on 5/28/23.
-//
-
-import Foundation
-import Pachyderm
-
-public struct InstanceInfo {
-    public var version: String
-    public var maxStatusCharacters: Int?
-    public var configuration: InstanceV1.Configuration?
-    public var pollsConfiguration: InstanceV1.PollsConfiguration?
-    public var translation: Bool
-    
-    public init(
-        version: String,
-        maxStatusCharacters: Int?,
-        configuration: InstanceV1.Configuration?,
-        pollsConfiguration: InstanceV1.PollsConfiguration?,
-        translation: Bool
-    ) {
-        self.version = version
-        self.maxStatusCharacters = maxStatusCharacters
-        self.configuration = configuration
-        self.pollsConfiguration = pollsConfiguration
-        self.translation = translation
-    }
-}
-
-extension InstanceInfo {
-    public init(v1 instance: InstanceV1) {
-        self.init(
-            version: instance.version,
-            maxStatusCharacters: instance.maxStatusCharacters,
-            configuration: instance.configuration,
-            pollsConfiguration: instance.pollsConfiguration,
-            translation: false
-        )
-    }
-    
-    public mutating func update(v2: InstanceV2) {
-        translation = v2.configuration.translation.enabled
-    }
-}

Packages/InstanceFeatures/Sources/InstanceFeatures/Version.swift

@@ -1,80 +0,0 @@
-//
-//  Version.swift
-//  InstanceFeatures
-//
-//  Created by Shadowfacts on 5/14/23.
-//
-
-import Foundation
-
-@_spi(InstanceType) public struct Version: Equatable, Comparable, CustomStringConvertible {
-    private static let regex = try! NSRegularExpression(pattern: "^(\\d+)\\.(\\d+)\\.(\\d+).*$")
-    
-    let major: Int
-    let minor: Int
-    let patch: Int
-    
-    init(_ major: Int, _ minor: Int, _ patch: Int) {
-        self.major = major
-        self.minor = minor
-        self.patch = patch
-    }
-    
-    init?(string: String) {
-        guard let match = Version.regex.firstMatch(in: string, range: NSRange(location: 0, length: string.utf16.count)),
-              match.numberOfRanges == 4 else {
-            return nil
-        }
-        let majorStr = (string as NSString).substring(with: match.range(at: 1))
-        let minorStr = (string as NSString).substring(with: match.range(at: 2))
-        let patchStr = (string as NSString).substring(with: match.range(at: 3))
-        guard let major = Int(majorStr),
-              let minor = Int(minorStr),
-              let patch = Int(patchStr) else {
-            return nil
-        }
-        self.major = major
-        self.minor = minor
-        self.patch = patch
-    }
-    
-    public var description: String {
-        "\(major).\(minor).\(patch)"
-    }
-    
-    public static func ==(lhs: Version, rhs: Version) -> Bool {
-        return lhs.major == rhs.major && lhs.minor == rhs.minor && lhs.patch == rhs.patch
-    }
-    
-    public static func <(lhs: Version, rhs: Version) -> Bool {
-        if lhs.major < rhs.major {
-            return true
-        } else if lhs.major > rhs.major {
-            return false
-        } else if lhs.minor < rhs.minor {
-            return true
-        } else if lhs.minor > rhs.minor {
-            return false
-        } else if lhs.patch < rhs.patch {
-            return true
-        } else {
-            return false
-        }
-    }
-}
-
-func <(lhs: Version?, rhs: Version) -> Bool {
-    guard let lhs else {
-        // nil is less than or equal to everything
-        return true
-    }
-    return lhs < rhs
-}
-    
-func >=(lhs: Version?, rhs: Version) -> Bool {
-    guard let lhs else {
-        // nil is less than or equal to everything
-        return false
-    }
-    return lhs >= rhs
-}

Packages/MatchedGeometryPresentation/.gitignore

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

Packages/MatchedGeometryPresentation/Package.swift

@@ -1,26 +0,0 @@
-// swift-tools-version: 5.8
-// The swift-tools-version declares the minimum version of Swift required to build this package.
-
-import PackageDescription
-
-let package = Package(
-    name: "MatchedGeometryPresentation",
-    platforms: [
-        .iOS(.v15),
-    ],
-    products: [
-        // Products define the executables and libraries a package produces, making them visible to other packages.
-        .library(
-            name: "MatchedGeometryPresentation",
-            targets: ["MatchedGeometryPresentation"]),
-    ],
-    targets: [
-        // Targets are the basic building blocks of a package, defining a module or a test suite.
-        // Targets can depend on other targets in this package and products from dependencies.
-        .target(
-            name: "MatchedGeometryPresentation"),
-        // .testTarget(
-        //     name: "MatchedGeometryPresentationTests",
-        //     dependencies: ["MatchedGeometryPresentation"]),
-    ]
-)

Packages/MatchedGeometryPresentation/Sources/MatchedGeometryPresentation/MatchedGeometryModifiers.swift

@@ -1,125 +0,0 @@
-//
-//  MatchedGeometryModifiers.swift
-//  MatchGeom
-//
-//  Created by Shadowfacts on 4/24/23.
-//
-
-import SwiftUI
-
-extension View {
-    public func matchedGeometryPresentation<ID: Hashable, Presented: View>(id: Binding<ID?>, backgroundColor: UIColor, @ViewBuilder presenting: () -> Presented) -> some View {
-        self.modifier(MatchedGeometryPresentationModifier(id: id, backgroundColor: backgroundColor, presented: presenting()))
-    }
-    
-    public func matchedGeometrySource<ID: Hashable, ID2: Hashable>(id: ID, presentationID: ID2) -> some View {
-        self.modifier(MatchedGeometrySourceModifier(id: AnyHashable(id), presentationID: AnyHashable(presentationID), matched: { AnyView(self) }))
-    }
-    
-    public func matchedGeometryDestination<ID: Hashable>(id: ID) -> some View {
-        self.modifier(MatchedGeometryDestinationModifier(id: AnyHashable(id), matched: self))
-    }
-}
-
-private struct MatchedGeometryPresentationModifier<ID: Hashable, Presented: View>: ViewModifier {
-    @Binding var id: ID?
-    let backgroundColor: UIColor
-    let presented: Presented
-    @StateObject private var state = MatchedGeometryState()
-    
-    private var isPresented: Binding<Bool> {
-        Binding {
-            id != nil
-        } set: {
-            if $0 {
-                fatalError()
-            } else {
-                id = nil
-            }
-        }
-    }
-    
-    func body(content: Content) -> some View {
-        content
-            .environmentObject(state)
-            .backgroundPreferenceValue(MatchedGeometrySourcesKey.self, { sources in
-                Color.clear
-                    .presentViewController(makeVC(allSources: sources), isPresented: isPresented)
-            })
-    }
-    
-    private func makeVC(allSources: [SourceKey: (AnyView, CGRect)]) -> () -> UIViewController {
-        return {
-            // force unwrap is safe, this closure is only called when being presented so we must have an id
-            let id = AnyHashable(id!)
-            return MatchedGeometryViewController(
-                presentationID: id,
-                content: presented,
-                state: state,
-                backgroundColor: backgroundColor
-            )
-        }
-    }
-}
-
-private struct MatchedGeometrySourceModifier: ViewModifier {
-    let id: AnyHashable
-    let presentationID: AnyHashable
-    let matched: () -> AnyView
-    @EnvironmentObject private var state: MatchedGeometryState
-    
-    func body(content: Content) -> some View {
-        content
-            .background(GeometryReader { proxy in
-                Color.clear
-                    .preference(key: MatchedGeometryDestinationFrameKey.self, value: proxy.frame(in: .global))
-                    .onPreferenceChange(MatchedGeometryDestinationFrameKey.self) { newValue in
-                        if let newValue {
-                            state.sources[SourceKey(presentationID: presentationID, matchedID: id)] = (matched, newValue)
-                        }
-                    }
-            })
-            .opacity(state.animating && state.presentationID == presentationID ? 0 : 1)
-    }
-}
-
-private struct MatchedGeometryDestinationModifier<Matched: View>: ViewModifier {
-    let id: AnyHashable
-    let matched: Matched
-    @EnvironmentObject private var state: MatchedGeometryState
-    
-    func body(content: Content) -> some View {
-        content
-            .background(GeometryReader { proxy in
-                Color.clear
-                    .preference(key: MatchedGeometryDestinationFrameKey.self, value: proxy.frame(in: .global))
-                    .onPreferenceChange(MatchedGeometryDestinationFrameKey.self) { newValue in
-                        if let newValue,
-                           // ignore intermediate layouts that may happen while the dismiss animation is happening
-                           state.mode != .dismissing {
-                            state.destinations[id] = (AnyView(matched), newValue)
-                        }
-                    }
-            })
-            .opacity(state.animating ? 0 : 1)
-    }
-}
-
-private struct MatchedGeometryDestinationFrameKey: PreferenceKey {
-    static let defaultValue: CGRect? = nil
-    static func reduce(value: inout CGRect?, nextValue: () -> CGRect?) {
-        value = nextValue()
-    }
-}
-
-private struct MatchedGeometrySourcesKey: PreferenceKey {
-    static let defaultValue: [SourceKey: (AnyView, CGRect)] = [:]
-    static func reduce(value: inout Value, nextValue: () -> Value) {
-        value.merge(nextValue(), uniquingKeysWith: { _, new in new })
-    }
-}
-
-struct SourceKey: Hashable {
-    let presentationID: AnyHashable
-    let matchedID: AnyHashable
-}

Packages/MatchedGeometryPresentation/Sources/MatchedGeometryPresentation/MatchedGeometryViewController.swift

@@ -1,239 +0,0 @@
-//
-//  MatchedGeometryViewController.swift
-//  MatchGeom
-//
-//  Created by Shadowfacts on 4/24/23.
-//
-
-import SwiftUI
-import Combine
-
-private let mass: CGFloat = 1
-private let presentStiffness: CGFloat = 300
-private let presentDamping: CGFloat = 20
-private let dismissStiffness: CGFloat = 200
-private let dismissDamping: CGFloat = 20
-
-public class MatchedGeometryState: ObservableObject {
-    @Published var presentationID: AnyHashable?
-    @Published var animating: Bool = false
-    @Published public var mode: Mode = .presenting
-    @Published var sources: [SourceKey: (() -> AnyView, CGRect)] = [:]
-    @Published var currentFrames: [AnyHashable: CGRect] = [:]
-    @Published var destinations: [AnyHashable: (AnyView, CGRect)] = [:]
-    
-    public enum Mode: Equatable {
-        case presenting
-        case idle
-        case dismissing
-    }
-}
-
-class MatchedGeometryViewController<Content: View>: UIViewController, UIViewControllerTransitioningDelegate {
-    
-    let presentationID: AnyHashable
-    let content: Content
-    let state: MatchedGeometryState
-    let backgroundColor: UIColor
-    var contentHost: UIHostingController<ContentContainerView>!
-    var matchedHost: UIHostingController<MatchedContainerView>!
-    
-    init(presentationID: AnyHashable, content: Content, state: MatchedGeometryState, backgroundColor: UIColor) {
-        self.presentationID = presentationID
-        self.content = content
-        self.state = state
-        self.backgroundColor = backgroundColor
-        
-        super.init(nibName: nil, bundle: nil)
-        
-        modalPresentationStyle = .custom
-        transitioningDelegate = self
-    }
-    
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        
-        contentHost = UIHostingController(rootView: ContentContainerView(content: content, state: state))
-        contentHost.view.autoresizingMask = [.flexibleWidth, .flexibleHeight]
-        contentHost.view.frame = view.bounds
-        contentHost.view.backgroundColor = backgroundColor
-        addChild(contentHost)
-        view.addSubview(contentHost.view)
-        contentHost.didMove(toParent: self)
-    }
-    
-    override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
-        
-        state.presentationID = presentationID
-    }
-    
-    var currentPresentationSources: [AnyHashable: (() -> AnyView, CGRect)] {
-        Dictionary(uniqueKeysWithValues: state.sources.filter { $0.key.presentationID == presentationID }.map { ($0.key.matchedID, $0.value) })
-    }
-    
-    func addMatchedHostingController() {
-        let sources = currentPresentationSources.map { (id: $0.key, view: $0.value.0) }
-        matchedHost = UIHostingController(rootView: MatchedContainerView(sources: sources, state: state))
-        matchedHost.view.autoresizingMask = [.flexibleWidth, .flexibleHeight]
-        matchedHost.view.frame = view.bounds
-        matchedHost.view.backgroundColor = .clear
-        matchedHost.view.layer.zPosition = 100
-        addChild(matchedHost)
-        view.addSubview(matchedHost.view)
-        matchedHost.didMove(toParent: self)
-    }
-    
-    struct ContentContainerView: View {
-        let content: Content
-        let state: MatchedGeometryState
-        
-        var body: some View {
-            content
-                .environmentObject(state)
-        }
-    }
-    
-    struct MatchedContainerView: View {
-        let sources: [(id: AnyHashable, view: () -> AnyView)]
-        @ObservedObject var state: MatchedGeometryState
-        
-        var body: some View {
-            ZStack {
-                ForEach(sources, id: \.id) { (id, view) in
-                    matchedView(id: id, source: view)
-                }
-            }
-        }
-        
-        @ViewBuilder
-        func matchedView(id: AnyHashable, source: () -> AnyView) -> some View {
-            if let frame = state.currentFrames[id],
-               let dest = state.destinations[id]?.0 {
-                ZStack {
-                    source()
-                    dest
-                        .opacity(state.mode == .presenting ? (state.animating ? 1 : 0) : (state.animating ? 0 : 1))
-                }
-                .frame(width: frame.width, height: frame.height)
-                .position(x: frame.midX, y: frame.midY)
-                .ignoresSafeArea()
-                .animation(.interpolatingSpring(mass: Double(mass), stiffness: Double(state.mode == .presenting ? presentStiffness : dismissStiffness), damping: Double(state.mode == .presenting ? presentDamping : dismissDamping), initialVelocity: 0), value: frame)
-            }
-        }
-    }
-    
-    // MARK: UIViewControllerTransitioningDelegate
-    func animationController(forPresented presented: UIViewController, presenting: UIViewController, source: UIViewController) -> UIViewControllerAnimatedTransitioning? {
-        return MatchedGeometryPresentationAnimationController<Content>()
-    }
-    
-    func animationController(forDismissed dismissed: UIViewController) -> UIViewControllerAnimatedTransitioning? {
-        return MatchedGeometryDismissAnimationController<Content>()
-    }
-    
-    func presentationController(forPresented presented: UIViewController, presenting: UIViewController?, source: UIViewController) -> UIPresentationController? {
-        return MatchedGeometryPresentationController(presentedViewController: presented, presenting: presenting)
-    }
-    
-}
-
-class MatchedGeometryPresentationAnimationController<Content: View>: NSObject, UIViewControllerAnimatedTransitioning {
-    func transitionDuration(using transitionContext: UIViewControllerContextTransitioning?) -> TimeInterval {
-        return 0.8
-    }
-
-    func animateTransition(using transitionContext: UIViewControllerContextTransitioning) {
-        let matchedGeomVC = transitionContext.viewController(forKey: .to) as! MatchedGeometryViewController<Content>
-        let container = transitionContext.containerView
-        
-        // add the VC to the container, which kicks off layout out the content hosting controller
-        matchedGeomVC.view.autoresizingMask = [.flexibleWidth, .flexibleHeight]
-        matchedGeomVC.view.frame = container.bounds
-        container.addSubview(matchedGeomVC.view)
-        
-        // layout out the content hosting controller and having enough destinations may take a while
-        // so listen for when it's ready, rather than trying to guess at the timing
-        let cancellable = matchedGeomVC.state.$destinations
-            .filter { destinations in matchedGeomVC.currentPresentationSources.allSatisfy { source in destinations.keys.contains(source.key) } }
-            .first()
-            .sink { destinations in
-                matchedGeomVC.addMatchedHostingController()
-                
-                // setup the initial state for the animation
-                matchedGeomVC.matchedHost.view.isHidden = true
-                matchedGeomVC.state.mode = .presenting
-                matchedGeomVC.state.currentFrames = matchedGeomVC.currentPresentationSources.mapValues(\.1)
-                
-                // wait one runloop iteration for the matched hosting controller to be setup
-                DispatchQueue.main.async {
-                    matchedGeomVC.matchedHost.view.isHidden = false
-                    matchedGeomVC.state.animating = true
-                    // get the now-current destinations, in case they've changed since the sunk value was published
-                    matchedGeomVC.state.currentFrames = matchedGeomVC.state.destinations.mapValues(\.1)
-                }
-            }
-        
-        matchedGeomVC.contentHost.view.layer.opacity = 0
-        let spring = UISpringTimingParameters(mass: mass, stiffness: presentStiffness, damping: presentDamping, initialVelocity: .zero)
-        let animator = UIViewPropertyAnimator(duration: self.transitionDuration(using: transitionContext), timingParameters: spring)
-        animator.addAnimations {
-            matchedGeomVC.contentHost.view.layer.opacity = 1
-        }
-        animator.addCompletion { _ in
-            transitionContext.completeTransition(true)
-            matchedGeomVC.state.animating = false
-            matchedGeomVC.state.mode = .idle
-            
-            matchedGeomVC.matchedHost?.view.removeFromSuperview()
-            matchedGeomVC.matchedHost?.removeFromParent()
-            cancellable.cancel()
-        }
-        animator.startAnimation()
-    }
-}
-
-class MatchedGeometryDismissAnimationController<Content: View>: NSObject, UIViewControllerAnimatedTransitioning {
-    func transitionDuration(using transitionContext: UIViewControllerContextTransitioning?) -> TimeInterval {
-        return 0.8
-    }
-    
-    func animateTransition(using transitionContext: UIViewControllerContextTransitioning) {
-        let matchedGeomVC = transitionContext.viewController(forKey: .from) as! MatchedGeometryViewController<Content>
-        
-        // recreate the matched host b/c using the current destinations doesn't seem to update the existing one
-        matchedGeomVC.addMatchedHostingController()
-        matchedGeomVC.matchedHost.view.isHidden = true
-        matchedGeomVC.state.mode = .dismissing
-        matchedGeomVC.state.currentFrames = matchedGeomVC.state.destinations.mapValues(\.1)
-        
-        DispatchQueue.main.async {
-            matchedGeomVC.matchedHost.view.isHidden = false
-            matchedGeomVC.state.animating = true
-            matchedGeomVC.state.currentFrames = matchedGeomVC.currentPresentationSources.mapValues(\.1)
-        }
-        
-        let spring = UISpringTimingParameters(mass: mass, stiffness: dismissStiffness, damping: dismissDamping, initialVelocity: .zero)
-        let animator = UIViewPropertyAnimator(duration: transitionDuration(using: transitionContext), timingParameters: spring)
-        animator.addAnimations {
-            matchedGeomVC.contentHost.view.layer.opacity = 0
-        }
-        animator.addCompletion { _ in
-            transitionContext.completeTransition(true)
-            matchedGeomVC.state.animating = false
-            matchedGeomVC.state.mode = .idle
-        }
-        animator.startAnimation()
-    }
-}
-
-class MatchedGeometryPresentationController: UIPresentationController {
-    override func dismissalTransitionWillBegin() {
-        super.dismissalTransitionWillBegin()
-        delegate?.presentationControllerWillDismiss?(self)
-    }
-}

Packages/MatchedGeometryPresentation/Sources/MatchedGeometryPresentation/View+PresentViewController.swift

@@ -1,62 +0,0 @@
-//
-//  View+PresentViewController.swift
-//  MatchGeom
-//
-//  Created by Shadowfacts on 4/24/23.
-//
-
-import SwiftUI
-
-extension View {
-    func presentViewController(_ makeVC: @escaping () -> UIViewController, isPresented: Binding<Bool>) -> some View {
-        self
-            .background(
-                ViewControllerPresenter(makeVC: makeVC, isPresented: isPresented)
-            )
-    }
-}
-
-private struct ViewControllerPresenter: UIViewControllerRepresentable {
-    let makeVC: () -> UIViewController
-    @Binding var isPresented: Bool
-    
-    func makeUIViewController(context: Context) -> UIViewController {
-        return UIViewController()
-    }
-    
-    func updateUIViewController(_ uiViewController: UIViewController, context: Context) {
-        if isPresented {
-            if uiViewController.presentedViewController == nil {
-                let presented = makeVC()
-                presented.presentationController!.delegate = context.coordinator
-                uiViewController.present(presented, animated: true)
-                context.coordinator.didPresent = true
-            }
-        } else {
-            if context.coordinator.didPresent,
-               let presentedViewController = uiViewController.presentedViewController,
-               !presentedViewController.isBeingDismissed {
-                uiViewController.dismiss(animated: true)
-                context.coordinator.didPresent = false
-            }
-        }
-    }
-    
-    func makeCoordinator() -> Coordinator {
-        return Coordinator(isPresented: $isPresented)
-    }
-    
-    class Coordinator: NSObject, UIAdaptivePresentationControllerDelegate {
-        @Binding var isPresented: Bool
-        var didPresent = false
-        
-        init(isPresented: Binding<Bool>) {
-            self._isPresented = isPresented
-        }
-        
-        func presentationControllerWillDismiss(_ presentationController: UIPresentationController) {
-            isPresented = false
-            didPresent = false
-        }
-    }
-}

Packages/Pachyderm/Package.swift

@@ -6,7 +6,7 @@ import PackageDescription
 let package = Package(
     name: "Pachyderm",
     platforms: [
-        .iOS(.v15),
+        .iOS(.v14),
     ],
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.

Packages/Pachyderm/Sources/Pachyderm/Client.swift

@@ -7,12 +7,11 @@
 //
 
 import Foundation
-import WebURL
 
 /**
  The base Mastodon API client.
  */
-public struct Client: Sendable {
+public class Client {
     
     public typealias Callback<Result: Decodable> = (Response<Result>) -> Void
     
@@ -20,6 +19,8 @@ public struct Client: Sendable {
     let session: URLSession
     
     public var accessToken: String?
+    
+    public var appID: String?
     public var clientID: String?
     public var clientSecret: String?
     
@@ -42,7 +43,7 @@ public struct Client: Sendable {
             } else if let date = iso8601.date(from: str) {
                 return date
             } else {
-                throw DecodingError.typeMismatch(Date.self, .init(codingPath: container.codingPath, debugDescription: "unexpected date format: \(str)"))
+                throw DecodingError.typeMismatch(Date.self, .init(codingPath: container.codingPath, debugDescription: "unexpected date format"))
             }
         })
         
@@ -59,11 +60,9 @@ public struct Client: Sendable {
         return encoder
     }()
     
-    public init(baseURL: URL, accessToken: String? = nil, clientID: String? = nil, clientSecret: String? = nil, session: URLSession = .shared) {
+    public init(baseURL: URL, accessToken: String? = nil, session: URLSession = .shared) {
         self.baseURL = baseURL
         self.accessToken = accessToken
-        self.clientID = clientID
-        self.clientSecret = clientSecret
         self.session = session
     }
     
@@ -84,7 +83,7 @@ public struct Client: Sendable {
                     completion(.failure(Error(request: request, type: .invalidResponse)))
                     return
             }
-            guard response.statusCode == 200 || request.additionalAcceptableHTTPCodes.contains(response.statusCode) else {
+            guard response.statusCode == 200 else {
                 let mastodonError = try? Client.decoder.decode(MastodonError.self, from: data)
                 let type: ErrorType = mastodonError.flatMap { .mastodonError(response.statusCode, $0.description) } ?? .unexpectedStatus(response.statusCode)
                 completion(.failure(Error(request: request, type: type)))
@@ -105,20 +104,6 @@ public struct Client: Sendable {
         return task
     }
     
-    @discardableResult
-    public func run<Result: Sendable>(_ request: Request<Result>) async throws -> (Result, Pagination?) {
-        return try await withCheckedThrowingContinuation { continuation in
-            run(request) { response in
-                switch response {
-                case .failure(let error):
-                    continuation.resume(throwing: error)
-                case .success(let result, let pagination):
-                    continuation.resume(returning: (result, pagination))
-                }
-            }
-        }
-    }
-    
     func createURLRequest<Result>(request: Request<Result>) -> URLRequest? {
         guard var components = URLComponents(url: baseURL, resolvingAgainstBaseURL: true) else { return nil }
         components.path = request.endpoint.path
@@ -127,17 +112,11 @@ public struct Client: Sendable {
         var urlRequest = URLRequest(url: url, timeoutInterval: timeoutInterval)
         urlRequest.httpMethod = request.method.name
         urlRequest.httpBody = request.body.data
-        urlRequest.setValue("application/json", forHTTPHeaderField: "Accept")
-        for (name, value) in request.headers {
-            urlRequest.setValue(value, forHTTPHeaderField: name)
-        }
         if let mimeType = request.body.mimeType {
             urlRequest.setValue(mimeType, forHTTPHeaderField: "Content-Type")
         }
         if let accessToken = accessToken {
             urlRequest.setValue("Bearer \(accessToken)", forHTTPHeaderField: "Authorization")
-            // We consider authenticated requests to be user-initiated.
-            urlRequest.attribution = .user
         }
         return urlRequest
     }
@@ -150,7 +129,14 @@ public struct Client: Sendable {
                 "scopes" => scopes.scopeString,
                 "website" => website?.absoluteString
             ]))
-        run(request, completion: completion)
+        run(request) { result in
+            defer { completion(result) }
+            guard case let .success(application, _) = result else { return }
+            
+            self.appID = application.id
+            self.clientID = application.clientID
+            self.clientSecret = application.clientSecret
+        }
     }
     
     public func getAccessToken(authorizationCode: String, redirectURI: String, scopes: [Scope], completion: @escaping Callback<LoginSettings>) {
@@ -162,7 +148,12 @@ public struct Client: Sendable {
                 "redirect_uri" => redirectURI,
                 "scope" => scopes.scopeString,
             ]))
-        run(request, completion: completion)
+        run(request) { result in
+            defer { completion(result) }
+            guard case let .success(loginSettings, _) = result else { return }
+            
+            self.accessToken = loginSettings.accessToken
+        }
     }
     
     public func revokeAccessToken() async throws {
@@ -186,16 +177,21 @@ public struct Client: Sendable {
         })
     }
     
-    public func nodeInfo() async throws -> NodeInfo {
+    public func nodeInfo(completion: @escaping Callback<NodeInfo>) {
         let wellKnown = Request<WellKnown>(method: .get, path: "/.well-known/nodeinfo")
-        let wellKnownResults = try await run(wellKnown).0
+        run(wellKnown) { result in
-        if let url = wellKnownResults.links.first(where: { $0.rel == "http://nodeinfo.diaspora.software/ns/schema/2.0" }),
+            switch result {
-           let href = WebURL(url.href),
+            case let .failure(error):
-           href.host == WebURL(self.baseURL)?.host {
+                completion(.failure(error))
-            let nodeInfo = Request<NodeInfo>(method: .get, path: Endpoint(stringLiteral: href.path))
+                
-            return try await run(nodeInfo).0
+            case let .success(wellKnown, _):
-        } else {
+                if let url = wellKnown.links.first(where: { $0.rel == "http://nodeinfo.diaspora.software/ns/schema/2.0" }),
-            throw NodeInfoError.noWellKnownLink
+                   let components = URLComponents(string: url.href),
+                   components.host == self.baseURL.host {
+                    let nodeInfo = Request<NodeInfo>(method: .get, path: Endpoint(stringLiteral: components.path))
+                    self.run(nodeInfo, completion: completion)
+                }
+            }
         }
     }
     
@@ -204,8 +200,8 @@ public struct Client: Sendable {
         return Request<Account>(method: .get, path: "/api/v1/accounts/verify_credentials")
     }
     
-    public static func getFavourites(range: RequestRange = .default) -> Request<[TryDecode<Status>]> {
+    public static func getFavourites(range: RequestRange = .default) -> Request<[Status]> {
-        var request = Request<[TryDecode<Status>]>(method: .get, path: "/api/v1/favourites")
+        var request = Request<[Status]>(method: .get, path: "/api/v1/favourites")
         request.range = range
         return request
     }
@@ -214,22 +210,14 @@ public struct Client: Sendable {
         return Request<[Relationship]>(method: .get, path: "/api/v1/accounts/relationships", queryParameters: "id" => accounts)
     }
     
-    public static func getInstanceV1() -> Request<InstanceV1> {
+    public static func getInstance() -> Request<Instance> {
-        return Request<InstanceV1>(method: .get, path: "/api/v1/instance")
+        return Request<Instance>(method: .get, path: "/api/v1/instance")
-    }
-    
-    public static func getInstanceV2() -> Request<InstanceV2> {
-        return Request<InstanceV2>(method: .get, path: "/api/v2/instance")
     }
     
     public static func getCustomEmoji() -> Request<[Emoji]> {
         return Request<[Emoji]>(method: .get, path: "/api/v1/custom_emojis")
     }
     
-    public static func getPreferences() -> Request<Preferences> {
-        return Request(method: .get, path: "/api/v1/preferences")
-    }
-    
     // MARK: - Accounts
     public static func getAccount(id: String) -> Request<Account> {
         return Request<Account>(method: .get, path: "/api/v1/accounts/\(id)")
@@ -326,13 +314,6 @@ public struct Client: Sendable {
             ], attachment))
     }
     
-    public static func updateAttachment(id: String, description: String?, focus: (Float, Float)?) -> Request<Attachment> {
-        return Request(method: .put, path: "/api/v1/media/\(id)", body: FormDataBody([
-            "description" => description,
-            "focus" => focus
-        ], nil))
-    }
-    
     // MARK: - Mutes
     public static func getMutes(range: RequestRange) -> Request<[Account]> {
         var request = Request<[Account]>(method: .get, path: "/api/v1/mutes")
@@ -341,10 +322,6 @@ public struct Client: Sendable {
     }
     
     // MARK: - Notifications
-    public static func getNotification(id: String) -> Request<Notification> {
-        return Request(method: .get, path: "/api/v1/notifications/\(id)")
-    }
-    
     public static func getNotifications(allowedTypes: [Notification.Kind], range: RequestRange = .default) -> Request<[Notification]> {
         var request = Request<[Notification]>(method: .get, path: "/api/v1/notifications", queryParameters:
             "types" => allowedTypes.map { $0.rawValue }
@@ -404,65 +381,38 @@ public struct Client: Sendable {
     public static func createStatus(text: String,
                                     contentType: StatusContentType = .plain,
                                     inReplyTo: String? = nil,
-                                    mediaIDs: [String]? = nil,
+                                    media: [Attachment]? = nil,
                                     sensitive: Bool? = nil,
                                     spoilerText: String? = nil,
-                                    visibility: String? = nil,
+                                    visibility: Visibility? = nil,
-                                    language: String? = nil, // language supported by mastodon and akkoma
+                                    language: String? = nil,
                                     pollOptions: [String]? = nil,
                                     pollExpiresIn: Int? = nil,
                                     pollMultiple: Bool? = nil,
-                                    localOnly: Bool? = nil, /* hometown only, not glitch */
+                                    localOnly: Bool? = nil /* hometown only, not glitch */) -> Request<Status> {
-                                    idempotencyKey: String) -> Request<Status> {
+        return Request<Status>(method: .post, path: "/api/v1/statuses", body: ParametersBody([
-        var req = Request<Status>(method: .post, path: "/api/v1/statuses", body: ParametersBody([
                 "status" => text,
                 "content_type" => contentType.mimeType,
                 "in_reply_to_id" => inReplyTo,
                 "sensitive" => sensitive,
                 "spoiler_text" => spoilerText,
-            "visibility" => visibility,
+                "visibility" => visibility?.rawValue,
                 "language" => language,
                 "poll[expires_in]" => pollExpiresIn,
                 "poll[multiple]" => pollMultiple,
                 "local_only" => localOnly,
-        ] + "media_ids" => mediaIDs + "poll[options]" => pollOptions))
+            ] + "media_ids" => media?.map { $0.id } + "poll[options]" => pollOptions))
-        req.headers["Idempotency-Key"] = idempotencyKey
-        return req
-    }
-    
-    public static func editStatus(
-        id: String,
-        text: String,
-        contentType: StatusContentType = .plain,
-        spoilerText: String?,
-        sensitive: Bool,
-        language: String?,
-        mediaIDs: [String],
-        mediaAttributes: [EditStatusMediaAttributes],
-        poll: EditPollParameters?
-    ) -> Request<Status> {
-        let params = EditStatusParameters(
-            id: id,
-            text: text,
-            contentType: contentType,
-            spoilerText: spoilerText,
-            sensitive: sensitive,
-            language: language,
-            mediaIDs: mediaIDs,
-            mediaAttributes: mediaAttributes,
-            poll: poll
-        )
-        return Request(method: .put, path: "/api/v1/statuses/\(id)", body: JsonBody(params))
     }
     
     // MARK: - Timelines
-    public static func getStatuses(timeline: Timeline, range: RequestRange = .default) -> Request<[TryDecode<Status>]> {
+    public static func getStatuses(timeline: Timeline, range: RequestRange = .default) -> Request<[Status]> {
         return timeline.request(range: range)
     }
     
+    
     // MARK: - Bookmarks
-    public static func getBookmarks(range: RequestRange = .default) -> Request<[TryDecode<Status>]> {
+    public static func getBookmarks(range: RequestRange = .default) -> Request<[Status]> {
-        var request = Request<[TryDecode<Status>]>(method: .get, path: "/api/v1/bookmarks")
+        var request = Request<[Status]>(method: .get, path: "/api/v1/bookmarks")
         request.range = range
         return request
     }
@@ -490,7 +440,7 @@ public struct Client: Sendable {
         return Request<[Hashtag]>(method: .get, path: "/api/v1/trends/tags", queryParameters: parameters)
     }
     
-    public static func getTrendingStatuses(limit: Int? = nil, offset: Int? = nil) -> Request<[TryDecode<Status>]> {
+    public static func getTrendingStatuses(limit: Int? = nil, offset: Int? = nil) -> Request<[Status]> {
         var parameters: [Parameter] = []
         if let limit {
             parameters.append("limit" => limit)
@@ -532,12 +482,6 @@ public struct Client: Sendable {
         ])
     }
     
-    // MARK: - Hashtags
-    /// Requires Mastodon 4.0.0+
-    public static func getHashtag(name: String) -> Request<Hashtag> {
-        return Request(method: .get, path: "/api/v1/tags/\(name)")
-    }
-
 }
 
 extension Client {
@@ -556,15 +500,13 @@ extension Client {
             self.type = type
         }
         
-        public var errorDescription: String? {
+        public var localizedDescription: String {
             switch type {
             case .networkError(let error):
                 return "Network Error: \(error.localizedDescription)"
             // todo: support more status codes
             case .unexpectedStatus(413):
                 return "HTTP 413: Payload Too Large"
-            case .unexpectedStatus(429):
-                return "HTTP 429: Rate Limit Exceeded"
             case .unexpectedStatus(let code):
                 return "HTTP Code \(code)"
             case .invalidRequest:
@@ -586,15 +528,4 @@ extension Client {
         case invalidModel(Swift.Error)
         case mastodonError(Int, String)
     }
-    
-    enum NodeInfoError: LocalizedError {
-        case noWellKnownLink
-        
-        var errorDescription: String? {
-            switch self {
-            case .noWellKnownLink:
-                return "No well-known link"
-            }
-        }
-    }
 }

Packages/Pachyderm/Sources/Pachyderm/Model/Account.swift

@@ -40,9 +40,8 @@ public final class Account: AccountProtocol, Decodable, Sendable {
         self.displayName = try container.decode(String.self, forKey: .displayName)
         self.locked = try container.decode(Bool.self, forKey: .locked)
         self.createdAt = try container.decode(Date.self, forKey: .createdAt)
-        // some instance types (pixelfed, firefish) seem to sometimes send null for these fields, so just fallback to 0
+        self.followersCount = try container.decode(Int.self, forKey: .followersCount)
-        self.followersCount = try container.decodeIfPresent(Int.self, forKey: .followersCount) ?? 0
+        self.followingCount = try container.decode(Int.self, forKey: .followingCount)
-        self.followingCount = try container.decodeIfPresent(Int.self, forKey: .followingCount) ?? 0
         self.statusesCount = try container.decode(Int.self, forKey: .statusesCount)
         self.note = try container.decode(String.self, forKey: .note)
         self.url = try container.decode(URL.self, forKey: .url)
@@ -71,12 +70,12 @@ public final class Account: AccountProtocol, Decodable, Sendable {
         }
     }
     
-    public static func authorizeFollowRequest(_ accountID: String) -> Request<Relationship> {
+    public static func authorizeFollowRequest(_ account: Account) -> Request<Relationship> {
-        return Request<Relationship>(method: .post, path: "/api/v1/follow_requests/\(accountID)/authorize")
+        return Request<Relationship>(method: .post, path: "/api/v1/follow_requests/\(account.id)/authorize")
     }
     
-    public static func rejectFollowRequest(_ accountID: String) -> Request<Relationship> {
+    public static func rejectFollowRequest(_ account: Account) -> Request<Relationship> {
-        return Request<Relationship>(method: .post, path: "/api/v1/follow_requests/\(accountID)/reject")
+        return Request<Relationship>(method: .post, path: "/api/v1/follow_requests/\(account.id)/reject")
     }
     
     public static func removeFromFollowRequests(_ account: Account) -> Request<Empty> {
@@ -95,8 +94,8 @@ public final class Account: AccountProtocol, Decodable, Sendable {
         return request
     }
     
-    public static func getStatuses(_ accountID: String, range: RequestRange = .default, onlyMedia: Bool? = nil, pinned: Bool? = nil, excludeReplies: Bool? = nil, excludeReblogs: Bool? = nil) -> Request<[TryDecode<Status>]> {
+    public static func getStatuses(_ accountID: String, range: RequestRange = .default, onlyMedia: Bool? = nil, pinned: Bool? = nil, excludeReplies: Bool? = nil, excludeReblogs: Bool? = nil) -> Request<[Status]> {
-        var request = Request<[TryDecode<Status>]>(method: .get, path: "/api/v1/accounts/\(accountID)/statuses", queryParameters: [
+        var request = Request<[Status]>(method: .get, path: "/api/v1/accounts/\(accountID)/statuses", queryParameters: [
                 "only_media" => onlyMedia,
                 "pinned" => pinned,
                 "exclude_replies" => excludeReplies,

Packages/Pachyderm/Sources/Pachyderm/Model/Announcement.swift

@@ -1,99 +0,0 @@
-//
-//  Announcement.swift
-//  Pachyderm
-//
-//  Created by Shadowfacts on 4/16/24.
-//
-
-import Foundation
-import WebURL
-
-public struct Announcement: Decodable, Sendable, Hashable, Identifiable {
-    public let id: String
-    public let content: String
-    public let startsAt: Date?
-    public let endsAt: Date?
-    public let allDay: Bool
-    public let publishedAt: Date
-    public let updatedAt: Date
-    public let read: Bool?
-    public let mentions: [Account]
-    public let statuses: [Status]
-    public let tags: [Hashtag]
-    public let emojis: [Emoji]
-    public var reactions: [Reaction]
-    
-    public static func all() -> Request<[Announcement]> {
-        return Request(method: .get, path: "/api/v1/announcements")
-    }
-    
-    public static func dismiss(id: String) -> Request<Empty> {
-        return Request(method: .post, path: "/api/v1/announcements/\(id)/dismiss")
-    }
-    
-    public static func react(id: String, name: String) -> Request<Empty> {
-        return Request(method: .put, path: "/api/v1/announcements/\(id)/reactions/\(name)")
-    }
-    
-    public static func unreact(id: String, name: String) -> Request<Empty> {
-        return Request(method: .delete, path: "/api/v1/announcements/\(id)/reactions/\(name)")
-    }
-
-    enum CodingKeys: String, CodingKey {
-        case id
-        case content
-        case startsAt = "starts_at"
-        case endsAt = "ends_at"
-        case allDay = "all_day"
-        case publishedAt = "published_at"
-        case updatedAt = "updated_at"
-        case read
-        case mentions
-        case statuses
-        case tags
-        case emojis
-        case reactions
-    }
-}
-
-extension Announcement {
-    public struct Account: Decodable, Sendable, Hashable {
-        public let id: String
-        public let username: String
-        public let url: WebURL
-        public let acct: String
-    }
-}
-
-extension Announcement {
-    public struct Status: Decodable, Sendable, Hashable {
-        public let id: String
-        public let url: WebURL
-    }
-}
-
-extension Announcement {
-    public struct Reaction: Decodable, Sendable, Hashable {
-        public let name: String
-        public var count: Int
-        public var me: Bool?
-        public let url: URL?
-        public let staticURL: URL?
-        
-        public init(name: String, count: Int, me: Bool?, url: URL?, staticURL: URL?) {
-            self.name = name
-            self.count = count
-            self.me = me
-            self.url = url
-            self.staticURL = staticURL
-        }
-        
-        enum CodingKeys: String, CodingKey {
-            case name
-            case count
-            case me
-            case url
-            case staticURL = "static_url"
-        }
-    }
-}

Packages/Pachyderm/Sources/Pachyderm/Model/Attachment.swift

@@ -25,17 +25,6 @@ public struct Attachment: Codable, Sendable {
             ], nil))
     }
     
-    public init(id: String, kind: Attachment.Kind, url: URL, remoteURL: URL? = nil, previewURL: URL? = nil, meta: Attachment.Metadata? = nil, description: String? = nil, blurHash: String? = nil) {
-        self.id = id
-        self.kind = kind
-        self.url = url
-        self.remoteURL = remoteURL
-        self.previewURL = previewURL
-        self.meta = meta
-        self.description = description
-        self.blurHash = blurHash
-    }
-    
     public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         self.id = try container.decode(String.self, forKey: .id)

Packages/Pachyderm/Sources/Pachyderm/Model/Card.swift

@@ -26,38 +26,6 @@ public struct Card: Codable, Sendable {
     /// Only present when returned from the trending links endpoint
     public let history: [History]?
     
-    public init(
-        url: WebURL,
-        title: String,
-        description: String,
-        image: WebURL? = nil,
-        kind: Card.Kind,
-        authorName: String? = nil,
-        authorURL: WebURL? = nil,
-        providerName: String? = nil,
-        providerURL: WebURL? = nil,
-        html: String? = nil,
-        width: Int? = nil,
-        height: Int? = nil,
-        blurhash: String? = nil,
-        history: [History]? = nil
-    ) {
-        self.url = url
-        self.title = title
-        self.description = description
-        self.image = image
-        self.kind = kind
-        self.authorName = authorName
-        self.authorURL = authorURL
-        self.providerName = providerName
-        self.providerURL = providerURL
-        self.html = html
-        self.width = width
-        self.height = height
-        self.blurhash = blurhash
-        self.history = history
-    }
-
     public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         

Packages/Pachyderm/Sources/Pachyderm/Model/EditStatusParameters.swift

@@ -1,97 +0,0 @@
-//
-//  EditStatusParameters.swift
-//  Pachyderm
-//
-//  Created by Shadowfacts on 5/10/23.
-//
-
-import Foundation
-
-struct EditStatusParameters: Encodable, Sendable {
-    let id: String
-    let text: String
-    let contentType: StatusContentType
-    let spoilerText: String?
-    let sensitive: Bool
-    let language: String?
-    let mediaIDs: [String]
-    let mediaAttributes: [EditStatusMediaAttributes]
-    let poll: EditPollParameters?
-    
-    func encode(to encoder: Encoder) throws {
-        var container = encoder.container(keyedBy: CodingKeys.self)
-        try container.encode(self.id, forKey: .id)
-        try container.encode(self.text, forKey: .text)
-        try container.encode(self.contentType.mimeType, forKey: .contentType)
-        try container.encodeIfPresent(self.spoilerText, forKey: .spoilerText)
-        try container.encode(self.sensitive, forKey: .sensitive)
-        try container.encodeIfPresent(self.language, forKey: .language)
-        try container.encode(self.mediaIDs, forKey: .mediaIDs)
-        try container.encode(self.mediaAttributes, forKey: .mediaAttributes)
-        try container.encodeIfPresent(self.poll, forKey: .poll)
-    }
-    
-    enum CodingKeys: String, CodingKey {
-        case id
-        case text = "status"
-        case contentType = "content_type"
-        case spoilerText = "spoiler_text"
-        case sensitive
-        case language
-        case mediaIDs = "media_ids"
-        case mediaAttributes = "media_attributes"
-        case poll
-    }
-}
-
-public struct EditPollParameters: Encodable, Sendable {
-    let options: [String]
-    let expiresIn: Int
-    let multiple: Bool
-    
-    public init(options: [String], expiresIn: Int, multiple: Bool) {
-        self.options = options
-        self.expiresIn = expiresIn
-        self.multiple = multiple
-    }
-    
-    public func encode(to encoder: Encoder) throws {
-        var container = encoder.container(keyedBy: CodingKeys.self)
-        try container.encode(self.options, forKey: .options)
-        try container.encode(self.expiresIn, forKey: .expiresIn)
-        try container.encode(self.multiple, forKey: .multiple)
-    }
-    
-    enum CodingKeys: String, CodingKey {
-        case options
-        case expiresIn = "expires_in"
-        case multiple
-    }
-}
-
-public struct EditStatusMediaAttributes: Encodable, Sendable {
-    let id: String
-    let description: String
-    let focus: (Float, Float)?
-    
-    public init(id: String, description: String, focus: (Float, Float)?) {
-        self.id = id
-        self.description = description
-        self.focus = focus
-    }
-    
-    public func encode(to encoder: Encoder) throws {
-        var container = encoder.container(keyedBy: CodingKeys.self)
-        try container.encode(id, forKey: .id)
-        try container.encode(description, forKey: .description)
-        if let focus {
-            try container.encode("\(focus.0),\(focus.1)", forKey: .focus)
-        }
-    }
-    
-    enum CodingKeys: String, CodingKey {
-        case id
-        case description
-        case focus
-    }
-}

Packages/Pachyderm/Sources/Pachyderm/Model/Emoji.swift

@@ -43,13 +43,8 @@ extension Emoji: CustomDebugStringConvertible {
     }
 }
 
-extension Emoji: Equatable, Hashable {
+extension Emoji: Equatable {
     public static func ==(lhs: Emoji, rhs: Emoji) -> Bool {
         return lhs.shortcode == rhs.shortcode && lhs.url == rhs.url
     }
-    
-    public func hash(into hasher: inout Hasher) {
-        hasher.combine(shortcode)
-        hasher.combine(url)
-    }
 }

Packages/Pachyderm/Sources/Pachyderm/Model/Instance.swift

@@ -1,5 +1,5 @@
 //
-//  InstanceV1.swift
+//  Instance.swift
 //  Pachyderm
 //
 //  Created by Shadowfacts on 9/9/18.
@@ -8,7 +8,7 @@
 
 import Foundation
 
-public struct InstanceV1: Decodable, Sendable {
+public struct Instance: Decodable, Sendable {
     public let uri: String
     public let title: String
     public let description: String
@@ -92,7 +92,7 @@ public struct InstanceV1: Decodable, Sendable {
     }
 }
 
-extension InstanceV1 {
+extension Instance {
     public struct Stats: Decodable, Sendable {
         public let domainCount: Int?
         public let statusCount: Int?
@@ -106,8 +106,8 @@ extension InstanceV1 {
     }
 }
 
-extension InstanceV1 {
+extension Instance {
-    public struct Configuration: Codable, Sendable {
+    public struct Configuration: Decodable, Sendable {
         public let statuses: StatusesConfiguration
         public let mediaAttachments: MediaAttachmentsConfiguration
         /// Use Instance.pollsConfiguration to support older instance that don't have this nested
@@ -121,9 +121,8 @@ extension InstanceV1 {
     }
 }
 
-extension InstanceV1 {
+extension Instance {
-    // note: also used by InstanceV2
+    public struct StatusesConfiguration: Decodable, Sendable {
-    public struct StatusesConfiguration: Codable, Sendable {
         public let maxCharacters: Int
         public let maxMediaAttachments: Int
         public let charactersReservedPerURL: Int
@@ -136,9 +135,8 @@ extension InstanceV1 {
     }
 }
 
-extension InstanceV1 {
+extension Instance {
-    // note: also used by InstanceV2
+    public struct MediaAttachmentsConfiguration: Decodable, Sendable {
-    public struct MediaAttachmentsConfiguration: Codable, Sendable {
         public let supportedMIMETypes: [String]
         public let imageSizeLimit: Int
         public let imageMatrixLimit: Int
@@ -157,9 +155,8 @@ extension InstanceV1 {
     }
 }
 
-extension InstanceV1 {
+extension Instance {
-    // note: also used by InstanceV2
+    public struct PollsConfiguration: Decodable, Sendable {
-    public struct PollsConfiguration: Codable, Sendable {
         public let maxOptions: Int
         public let maxCharactersPerOption: Int
         public let minExpiration: TimeInterval
@@ -174,8 +171,7 @@ extension InstanceV1 {
     }
 }
 
-extension InstanceV1 {
+extension Instance {
-    // note: also used by InstanceV2
     public struct Rule: Decodable, Identifiable, Sendable {
         public let id: String
         public let text: String

Packages/Pachyderm/Sources/Pachyderm/Model/InstanceV2.swift

@@ -1,125 +0,0 @@
-//
-//  InstanceV2.swift
-//  Pachyderm
-//
-//  Created by Shadowfacts on 12/4/23.
-//
-
-import Foundation
-
-public struct InstanceV2: Decodable, Sendable {
-    public let domain: String
-    public let title: String
-    public let version: String
-    public let sourceURL: String
-    public let description: String
-    public let usage: Usage
-    public let thumbnail: Thumbnail
-    public let languages: [String]
-    public let configuration: Configuration
-    public let registrations: Registrations
-    public let contact: Contact
-    public let rules: [InstanceV1.Rule]
-    
-    private enum CodingKeys: String, CodingKey {
-        case domain
-        case title
-        case version
-        case sourceURL = "source_url"
-        case description
-        case usage
-        case thumbnail
-        case languages
-        case configuration
-        case registrations
-        case contact
-        case rules
-    }
-}
-
-extension InstanceV2 {
-    public struct Usage: Decodable, Sendable {
-        public let users: Users
-    }
-    public struct Users: Decodable, Sendable {
-        public let activeMonth: Int
-        private enum CodingKeys: String, CodingKey {
-            case activeMonth = "active_month"
-        }
-    }
-}
-
-extension InstanceV2 {
-    public struct Thumbnail: Decodable, Sendable {
-        public let url: String
-        public let blurhash: String?
-        public let versions: ThumbnailVersions?
-    }
-    
-    public struct ThumbnailVersions: Decodable, Sendable {
-        public let oneX: String?
-        public let twoX: String?
-        private enum CodingKeys: String, CodingKey {
-            case oneX = "@1x"
-            case twoX = "@2x"
-        }
-    }
-}
-
-extension InstanceV2 {
-    public struct Configuration: Decodable, Sendable {
-        public let urls: URLs
-        public let accounts: Accounts
-        public let statuses: InstanceV1.StatusesConfiguration
-        public let mediaAttachments: InstanceV1.MediaAttachmentsConfiguration
-        public let polls: InstanceV1.PollsConfiguration
-        public let translation: Translation
-        
-        private enum CodingKeys: String, CodingKey {
-            case urls
-            case accounts
-            case statuses
-            case mediaAttachments = "media_attachments"
-            case polls
-            case translation
-        }
-    }
-    
-    public struct URLs: Decodable, Sendable {
-        // the docs incorrectly say the key for this is "streaming_api"
-        public let streaming: String
-    }
-    
-    public struct Accounts: Decodable, Sendable {
-        public let maxFeaturedTags: Int
-        
-        private enum CodingKeys: String, CodingKey {
-            case maxFeaturedTags = "max_featured_tags"
-        }
-    }
-    
-    public struct Translation: Decodable, Sendable {
-        public let enabled: Bool
-    }
-}
-
-extension InstanceV2 {
-    public struct Registrations: Decodable, Sendable {
-        public let enabled: Bool
-        public let approvalRequired: Bool
-        public let message: String?
-        
-        private enum CodingKeys: String, CodingKey {
-            case enabled
-            case approvalRequired = "approval_required"
-            case message
-        }
-    }
-}
-
-extension InstanceV2 {
-    public struct Contact: Decodable, Sendable {
-        public let email: String
-        public let account: Account?
-    }
-}

Packages/Pachyderm/Sources/Pachyderm/Model/List.swift

@@ -11,18 +11,14 @@ import Foundation
 public struct List: ListProtocol, Decodable, Equatable, Hashable, Sendable {
     public let id: String
     public let title: String
-    public let replyPolicy: ReplyPolicy?
-    public let exclusive: Bool?
     
     public var timeline: Timeline {
         return .list(id: id)
     }
     
-    public init(id: String, title: String, replyPolicy: ReplyPolicy?, exclusive: Bool?) {
+    public init(id: String, title: String) {
         self.id = id
         self.title = title
-        self.replyPolicy = replyPolicy
-        self.exclusive = exclusive
     }
     
     public static func ==(lhs: List, rhs: List) -> Bool {
@@ -40,15 +36,8 @@ public struct List: ListProtocol, Decodable, Equatable, Hashable, Sendable {
         return request
     }
     
-    public static func update(_ listID: String, title: String, replyPolicy: ReplyPolicy?, exclusive: Bool?) -> Request<List> {
+    public static func update(_ listID: String, title: String) -> Request<List> {
-        var params = ["title" => title]
+        return Request<List>(method: .put, path: "/api/v1/lists/\(listID)", body: ParametersBody(["title" => title]))
-        if let replyPolicy {
-            params.append("replies_policy" => replyPolicy.rawValue)
-        }
-        if let exclusive {
-            params.append("exclusive" => exclusive)
-        }
-        return Request<List>(method: .put, path: "/api/v1/lists/\(listID)", body: ParametersBody(params))
     }
     
     public static func delete(_ listID: String) -> Request<Empty> {
@@ -70,13 +59,5 @@ public struct List: ListProtocol, Decodable, Equatable, Hashable, Sendable {
     private enum CodingKeys: String, CodingKey {
         case id
         case title
-        case replyPolicy = "replies_policy"
-        case exclusive
-    }
-}
-
-extension List {
-    public enum ReplyPolicy: String, Codable, Hashable, CaseIterable, Sendable {
-        case followed, list, none
     }
 }

Packages/Pachyderm/Sources/Pachyderm/Model/MastodonError.swift

@@ -11,20 +11,7 @@ import Foundation
 struct MastodonError: Decodable, CustomStringConvertible {
     var description: String
     
-    init(from decoder: Decoder) throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        if let error = try container.decodeIfPresent(String.self, forKey: .error) {
-            self.description = error
-        } else if let message = try container.decodeIfPresent(String.self, forKey: .message) {
-            self.description = message
-        } else {
-            throw DecodingError.keyNotFound(CodingKeys.error, .init(codingPath: container.codingPath, debugDescription: "Missing error or message key"))
-        }
-    }
-    
     private enum CodingKeys: String, CodingKey {
-        case error
+        case description = "error"
-        // used by pixelfed
-        case message
     }
 }

Packages/Pachyderm/Sources/Pachyderm/Model/Mention.swift

@@ -21,19 +21,7 @@ public struct Mention: Codable, Sendable {
         self.username = try container.decode(String.self, forKey: .username)
         self.acct = try container.decode(String.self, forKey: .acct)
         self.id = try container.decode(String.self, forKey: .id)
-        do {
         self.url = try container.decode(WebURL.self, forKey: .url)
-        } catch {
-            let s = try? container.decode(String.self, forKey: .url)
-            throw DecodingError.dataCorruptedError(forKey: .url, in: container, debugDescription: "Could not decode URL '\(s ?? "<failed to decode string>")'")
-        }
-    }
-    
-    public init(url: WebURL, username: String, acct: String, id: String) {
-        self.url = url
-        self.username = username
-        self.acct = acct
-        self.id = id
     }
     
     private enum CodingKeys: String, CodingKey {

Packages/Pachyderm/Sources/Pachyderm/Model/NodeInfo.swift

@@ -8,11 +8,11 @@
 
 import Foundation
 
-public struct NodeInfo: Decodable, Sendable, Equatable {
+public struct NodeInfo: Decodable, Sendable {
     public let version: String
     public let software: Software
     
-    public struct Software: Decodable, Sendable, Equatable {
+    public struct Software: Decodable, Sendable {
         public let name: String
         public let version: String
     }

Packages/Pachyderm/Sources/Pachyderm/Model/Notification.swift

@@ -7,7 +7,6 @@
 //
 
 import Foundation
-import WebURL
 
 public struct Notification: Decodable, Sendable {
     public let id: String
@@ -15,10 +14,6 @@ public struct Notification: Decodable, Sendable {
     public let createdAt: Date
     public let account: Account
     public let status: Status?
-    // Only present for pleroma emoji reactions
-    // Either an emoji or :shortcode: (for akkoma custom emoji reactions)
-    public let emoji: String?
-    public let emojiURL: WebURL?
     
     public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
@@ -32,12 +27,12 @@ public struct Notification: Decodable, Sendable {
         self.createdAt = try container.decode(Date.self, forKey: .createdAt)
         self.account = try container.decode(Account.self, forKey: .account)
         self.status = try container.decodeIfPresent(Status.self, forKey: .status)
-        self.emoji = try container.decodeIfPresent(String.self, forKey: .emoji)
-        self.emojiURL = try container.decodeIfPresent(WebURL.self, forKey: .emojiURL)
     }
 
     public static func dismiss(id notificationID: String) -> Request<Empty> {
-        return Request<Empty>(method: .post, path: "/api/v1/notifications/\(notificationID)/dismiss")
+        return Request<Empty>(method: .post, path: "/api/v1/notifications/dismiss", body: ParametersBody([
+                "id" => notificationID
+            ]))
     }
     
     private enum CodingKeys: String, CodingKey {
@@ -46,8 +41,6 @@ public struct Notification: Decodable, Sendable {
         case createdAt = "created_at"
         case account
         case status
-        case emoji
-        case emojiURL = "emoji_url"
     }
 }
 
@@ -61,7 +54,6 @@ extension Notification {
         case poll
         case update
         case status
-        case emojiReaction = "pleroma:emoji_reaction"
         case unknown
     }
 }

Packages/Pachyderm/Sources/Pachyderm/Model/Poll.swift

@@ -20,10 +20,6 @@ public struct Poll: Codable, Sendable {
     public let options: [Option]
     public let emojis: [Emoji]
     
-    public var effectiveExpired: Bool {
-        expired || (expiresAt != nil && expiresAt! < Date())
-    }
-    
     public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         self.id = try container.decode(String.self, forKey: .id)
@@ -38,6 +34,10 @@ public struct Poll: Codable, Sendable {
         self.emojis = try container.decodeIfPresent([Emoji].self, forKey: .emojis) ?? []
     }
     
+    public var effectiveExpired: Bool {
+        expired || (expiresAt != nil && expiresAt! < Date())
+    }
+    
     public static func vote(_ pollID: String, choices: [Int]) -> Request<Poll> {
         return Request<Poll>(method: .post, path: "/api/v1/polls/\(pollID)/votes", body: FormDataBody("choices" => choices, nil))
     }

Packages/Pachyderm/Sources/Pachyderm/Model/Preferences.swift

@@ -1,37 +0,0 @@
-//
-//  Preferences.swift
-//  Pachyderm
-//
-//  Created by Shadowfacts on 10/26/23.
-//
-
-import Foundation
-
-public struct Preferences: Codable, Sendable {
-    public let postingDefaultVisibility: Visibility
-    public let postingDefaultSensitive: Bool
-    public let postingDefaultLanguage: String
-    // Whether posts federate or not (local-only) on Hometown
-    public let postingDefaultFederation: Bool?
-    public let readingExpandMedia: ExpandMedia
-    public let readingExpandSpoilers: Bool
-    public let readingAutoplayGifs: Bool
-    
-    enum CodingKeys: String, CodingKey {
-        case postingDefaultVisibility = "posting:default:visibility"
-        case postingDefaultSensitive = "posting:default:sensitive"
-        case postingDefaultLanguage = "posting:default:language"
-        case postingDefaultFederation = "posting:default:federation"
-        case readingExpandMedia = "reading:expand:media"
-        case readingExpandSpoilers = "reading:expand:spoilers"
-        case readingAutoplayGifs = "reading:autoplay:gifs"
-    }
-}
-
-extension Preferences {
-    public enum ExpandMedia: String, Codable, Sendable {
-        case `default`
-        case always = "show_all"
-        case never = "hide_all"
-    }
-}

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

@@ -10,6 +10,4 @@ import Foundation
 public protocol ListProtocol {
     var id: String { get }
     var title: String { get }
-    var replyPolicy: List.ReplyPolicy? { get }
-    var exclusive: Bool? { get }
 }

Packages/Pachyderm/Sources/Pachyderm/Model/PushNotification.swift

@@ -1,46 +0,0 @@
-//
-//  PushNotification.swift
-//  Pachyderm
-//
-//  Created by Shadowfacts on 4/9/24.
-//
-
-import Foundation
-import WebURL
-
-public struct PushNotification: Decodable {
-    public let accessToken: String
-    public let preferredLocale: String
-    public let notificationID: String
-    public let notificationType: Notification.Kind
-    public let icon: WebURL
-    public let title: String
-    public let body: String
-    
-    public init(from decoder: any Decoder) throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        self.accessToken = try container.decode(String.self, forKey: .accessToken)
-        self.preferredLocale = try container.decode(String.self, forKey: .preferredLocale)
-        // this should be a string, but mastodon encodes it as a json number
-        if let s = try? container.decode(String.self, forKey: .notificationID) {
-            self.notificationID = s
-        } else {
-            let i = try container.decode(Int.self, forKey: .notificationID)
-            self.notificationID = i.description
-        }
-        self.notificationType = try container.decode(Notification.Kind.self, forKey: .notificationType)
-        self.icon = try container.decode(WebURL.self, forKey: .icon)
-        self.title = try container.decode(String.self, forKey: .title)
-        self.body = try container.decode(String.self, forKey: .body)
-    }
-    
-    private enum CodingKeys: String, CodingKey {
-        case accessToken = "access_token"
-        case preferredLocale = "preferred_locale"
-        case notificationID = "notification_id"
-        case notificationType = "notification_type"
-        case icon
-        case title
-        case body
-    }
-}

Packages/Pachyderm/Sources/Pachyderm/Model/PushSubscription.swift

@@ -9,144 +9,16 @@
 import Foundation
 
 public struct PushSubscription: Decodable, Sendable {
-    public var id: String
+    public let id: String
-    public var endpoint: URL
+    public let endpoint: URL
-    public var serverKey: String
+    public let serverKey: String
-    public var alerts: Alerts
+    //    TODO: WTF is this?
-    public var policy: Policy
+//    public let alerts
-    
-    public init(from decoder: any Decoder) throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        // id is documented as being a string, but mastodon returns a json number
-        if let s = try? container.decode(String.self, forKey: .id) {
-            self.id = s
-        } else {
-            let i = try container.decode(Int.self, forKey: .id)
-            self.id = i.description
-        }
-        self.endpoint = try container.decode(URL.self, forKey: .endpoint)
-        self.serverKey = try container.decode(String.self, forKey: .serverKey)
-        self.alerts = try container.decode(PushSubscription.Alerts.self, forKey: .alerts)
-        // added in mastodon 4.1.0
-        self.policy = try container.decodeIfPresent(PushSubscription.Policy.self, forKey: .policy) ?? .all
-    }
-    
-    public static func create(endpoint: URL, publicKey: Data, authSecret: Data, alerts: Alerts, policy: Policy) -> Request<PushSubscription> {
-        return Request(method: .post, path: "/api/v1/push/subscription", body: ParametersBody([
-            "subscription[endpoint]" => endpoint.absoluteString,
-            "subscription[keys][p256dh]" => publicKey.base64EncodedString(),
-            "subscription[keys][auth]" => authSecret.base64EncodedString(),
-            "data[alerts][mention]" => alerts.mention,
-            "data[alerts][status]" => alerts.status,
-            "data[alerts][reblog]" => alerts.reblog,
-            "data[alerts][follow]" => alerts.follow,
-            "data[alerts][follow_request]" => alerts.followRequest,
-            "data[alerts][favourite]" => alerts.favourite,
-            "data[alerts][poll]" => alerts.poll,
-            "data[alerts][update]" => alerts.update,
-            "data[alerts][pleroma:emoji_reaction]" => alerts.emojiReaction,
-            "data[policy]" => policy.rawValue,
-        ]))
-    }
-    
-    public static func update(alerts: Alerts, policy: Policy) -> Request<PushSubscription> {
-        return Request(method: .put, path: "/api/v1/push/subscription", body: ParametersBody([
-            "data[alerts][mention]" => alerts.mention,
-            "data[alerts][status]" => alerts.status,
-            "data[alerts][reblog]" => alerts.reblog,
-            "data[alerts][follow]" => alerts.follow,
-            "data[alerts][follow_request]" => alerts.followRequest,
-            "data[alerts][favourite]" => alerts.favourite,
-            "data[alerts][poll]" => alerts.poll,
-            "data[alerts][update]" => alerts.update,
-            "data[alerts][pleroma:emoji_reaction]" => alerts.emojiReaction,
-            "data[policy]" => policy.rawValue,
-        ]))
-    }
-    
-    public static func delete() -> Request<Empty> {
-        return Request(method: .delete, path: "/api/v1/push/subscription")
-    }
     
     private enum CodingKeys: String, CodingKey {
         case id
         case endpoint
         case serverKey = "server_key"
-        case alerts
+//        case alerts
-        case policy
-    }
-}
-
-extension PushSubscription {
-    public struct Alerts: Decodable, Sendable {
-        public let mention: Bool
-        public let status: Bool
-        public let reblog: Bool
-        public let follow: Bool
-        public let followRequest: Bool
-        public let favourite: Bool
-        public let poll: Bool
-        public let update: Bool
-        public let emojiReaction: Bool
-
-        public init(
-            mention: Bool,
-            status: Bool,
-            reblog: Bool,
-            follow: Bool,
-            followRequest: Bool,
-            favourite: Bool,
-            poll: Bool,
-            update: Bool,
-            emojiReaction: Bool
-        ) {
-            self.mention = mention
-            self.status = status
-            self.reblog = reblog
-            self.follow = follow
-            self.followRequest = followRequest
-            self.favourite = favourite
-            self.poll = poll
-            self.update = update
-            self.emojiReaction = emojiReaction
-        }
-        
-        public init(from decoder: any Decoder) throws {
-            let container: KeyedDecodingContainer<PushSubscription.Alerts.CodingKeys> = try decoder.container(keyedBy: PushSubscription.Alerts.CodingKeys.self)
-            self.mention = try container.decode(Bool.self, forKey: PushSubscription.Alerts.CodingKeys.mention)
-            // status added in mastodon 3.3.0
-            self.status = try container.decodeIfPresent(Bool.self, forKey: PushSubscription.Alerts.CodingKeys.status) ?? false
-            self.reblog = try container.decode(Bool.self, forKey: PushSubscription.Alerts.CodingKeys.reblog)
-            self.follow = try container.decode(Bool.self, forKey: PushSubscription.Alerts.CodingKeys.follow)
-            // follow_request added in 3.1.0
-            self.followRequest = try container.decodeIfPresent(Bool.self, forKey: PushSubscription.Alerts.CodingKeys.followRequest) ?? false
-            self.favourite = try container.decode(Bool.self, forKey: PushSubscription.Alerts.CodingKeys.favourite)
-            self.poll = try container.decode(Bool.self, forKey: PushSubscription.Alerts.CodingKeys.poll)
-            // update added in mastodon 3.5.0
-            self.update = try container.decodeIfPresent(Bool.self, forKey: PushSubscription.Alerts.CodingKeys.update) ?? false
-            // pleroma/akkoma only
-            self.emojiReaction = try container.decodeIfPresent(Bool.self, forKey: .emojiReaction) ?? false
-        }
-        
-        private enum CodingKeys: String, CodingKey {
-            case mention
-            case status
-            case reblog
-            case follow
-            case followRequest = "follow_request"
-            case favourite
-            case poll
-            case update
-            case emojiReaction = "pleroma:emoji_reaction"
-        }
-    }
-}
-
-extension PushSubscription {
-    public enum Policy: String, Decodable, Sendable {
-        case all
-        case followed
-        case followers
-        case none
     }
 }

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

@@ -27,13 +27,10 @@ public struct Relationship: RelationshipProtocol, Decodable, Sendable {
         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)
-        // not supported on pixelfed
+        self.mutingNotifications = try container.decode(Bool.self, forKey: .mutingNotifications)
-        self.mutingNotifications = try container.decodeIfPresent(Bool.self, forKey: .mutingNotifications) ?? false
         self.followRequested = try container.decode(Bool.self, forKey: .followRequested)
-        // not supported on pixelfed
+        self.domainBlocking = try container.decode(Bool.self, forKey: .domainBlocking)
-        self.domainBlocking = try container.decodeIfPresent(Bool.self, forKey: .domainBlocking) ?? false
+        self.showingReblogs = try container.decode(Bool.self, forKey: .showingReblogs)
-        // not supported on pixelfed
-        self.showingReblogs = try container.decodeIfPresent(Bool.self, forKey: .showingReblogs) ?? true
         self.endorsed = try container.decodeIfPresent(Bool.self, forKey: .endorsed) ?? false
     }
     

Packages/Pachyderm/Sources/Pachyderm/Model/Scope.swift

@@ -12,7 +12,6 @@ public enum Scope: String, Sendable {
     case read
     case write
     case follow
-    case push
 }
 
 extension Array where Element == Scope {

Packages/Pachyderm/Sources/Pachyderm/Model/SearchOperatorType.swift

@@ -1,19 +0,0 @@
-//
-//  SearchOperatorType.swift
-//  Pachyderm
-//
-//  Created by Shadowfacts on 10/1/23.
-//
-
-import Foundation
-
-public enum SearchOperatorType: String, CaseIterable, Equatable, Sendable {
-    case has
-    case `is`
-    case language
-    case from
-    case before
-    case during
-    case after
-    case `in`
-}

Packages/Pachyderm/Sources/Pachyderm/Model/SearchResults.swift

@@ -10,7 +10,7 @@ import Foundation
 
 public struct SearchResults: Decodable, Sendable {
     public let accounts: [Account]
-    public let statuses: [TryDecode<Status>]
+    public let statuses: [Status]
     public let hashtags: [Hashtag]
     
     private enum CodingKeys: String, CodingKey {

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

@@ -10,9 +10,6 @@ import Foundation
 import WebURL
 
 public final class Status: StatusProtocol, Decodable, Sendable {
-    /// The pseudo-visibility used by instance types (Akkoma) that overload the visibility for local-only posts.
-    public static let localPostVisibility: String = "local"
-    
     public let id: String
     public let uri: String
     public let url: WebURL?
@@ -44,9 +41,6 @@ public final class Status: StatusProtocol, Decodable, Sendable {
     public let poll: Poll?
     // Hometown, Glitch only
     public let localOnly: Bool?
-    public let editedAt: Date?
-    
-    public let pleromaExtras: PleromaExtras?
     
     public var applicationName: String? { application?.name }
     
@@ -54,22 +48,12 @@ public final class Status: StatusProtocol, Decodable, Sendable {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         self.id = try container.decode(String.self, forKey: .id)
         self.uri = try container.decode(String.self, forKey: .uri)
-        do {
         self.url = try container.decodeIfPresent(WebURL.self, forKey: .url)
-        } catch {
-            let s = try? container.decode(String.self, forKey: .url)
-            if s == "" {
-                self.url = nil
-            } else {
-                throw DecodingError.dataCorrupted(.init(codingPath: container.codingPath + [CodingKeys.url], debugDescription: "Could not decode URL '\(s ?? "<failed to decode string>")'", underlyingError: error))
-            }
-        }
         self.account = try container.decode(Account.self, forKey: .account)
         self.inReplyToID = try container.decodeIfPresent(String.self, forKey: .inReplyToID)
         self.inReplyToAccountID = try container.decodeIfPresent(String.self, forKey: .inReplyToAccountID)
         self.reblog = try container.decodeIfPresent(Status.self, forKey: .reblog)
-        // pixelfed statuses may have null content
+        self.content = try container.decode(String.self, forKey: .content)
-        self.content = try container.decodeIfPresent(String.self, forKey: .content) ?? ""
         self.createdAt = try container.decode(Date.self, forKey: .createdAt)
         self.emojis = try container.decodeIfPresent([Emoji].self, forKey: .emojis) ?? []
         self.reblogsCount = try container.decode(Int.self, forKey: .reblogsCount)
@@ -83,7 +67,7 @@ public final class Status: StatusProtocol, Decodable, Sendable {
             self.visibility = visibility
             self.localOnly = try container.decodeIfPresent(Bool.self, forKey: .localOnly)
         } else if let s = try? container.decode(String.self, forKey: .visibility),
-                  s == Status.localPostVisibility {
+                  s == "local" {
             // hacky workaround for #332, akkoma describes local posts with a separate visibility
             self.visibility = .public
             self.localOnly = true
@@ -99,9 +83,6 @@ public final class Status: StatusProtocol, Decodable, Sendable {
         self.bookmarked = try container.decodeIfPresent(Bool.self, forKey: .bookmarked)
         self.card = try container.decodeIfPresent(Card.self, forKey: .card)
         self.poll = try container.decodeIfPresent(Poll.self, forKey: .poll)
-        self.editedAt = try container.decodeIfPresent(Date.self, forKey: .editedAt)
-        
-        self.pleromaExtras = try container.decodeIfPresent(PleromaExtras.self, forKey: .pleromaExtras)
     }
     
     public static func getContext(_ statusID: String) -> Request<ConversationContext> {
@@ -124,12 +105,6 @@ public final class Status: StatusProtocol, Decodable, Sendable {
         return request
     }
     
-    public static func getReactions(_ statusID: String, emoji: String, range: RequestRange = .default) -> Request<[Account]> {
-        var request = Request<[Account]>(method: .get, path: "/api/v1/statuses/\(statusID)/reactions/\(emoji)")
-        request.range = range
-        return request
-    }
-    
     public static func delete(_ statusID: String) -> Request<Empty> {
         return Request<Empty>(method: .delete, path: "/api/v1/statuses/\(statusID)")
     }
@@ -179,18 +154,6 @@ public final class Status: StatusProtocol, Decodable, Sendable {
         return Request<Status>(method: .post, path: "/api/v1/statuses/\(statusID)/unmute")
     }
     
-    public static func source(_ statusID: String) -> Request<StatusSource> {
-        return Request(method: .get, path: "/api/v1/statuses/\(statusID)/source")
-    }
-    
-    public static func history(_ statusID: String) -> Request<[StatusEdit]> {
-        return Request(method: .get, path: "/api/v1/statuses/\(statusID)/history")
-    }
-    
-    public static func translate(_ statusID: String) -> Request<Translation> {
-        return Request(method: .post, path: "/api/v1/statuses/\(statusID)/translate")
-    }
-    
     private enum CodingKeys: String, CodingKey {
         case id
         case uri
@@ -221,16 +184,7 @@ public final class Status: StatusProtocol, Decodable, Sendable {
         case card
         case poll
         case localOnly = "local_only"
-        case editedAt = "edited_at"
-        
-        case pleromaExtras = "pleroma"
     }
 }
 
 extension Status: Identifiable {}
-
-extension Status {
-    public struct PleromaExtras: Decodable, Sendable {
-        public let context: String?
-    }
-}

Packages/Pachyderm/Sources/Pachyderm/Model/StatusEdit.swift

@@ -1,38 +0,0 @@
-//
-//  StatusEdit.swift
-//  Pachyderm
-//
-//  Created by Shadowfacts on 5/11/23.
-//
-
-import Foundation
-
-public struct StatusEdit: Decodable, Sendable {
-    public let content: String
-    public let spoilerText: String
-    public let sensitive: Bool
-    public let createdAt: Date
-    public let account: Account
-    public let poll: Poll?
-    public let attachments: [Attachment]
-    public let emojis: [Emoji]
-    
-    enum CodingKeys: String, CodingKey {
-        case content
-        case spoilerText = "spoiler_text"
-        case sensitive
-        case createdAt = "created_at"
-        case account = "account"
-        case poll
-        case attachments = "media_attachments"
-        case emojis
-    }
-    
-    public struct Poll: Decodable, Sendable {
-        public let options: [Option]
-        
-        public struct Option: Decodable, Sendable {
-            public let title: String
-        }
-    }
-}

Packages/Pachyderm/Sources/Pachyderm/Model/StatusSource.swift

@@ -1,20 +0,0 @@
-//
-//  StatusSource.swift
-//  Pachyderm
-//
-//  Created by Shadowfacts on 5/10/23.
-//
-
-import Foundation
-
-public struct StatusSource: Decodable, Sendable {
-    public let id: String
-    public let text: String
-    public let spoilerText: String
-    
-    enum CodingKeys: String, CodingKey {
-        case id
-        case text
-        case spoilerText = "spoiler_text"
-    }
-}

Packages/Pachyderm/Sources/Pachyderm/Model/Timeline.swift

@@ -32,14 +32,12 @@ extension Timeline {
         }
     }
     
-    func request(range: RequestRange) -> Request<[TryDecode<Status>]> {
+    func request(range: RequestRange) -> Request<[Status]> {
-        var request = Request<[TryDecode<Status>]>(method: .get, path: endpoint)
+        var request: Request<[Status]> = Request<[Status]>(method: .get, path: endpoint)
         if case .public(true) = self {
             request.queryParameters.append("local" => true)
         }
         request.range = range
-        // 206 can happen when the timeline is being regenerated and therefore is incomplete
-        request.additionalAcceptableHTTPCodes = [206]
         return request
     }
 }