Test with simple swift promises

See https://shadowfacts.net/2020/simple-swift-promises/

.gitignore

@@ -1,5 +1,3 @@
-Dist.xcconfig
-Tusker.xcconfig
 .DS_Store
 MyPlayground.playground/
 

.gitmodules

@@ -1,3 +1,12 @@
+[submodule "SwiftSoup"]
+	path = SwiftSoup
+	url = git://github.com/scinfu/SwiftSoup.git
+[submodule "Cache"]
+	path = Cache
+	url = git@github.com:hyperoslo/Cache.git
+[submodule "Gifu"]
+	path = Gifu
+	url = git://github.com/kaishin/Gifu.git
 [submodule "Embassy"]
 	path = Embassy
 	url = https://github.com/envoy/Embassy.git

CHANGELOG.md

@@ -1,842 +0,0 @@
-# Changelog
-
-## 2023.2 (68)
-Bugfixes:
-- Fix crash when inserting present items in empty timeline
-- Fix extra spacing above content in conversation main status
-
-## 2023.2 (67)
-Features/Improvements:
-- Try to resolve remote statuses and show conversation screen when tapping status links
-- Add loading indicator to conversation screen
-- Improve collapse/expand animation on conversation screen
-
-## 2023.2 (66)
-Features/Improvements:
-- Improve design of link preview card
-- Show loading indicator during timeline state restoration
-
-Bugfixes:
-- iPadOS/macOS: Fix some keyboard shortcuts not working
-- Fix crash when restoring timeline state
-- Fix status collapse button disappearing when navigating away
-- Fix crash when status swipe action takes too long to complete
-- Fix tapping expand thread cell not working
-
-## 2023.1 (64)
-Features/Improvements:
-- Add Delete Post action to statuses
-- Add follower/following counts and lists to profiles
-- Show better message when opening conversation for deleted status
-- Add pagination for showing all accounts that favorited/reblogged a status
-
-Bugfixes:
-- Fix race condition causing crash when syncing timeline position from iCloud
-- Fix profile header buttons not adjusting to Dynamic Type
-- Don't show report button for your own posts
-- Fix avatars on timeline not reverting from grayscale when turning off preference
-
-## 2023.1 (63)
-Bugfixes:
-- Fix status cells being inset too much on iPhones
-- Fix more things not adjusting to accent color preference
-- Fix various views not being keyboard focusable
-- Add more logging around state restoartion crash
-
-## 2023.1 (62)
-Features/Improvements:
-- Add New List action in Add to List menu
-
-Bugfixes:
-- Fix crash when retrying follow hashtag
-- Fix separators on timeline not being properly inset
-- Fix various elements not adjusting to the accent color preference
-- Prevent all pinned timelines from being removed, which would previously crash
-- Fix crash when handling search activity
-
-## 2023.1 (61)
-Features/Improvements:
-- Add report UI
-- Add accent color preference
-- Start playing videos immediately when gallery opens
-
-Bugfixes:
-- Fix crash when trying to load deleted status for state restoration/sync
-- Fix crash when trying to restore state for non-pinned timeline
-- Fix crash due to relationships being cached longer than their corresponding accounts
-- Fix crash if preferences change when there are cells that haven't yet been displayed
-- Fix crash when displaying poll finished notifications
-
-## 2023.1 (60)
-Features/Improvements:
-- Allow sharing gifv attachments
-- Add email subject when sharing status/account
-
-Bugfixes:
-- Fix crash when inserting present items after navigating away from and returning to timeline
-- Fix error decoding statuses from certain instances
-- When logging out, remove the scene's active account rather than the most recently activated
-
-## 2022.1 (59)
-This build is a hotfix for a crash when migrating saved instances to iCloud.
-
-## 2022.1 (58)
-Features/Improvements:
-- Sync timeline positions via iCloud
-- Add pinned timelines customization (synced via iCloud)
-- Sync saved hashtags & instances via iCloud
-- Add filters for hiding reblogs and replies from home timeline
-- Show uncropped attachments in the timeline for posts that have only one attachment
-- Add more prominent Follow button to profile pages
-- Add About and Acknowledgements pages to Preferences
-- Automatically report certain kinds of errors
-- iPadOS/macOS: Add window titles to indicate which account is in use
-- iPadOS: Limit content to readable width
-- VoiceOver: Improve label for toggle collapse button in conversation view
-
-Bugfixes:
-- Fix attachments in timeline somtimes being untappable
-- Fix previewing links in the main status in a conversation activating the link
-- Don't show reblog swipe action when reblogging is forbidden
-- Fix unknown notifications appearing in the Mentions view
-- Fix crash when fetching present items in certain circumstances
-- Fix relationship (following/blocked/etc.) change breaking profile header layout
-- Fix crash when restored timeline state includes unloaded statuses
-- macOS: Fix add attachment buttons not matching system accent color
-
-## 2022.1 (53)
-Features/Improvements:
-- Apply filters to Trending Posts
-- Don't reload List timelines if Edit screen is closed without changes
-
-Bugfixes:
-- Fix URLs getting pasted as broken attachments in the Compose screen
-- Fix monspace fonts not adjusting to Dynamic Type setting
-- Fix crash when activating account from Preferences when My Profile is opened in a separate window
-- Fix Preferences showing wrong account as current when multiple windows with different accounts are open
-
-## 2022.1 (52)
-Features/Improvements:
-- Save and restore position for all timelines and all accounts
-	- As a side effect of this change, the first time you launch with this update, the timeline position will be lost
-- Add preference to never blur attachments
-- New segmented control for timeline switcher that scrolls when there's not enough space
-- Copy status expand all setting when viewing More Replies in a converstaion
-- Include followed hashtags in the Explore screen and iPad sidebar
-- Allow saving or following hashtag from Add Hashtag screen
-- Scroll long attachment descriptions in the gallery
-- VoiceOver: Improve Profile Directory
-- VoiceOver: Include attachment descriptions in timeline items when not marked as sensitive
-
-Bugfixes:
-- Fix swipe actions preference not persisting
-- Fix rich text list bullets/numbers appearing black in dark mode
-- Fix crash when previewing non-HTTP(S) link
-- Fix images from Safari pasting as URLs rather than attachments
-- Fix Trending Posts appearing to reload forever
-- Fix controls reappearing when swiping between pages in the attachments gallery
-- Fix reblog confirmation alert actions missing hover effect
-- Fix status reply/visibility/local icons flashing blue when expanding a status
-- iPad: Fix My Profile item sidebar item not updating when avatar style changes
-- iPad: Fix tapping status bar not scrolling to top in single-column navigation mode
-- VoiceOver: Fix crash when scrolling through local/federated timeline
-- VoiceOver: Fix escape gesture not working in attachment gallery
-- VoiceOver: Fix custom emoji not being stripped from display names
-
-## 2022.1 (51)
-Features/Improvements:
-- Clarify text for conversation main status favorite/reblog count preference
-- Improve timeline refresh behavior
-	- Present posts are inserted automatically, creating a gap
-	- Tapping the Jump to Present bubble scrolls to the top and removes everything below the gap
-- Add preference to disable timeline state restoration (Preferences -> Behavior)
-- VoiceOver: Add Jump to Present action on the timeline selector segmented control
-- VoiceOver: Add accessibility hint for segmented controls when using the group navigation mode
-- VoiceOver: Improve description of timeline gap and add actions to load in a specific direction
-
-Bugfixes:
-- Fix crash due to change cache location on disk
-- Fix potential crash when trying to restore statuses that aren't available
-- Fix saving expired filters not re-enabling them
-- Fix tusker:// URL scheme not working
-- Fix Trending Posts reloading constantly
-- Fix crash when timeline tries to refresh while in the background
-
-## 2022.1 (50)
-This is a hotfix for Dynamic Type not working in the timeline. The previous build's changelog is included below.
-
-## 2022.1 (49)
-The major new feature of this build is filters! Filters are editable by pressing the Filters button in the top-left corner of the Home tab. Filters are currently applied to timelines and profiles (filtering conversations and notifications will be added in a future build).
-
-Features/Improvements:
-- Filters
-	- Edit/create filters
-	- Apply filters to timelines and profiles
-- Add preference to customize swipe actions on status cells (Preferences -> Appearance -> Leading/Trailing Swipe Actions)
-- Show notifications for edited posts
-- Add more details to the relationship label on profiles
-	- "Follows you", "You follow", "You follow each other", and "You block"
-- Add state restoration for Federated and Local timelines
-	- Also fixes an issue where posts from other timelines would appear in the home timeline after a relaunch
-- Add state restoration for Compose screen
-- Organize expanded custom emoji picker by category
-- Add indicator for locked profiles
-- Add cache size info to Advanced preferences
-- Indicate when a followed hashtag caused a post to appear in the home timeline
-- Add hashtag follow/unfollow actions
-- Completely replace timeline items after Jump to Present used
-	- Fixes infinite scroll not being usable after jumping
-- iPad/Mac: Add Cmd+Return shortcut for sending post on the Compose screen
-- VoiceOver: Hide redundant information on Compose screen
-- VocieOver: Add links/mentions/hashtags to actions rotor on statuses
-- VoiceOver: Add show profile action to timeline statuses
-
-Bugfixes:
-- Fix gifv attachments appearing off-center
-- Fix long status on certain screens not getting collapsed
-- Fix error when refreshing a timeline with no items
-- Fix cells in account list and status action account list not being deselected when navigating back
-- Limit search in Edit List screen to accounts the user follows
-- Fix attachments disappearing from statuses on the Conversation screen
-- Fix extra space gap appearing in profile headers below avatar
-- Fix mute duration options not including 1 week
-- Hometown: Fix local-only state not being copied from the replied-to post
-- iPad: Fix timeline statuses not getting deselected when entering split navigation
-- iPad: Fix Mute screen using pointless two-column layout
-- iPad: Fix creating a list from the sidebar making the previous tab inaccessible
-- iPad: Fix creating a list not showing the Edit List screen automatically
-- iPad: Fix selected sidebar item becoming out-of-sync when deleting a list/hashtag/instance
-- Mac: Workaround for pressing Cmd+1/2/... crashing
-	- This prevents the crash, but the actions remain unusable due to a macOS bug
-- VoiceOver: Fix escape gesture not working on Compose screen
-- VoiceOver: Fix links in conversation main status not being selectable
-- VoiceOver: Fix profile relationship not being read
-- VoiceOver: Fix not being able to select profile from conversation main status
-
-Known Issues:
-- Filters are not applied to notifications and conversations
-
-## 2022.1 (48)
-This build is a hotfix for the CW button in the Compose screen not working. The previous build's changelog is attached below.
-
-Bugfixes:
-- Fix pressing CW button in Compose not showing the content warning field
-- Tweak timeline state restoration to try and maintain the scroll position of the middle item on screen, rather than the top one
-
-## 2022.1 (46)
-The headlining feature is state restoration and timeline gaps! When you re-open the app after it's been closed for a while, it will remember your position in the timeline and allow you to keep reading from there. It will also let you jump all the way to the present.
-
-Features/Improvements:
-- Timeline state restoration, timeline gaps, and jump-to-present
-- Allow posting wide color gamut images on Mastodon 4
-- Add Add to List menu action to profiles
-- Improve More Actions button visibility on dark profile header images
-- Make poll options in the Compose screen reorderable with drag & drop
-- Embiggen Share/Close controls in the gallery to make them easier to tap
-- Separate section for Shared Albums in the Compose attachment picker
-- Indicate verified profile links with a checkmark and popover explaining what it means
-- Add a preference for using the Twitter-style keyboard with @ and # (Preferences -> Composing -> Show @ and # on Keyboard)
-- Improve reblog indicator in timeline
-
-Bugfixes:
-- Fix not being able to select an existing draft to edit it
-- Fix double-tap to zoom in the gallery not working
-- Fix crash when toggling collapsed posts in Trending Posts
-- Fix albums in asset picker not being sorted by name
-- Fix profile headers getting squished when statuses are loaded while the profile is offscreen
-- Fix error loading posts when server returns rich cards
-- Fix Akkoma instnaces not being detected as supporting Pleroma features
-- Fix crash when launching the app in slow network conditions
-- Fix lists not updating in the UI when renamed
-- Fix follow/block/mute actions displaying on the user's own profile
-- Fix Edit List screen being presented repeatedly when switching tabs back to Explore with a list open
-- Fix reblog visibility icon getting squished in the reblog confirmation dialog when Dynamic Type is active
-- Fix toasts not adjusting to Dynamic Type size
-- Don't show duplicate reply/favorite/reblog actions in the status More Actions menu
-- iPadOS 15: Fix toolbar in Compose window being obscured by the keyboard
-
-## 2022.1 (45)
-Features/Improvements:
-- iPhone: Temporarily hide the Compose screen by swiping down to access the rest of the applies
-- Add Block, Domain Block, and Mute actions to accounts
-- Don't change scroll position when switch sections in the Profile screen
-- Use URL keyboard in the instance selector and clarify that you can enter any domain
-- iPad: Add context menu action for deleting lists in sidebar
-- Tweak conditions in which profile fields are shown in a single column, rather than two
-- Convert wide color gamut images to sRGB before uploading
-	- The Mastodon backend does not support wide-gamut images and does a poor job of conversion, so the conversion is performed locally
-- Focus content warning field immediately when CW button is pressed
-- Move focus to main text field when return key is pressed while editing the content warning
-- Make GIF attachments animate on the Compose screen
-- VoiceOver: Make profile fields accessible
-- VoiceOver: Only read content warning and not content for CW'd posts
-- VoiceOver: Expand collapsed posts when performing double-tap
-- VoiceOver: Announce visibility of followers-only & direct posts
-- VoiceOver: Make Compose toolbar accessible
-
-Bugfixes:
-- Fix tapping links in profile fields
-- Fix crash when creating/editing list fails
-- Fix renaming a list not updating it elsewhere in the UI
-- Fix instance-local/everywhere scope selector in Profile Directory being flipped
-- Fix context menu previews of attachments not working
-- Fix caret not scrolling into view when opening Compose
-- Fix cells in the Drafts list being too small to tap
-- Fix refresh failing when initial load failed
-- Fix video controls in the gallery being too close to the edge of the screen
-- Fix error when decoding malformed notifications
-- Fix reblog with visibility not being available on Hometown instances
-- Fix visibility dropdown being shown in confirm reblog alert even when unavailable
-- Fix confirm reblog alert not adjusting to Dynamic Type
-- Fix layout issues with replies on Compose screen
-- macOS: Fix GIFs dragged from Finder posting static images
-
-Known Issues:
-- Drag/drop to add attachments when composting a post does not work
-
-## 2022.1 (44)
-Features/Improvements:
-- Dynamic Type support
-- Improve performance when displaying statuses with large numbers of custom emojis
-- Add preference for default reply visibility
-- Add preference to turn off blurring media in posts with content warnings
-
-Bugfixes:
-- Fix drawing background flashing between black/white in dark mode
-- Fix undo scroll-to-top not working in release builds
-- Fix favorite and reblog menu actions not working
-- Fix avatar in compose being wrongly aligned on short statuses
-- Fix posts that are tall but have few characters not getting collapsed
-- Fix crash when profile screen is closed for the profile loads
-
-## 2022.1 (43)
-Features/Improvements:
-- Re-add undo scroll-to-top by tapping the status bar a second time
-- Convert hashtag/list/instance timelines to use new timeline implementation
-- Clarify warning on Post Content Type preference
-
-Bugfixes:
-- Fix crash when refreshing profile before it loaded
-- Fix crash when tapping Load More when infinite scrolling is disabled
-- Fix crash when profile screen is closed before loading finishes
-- Fix having to tap Cancel twice to dismiss Find Instance screen
-
-## 2022.1 (42)
-Features/Improvements:
-- Add automatic crash reporting
-- Tweak spacing on timeline statuses
-
-Bugfixes:
-- Fix status collapse/expand not animating on profiles
-- Fix crash when opening profile for unloaded account (e.g., by tapping mentions)
-- macOS: Add workaround for Follow/Unfollow menu item never loading
-
-## 2022.1 (41)
-Features/Improvements:
-- Rewrite profile screens to use new timeline implementation
-	- Disable Infinite Scrolling preference (Preferences -> Digital Wellness) now applies to profiles
-	- Improve behavior when switching tabs on profiles
-- Improve pointer interaction on timeline status cells
-
-Bugfixes:
-- Fix crash when loading images in certain circumstances
-- Fix gallery dismissal leaving status bar hidden and breaking future gallery dismisses
-- Fix timeline scroll position changing after dismissing gallery
-- Fix images flickering when switching back to the Home tab
-- Fix crash reporter being dismissed when sending email is cancelled
-- Fix crash when long pressing Send Report button in crash reporter on iPad
-- Fix Live Text controls not hiding when other gallery controls are hidden
-- Fix replies appearing multiple times in Drafts list
-- Fix crash when displaying blur hash images on Pleroma
-
-## 2022.1 (40)
-Bugfixes:
-- Fix selecting reblogged statuses in the timeline
-- Fix links/mentions/hashtags in the timeline not being tappable
-- Fix mentions from Misskey opening in the browser rather than the profile screen
-- Fix crash when leaving timeline tab before it finished loading
-- Fix status cells in the timeline not deselected when tapped in split navigation mode on iPad
-- Fix keyboard shortcuts not working on iPad
-
-## 2022.1 (39)
-This is a(nother) hotfix for the previous build. Their changelogs are included below.
-
-Bugfixes:
-- Fix instance selector screen crashing on iOS 15
-
-## 2022.1 (38)
-This is a hotfix for the previous build. Its changelog is included below.
-
-Bugfixes:
-- Fix sensitive attachments not being hidden on the timeline
-- Fix timeline descriptions appearing repeatedly
-- iPadOS: Fix occasional crash when hovering over text
-
-## 2022.1 (37)
-This is the first build with the rewritten/rearchitected timeline screen. In future builds, this will roll out to the notifications and profile screens as well, but for now it's only used in the home tab. If you encounter crashes or errors, please report them. If you see a blue error bubble pop up, you can long-press it to send an error report.
-
-Features/Improvements:
-- Display error messages when favoriting/reblogging fails
-
-Bugfixes:
-- iOS 15: (hopefully) fix lock-related crash
-- Fix crash when loading indicator is shown multiple times
-
-Known Issues:
-- Videos played from the timeline do not enter picture-in-picture mode when backgrounding the app
-- Status expand/collapse animations on other screens do not match timelines
-
-Other:
-- X-Callback-URL support has been removed
-
-## 2022.1 (36)
-This build is a hotfix for a crash when refreshing on Pixelfed.
-
-## 2022.1 (35)
-Features/Improvements:
-- Add loading indicator to timelines/notifications/profiles
-- Show status preview in reblog confirmation dialog (Preferences -> Behavior -> Require confirmation Before Reblogging)
-- Add reblogging with unlisted/private visibility (requires reblog confirmation to be enabled)
-- Fix controls not hiding on iPhone 14 Pro
-- Improve account switching animation
-
-Bugfixes:
-- Fix crash when resizing window on iPad
-- Fix poll vote count displaying random number
-- Fix crash when opening emoji picker on instances that have duplicate emojis
-
-## 2022.1 (33)
-Features/Improvements:
-- Show notifications when subscribed to other people's posts
-- Use context menu for filter/sort in Profile Directory
-- Enable data detectors (flight numbers, addresses, shippment numbers, phone numbers, currency (iOS 16), and physical units (iOS 16)) for the main status in Conversation
-- iPadOS: Two column navigation
-  - In potrait orientation with the sidebar hidden, or in landscape, Tusker uses two column navigation on iPad
-  - Selecting something will open a second column in which navigation takes place
-  - The second column can be closed from its top level
-  - You can drill down farther inside the second column
-  - Selecting a different item in the first column replaces the second column
-- iPadOS: Move Trending Hashtags/Links to Explore screen (formerly Search)
-  - Trending Statuses and Profile Directory will also be moved in a future version
-- iPadOS: Add context menu action for deleting drafts
-- iOS 16: Add Live Text to images in the gallery view
-- iOS 16: Show favorite/reblog context menu actions
-- iOS 16: Show full size previews when long-pressing attachments on the Compose screen
-- iOS 16: Show formatting actions in edit menu on Compose screen
-
-Bugfixes:
-- Fix attachments on Pleroma not being served as the correct content type
-- Fix not being able to open some hashtags with non-ASCII characters
-- Fix crash when leaving the app shortly after opening it
-- Fix crash when loading notifications on Pixelfed
-- Fix crash due to retain cycle when changing preferences
-- iPadOS: Fix crash when opening a conversation in a new window
-
-## 2022.1 (31)
-Bugfixes:
-- Fix not being able to post attachments with descriptions
-- Fix potential crash when displaying certain notifications
-- More detailed error message when decoding invalid URLs
-
-## 2022.1 (30)
-Features/Improvements:
-- Add fast account switching on iPad
-- Add "Add Account" option to fast account switcher
-- Show "# more replies" indicator in conversation in more circumstances
-- When refreshing notifications, new ones are grouped with existing notifications
-- Add subtitles to explain post visibility options
-- Improve error messages when posting a video fails
-- Display error messages instead of crashing when certain actions fail
-
-Bugfixes:
-- Fix Shortcuts actions not working in some circumstances
-- Fix CW field growing wider than the screen
-- Fix saved hashtags not persisting
-- Fix not being able to long-press error-message bubbles
-- Fix follow context menu item not updating after following
-- Fix not being able to log in to certain Pixelfed instances
-- Fix crash when closing the app
-- Fix crash when loading profile screen
-- Fix crash when refreshing polls
-- Fix crash when poll voting fails
-- Fix crash when accepting/rejecting a follow request fails
-- Fix saved hashtags being sorted with case-sensitivity
-- Fix multiple lines of text with emojis getting squashed together
-- iPad: Fix Shortcuts actions showing wrong window type
-- Mac: Fix Cmd+N shortcut not opening Compose window
-- iPad/Mac: Fix Send Message action not mentioning account
-
-## 2022.1 (27)
-Features/Improvements:
-- Add emoji picker button to Compose screen toolbar
-- Preference to disable reply/like/reblog/more buttons on statuses in the timeline
-- iPad: Sidebar toggle button
-
-Bugfixes:
-- Fix crash when displaying malformed statuses
-
-## 2022.1 (26)
-This build contains hotfixes for several crashes that may occur when logged-in to a Pixelfed account.
-
-## 2022.1 (25)
-Features/Improvements:
-- Improve error reporting for non-crash errors
-  - Long-press on the blue error bubble to send a report
-- Improve error feedback during login process
-- Add Trending Post and Trending Links on Mastodon 3.5
-- Add Digital Wellness preference to disable Discover
-- Basic support for GotoSocial
-- Reduce app file size
-
-Bugfixes:
-- Fix all statues appearing as pinned on Pixelfed
-- Fix crash when refreshing My Profile
-- Fix My Profile never loading in some circumstances
-- Fix crash the first time the attachment picker is opened
-- Fix crash when closing certain screens
-- Fix certain links in posts not being detected 
-
-## 2022.1 (24)
-Features/Improvements:
-- Local only posts (Glitch/Hometown)
-  - Show indicator for local only posts
-  - Add local only option to Compose screen
-- Add extend selection button to asset picker when the limited library was used
-- Improve profile directory UI
-- Improve scrolling performance with large attachments on older devices
-
-Bugfixes:
-- Fix crash when closing Preferences
-- Fix crash when posting attachment fails
-- Fix scrolling through compose autocomplete suggestions dismissing keyboard
-- Only show Mute action on your own posts
-
-## 2021.1 (23)
-Features/Improvements:
-- Synchronize GIF playback through animations and in gallery
-  - Known Issue: This does not currently work with GIFVs used by Mastodon instances.
-
-Bugfixes:
-- Fix crash when a conversation fails to load
-- Fix gallery dismissal breaking public timelines
-- Fix gallery dismissal going in the wrong direction when the gesture was started slowly
-
-## 2021.1 (22)
-This is the first public beta build of Tusker, so if you're just joining us, welcome! Not too many new features this build, mostly bugfixes, so test everything and generally use the app.
-
-Features/Improvements:
-- Add timeline descriptions the first time you view federated/local
-- Show messages when loading posts fails or when there are no newer posts
-
-Bugfixes:
-- Fix crash after editing lists
-- Fix crash when refreshing before anything is loaded
-- Fix crash when fetching recommended instances fails
-- Fix crash when replying to posts with code formatting
-- Fix crash when changing preferences after switching accounts
-
-## 2021.1 (21)
-This is a quick follow-up to the previous build with fixes for a couple major crashes. Unfortunately, due to a bug in iOS 14, the Disable Infinite Scrolling preference now requires the iOS 15 beta to use. It may return in a future build if I can find a workaround, but it's disabled in the meantime.
-
-Features/Improvements:
-- iPadOS 15: Add Open in New Window context menu action to sidebar items
-
-Bugfixes:
-- Fix crash when editing accounts in a list
-- Fix crash when refreshing timeline on iOS 14
-- Fix(ish) crash when opening collapsed status with Disable Infinite Scrolling active on iOS 15
-
-## 2021.1 (20)
-This is a big one! In addition to a bunch of fixes for anyone on the iOS 15 beta, there are a couple of big ticket features, including the Open in Tusker action extension and the Disable Infinite Scrolling preference.
-
-Features/Improvements:
-- Add Open in Tusker action extension
-  - Quickly search for any URL in Tusker
-  - In a share sheet, scroll to the bottom, tap "Edit Actions..." and turn on the "Open in Tusker" action
-- Add Digital Wellness preference to disable infinite scrolling
-- Add fast account switching indicator to My Profile tab
-- Improve VoiceOver accessibility of polls and timeline statuses
-- iPadOS: Create multiple main windows for different accounts by dragging from an account in Preferences
-- iPadOS: Delete attachments on Compose screen by right-clicking and selecting Delete
-- iPadOS 15: Add Open in New Window context menu action to most things
-- iPadOS 15: Allow dragging the Compose sheet into a separate window
-
-Bugfixes:
-- Fix being unable to commit previewed account from timeline status
-- Fix crash when searching fails
-- Fix poll option percentages being cut off
-- Fix polls not collapsing inside CWs
-- Fix More button on profiles not being accessible with VoiceOver
-- Fix VoiceOver reading profile fields in incorrect order
-- Fix gallery animations jittering on devices with square screens (iPads, non-notched iPhones)
-- Fix CW text jumping around post collapse animation
-- iOS 15: Fix crash due when showing Draw Something screen in Compose
-- iPadOS 14/iOS 15: Fix navigation bar turning transparent after opening the attachment gallery
-- iPadOS 14/iOS 15: Fix drag-selecting poll options initiating a status cell drag interaction
-- iPadOS: Fix crash when loading a previously-opened conversation window
-- iPadOS 15: Fix showing Compose screen when keyboard focus moves through the sidebar
-
-Known Issues:
-- Disable Infinite Scrolling preference only affects timelines, not notifications or profiles
-- iPadOS 15: The Compose sheet cannot be dismissed by swiping down
-- iPadOS 15: Keyboard focus is stuck in the sidebar
-
-## 2021.1 (19)
-This is an emergency fix for Tusker breaking when connecting to Mastodon instances on 3.4.0rc1.
-
-Bugfixes:
-- Fix crash when connecting to Mastodon 3.4.0rc1
-- Fix crash when loading notifications fails
-
-## 2021.1 (18)
-Polls! They're finally here. There will likely be another build in the next several weeks to polish some things off before WWDC, so if you've encountered any issues, now's the time to let me know :)
-
-Features/Improvements:
-- Show polls on posts
-- Add authoring polls to Compose screen
-- Add poll completed notifications
-- Add preference for requiring confirmation before reblogging
-
-Bugfixes:
-- Fix cursor movement not working in Compse text field when an emoji was entered
-- Fix several crashes related to network requests failing
-- Show assets in attachment picker immediately after permissions is initially granted
-- Fix crash when tapping non-HTTP(S) link with the In-App Safari preference enabled
-
-Known Issues:
-- Polls with between 23h30m and 24h left show as "0 weeks remaining"
-
-## 2021.1 (17)
-The main improvement this build is a complete overhaul of the Conversation screen, along with fixes for a few different crashes.
-
-Features/Improvements:
-- Group replies by thread on Conversation screen
-- Adding Trending Hashtags and Profile Directory to Explore screen (Mastodon only)
-
-Bugfixes:
-- Fix crash when editing List members
-- Fix crash when re-opening Preferences after switching accounts
-- Fix crash when refreshing profiles in some circumstances
-
-## 2021.1 (16)
-This build fixes a number of crashes and significantly improves performance on older devices.
-
-Features/Improvements:
-- Significantly improve performance when scrolling through timelines
-
-Bugfixes:
-- Fix crash when timeline or profile went offscreen
-- Fix crash when refreshing profile too quickly
-- iPadOS: Fix secondary windows not respecting theme preference
-- Fix refreshes breaking after a refresh which did not return new results
-
-## 2020.1 (15)
-There are a whole bunch of new features in this release, in addition to a slew of bugfixes. The big ticket items are multi-window support on iPadOS and fast account switching on iPhone (fast account switching will be supported on iPads in a future build).
-
-Features/Improvements:
-- Add fast account switching on iPhone
-  - Long-press on the My Profile tab and drag up to select another account
-  - Add account switching animation
-- iPadOS: Add multiple windows
-  - Drag and drop statuses and accounts on timelines into auxiliary windows
-  - Drag and drop sidebar items into new windows
-  - Drag and drop Compose drafts into new windows
-- Add key commands
-  - ⌘R to refresh timelines
-  - ⌘N to Compose a post
-  - ⌘B/⌘I text formatting on Compose screen
-  - ⇧⌘[/⇧⌘] to switch between sub-tabs
-  - iPadOS: ⌘1/⌘2/⌘3/⌘4/⌘5 to select sidebar items
-- Show link cards on statuses
-- Add Grayscale Images preference to Digital Wellness
-- Add preference for applying opposite collapse behavior for specific keywords
-
-Bugfixes:
-- Fix statuses not appearing on My Profile until scrolling
-- Fix crashes when scrolling through timelines
-- Fix logging into PixelFed instances
-  - Interacting with PixelFed instances remains only partially supported
-- Enlarge expand/collapse button tap area
-- Fix cursor disappearing behind keyboard when typing attachment descriptions
-- Fix crash when viewing custom emojis with spaces in their URLs
-- Fix split view not working in landscape on Plus/Max iPhones
-- Minor performance improvements
-
-## 2020.1 (13)
-This is another quick build to fix a couple of severe issues on the Compose screen.
-
-Features/Improvements:
-- When composing posts, ensure the cursor is always visible and does not scroll below the keyboard while typing
-
-Bugfixes:
-- Fix builtin iOS keyboard suggestions not working in text fields on the Compose screen
-- Fix crash when ending dictation in the CW field
-- Fix broken layout on the Compose when replying to certain posts
-
-## 2020.1 (12)
-This build is a hotfix for the issue of being unable to login to certain instances. The changelog for the previous build is included below.
-
-## 2020.1 (11)
-This release is primarily focused on bug fixes with the one key feature of autocomplete suggestions when typing in the Compose screen. It also fixes an issue on the various new sizes of iPhone 12, so if you're getting a new device, make sure to update.
-
-Features/Improvements:
-- Add autocompletion on Compose screen
-  - Autocomplete provides suggestions for @-mentions, hashtags, and emojis as you're typing in the post body
-  - Provides suggestions for emojis as you're typing in the CW field
-  - Type a colon and expand the emoji suggestions to view all custom emoji on your instance
-  - Hashtag suggestions prioritize trending and saved hashtags, in addition to searching all hashtags on your instance
-  - Account suggestions prioritize accounts that you follow or that follow you, as well as searching all accounts known to your instance
-- Show custom emojis in users' display names in follow, favorite, and reblog notifications
-- Enable picture-in-picture playback of video attachments
-  - iOS 14: Automatically enter picture-in-picture when closing the app while a video is playing
-- Correctly positiong gallery controls on iPhone 12-family devices
-- Round corners of the avatar on the My Profile tab icon
-- Remove extraneous U+FFFC characters inserted by dictation when posting
-- Add swipe to remove accounts in Preferences
-
-Bugfixes:
-- Fix not being able to tap placeholders in Compose
-- Fix broken layout on Compose screen when replying to very long posts
-- Fix crash when opening Compose or My Profile too quickly after launch
-- Upload photos taken with the in-app camera as JPEGs instead of PNGs
-  - Fixes an issue where Mastodon would incorrectly believe the file size to be too large
-- Fix crash when using home screen shortcuts
-- Disable rotating into landscape on iPhone on iOS 14
-- Fix assorted other crashes and memory leaks
-
-## 2020.1 (10)
-This build is a hotfix for a couple pressing issues. The changelog for the previous build is included below.
-
-Bugfixes:
-- Fix crash when opening Preferences while signed in with a deleted account
-- Fix visibility and content warning not being copied when replying to a post
-
-## 2020.1 (9)
-The marquee feature of this build is the new and improved Compose screen. It's been rewritten to use SwiftUI, is significantly more resilient to data loss, and now shows the toolbar when the main text field is not focused. It also turns out Apple is surprise-releasing iOS 14 very soon (or possibly already has, depending when you're reading this). For those who were not already on the beta train, iOS 14 brings a number of new features including a sidebar on iPadOS and lots and lots of context menus (a home screen widget is coming Soon™).
-
-Known Issues:
-- Pasting images to create attachments when composing a post is not currently supported due to an iOS bug (#109)
-- Full-size previews do not display in context menus for attachments on the Compose screen due to an iOS issue (#110)
-
-Features/Improvements:
-- Rewrite Compose screen using SwiftUI
-  - Prevent draft posts being lost if the app crahes or is killed by the system while composing
-  - Show toolbar while post content is not being edited
-  - Save post visibility in drafts
-  - Move Draw Something action out of the context menu
-  - iOS 14: Use context menus for setting post visibility
-- Show BlurHash previews for attachments on Mastodon
-- Add Expand All Content Warnings preference (Preferences -> Behavior)
-- Add Collapse Long Posts preference (Preferences -> Behavior)
-- Improve image gallery opening animation
-- Use fade in/out animations for opening/closing gallery and attachment picker when the Reduce Motion system setting is enabled
-  - iOS 14: Also requires the "Prefer Cross Fade" setting be enabled
-- Slightly reduce default status font sizes
-- Add "Direct Message" context menu action to Compose button on profile screen
-- Allow viewing attachments and navigating through posts/accounts on instance public timelines
-
-Bugfixes:
-- Fix errors when uploading attachments not displaying
-- Fix attachments not posting in the correct, user-specified order
-- Fix accounts displaying with outdated information (avatars, display names, etc.)
-- Fix Compose not showing button on profile screen
-- Fix navigation title not being set on profile screen
-- Fix follow notifications not showing names for users without display names set
-- iPadOS 14: Fix crash when resizing app in split view mode
-
-## 2020.1 (8)
-This is just an emergency build to fix crashes on iOS 13 when selecting attachments. The changelog of the previous build is included below.
-
-Features/Improvements:
-- Enlarge tap targets on status reply/favorite/reblog/more buttons
-- Disable automatic GIF playback when Low Power Mode is enabled
-- Show custom emoji in user profile field names
-
-Bugfixes:
-- Fix crash when attempting to add attachments on iOS 13
-- Fix potential crashes
-
-## 2020.1 (7)
-This is the first update since WWDC and the introduction of iOS 14. As such, most of the focus has been on fixing iOS 14-specific problems. However, there are still a couple new features, both for those on the iOS 14 beta and those not.
-
-Features/Improvements:
-- Add toggle between Posts, Posts and Replies, and Media on user profiles
-  - Remove 'Show Replies in Profiles' preference
-- Limit link preview animation to only link text
-- Add additional context menu actions for statuses, accounts, and hashtags
-- Add semi-translucent background to image descriptions, so they're legible against light images
-- iPadOS 14: Add sidebar
-  - When using multitasking on iPad and switching in and out of "compact" mode, the active tab as well as the navigation history for all tabs will be transferred between the sidebar and tab bar modes.
-- iOS 14: Use context menus on status/account '...' buttons
-- iOS 14: Replace 'More' status swipe action with 'Share'
-
-Bugfixes:
-- Fix crash when attempting to change post visibility on iPad
-- Fix attachment view corners not being rounded
-- Fix crash when viewing instance public timelines
-- Fix Preferences button not appearing on My Profile tab
-- Fix tapping current tab bar item not scrolling to top
-- Fix crash showing audio attachments on Mastodon
-- Fix timeline refreshing forever
-- Set app category (fixes usage not being categorized correctly under Screen Time)
-- iOS 14: Fix crash when searching for instances
-- iOS 14: Fix crash when displaying accounts with no pinned posts
-- iOS 14: Fix crash when displaying search results
-
-## 2020.1 (6)
-This is the pre-WWDC update with lots of bugfixes and some small features. There will likely be another build this week to fix any pressing issues that arise from iOS 14.
-
-Features/Improvements:
-- Add mute/unmute conversation status action
-- iPadOS: Add pointer interactions to remove attachment button, gallery view share/dismiss buttons
-- Disable reblog button for direct/followers-only posts
-  - On Pleroma, the reblog button is still enabled for your own followers-only posts to match Pleroma's "Boost to original audience" feature.
-- Add preference to always display status visibilities below account avatars
-- Add preference to show reply indicators for statuses in timelines
-- Show share/dismiss controls and image description for gifv attachments
-  - 'Share' is currently disabled for gifv attachments, it will be enabled in a future build
-- Add crash report helper
-  - If the app detects that it crashed the last time it was running, it will allow you to review the crash report and email it to me
-- Add Recognize Text context menu option for images on the Compose screen
-  - This uses iOS' builtin Vision framework to perform on-device OCR and generate an image description from the recognized text
-- Tweak attachment previews to always have a 16:9 aspect ratio
-
-Bugfixes:
-- Fix account/status More actions not working
-- Improve share sheet loading speed
-- Fix crash when loading bookmarks
-- Prompt for Photos access before showing photo picker. Prevents empty sheet displaying.
-- Fix profile fields not displaying and improve layout
-- Fix profile header image not displaying the first time an account is loaded
-- Don't show Follow action for your own account
-- Fix attachments on the Compose screen being cut-off above the home indicator  on iPhone X-style devices
-- Fix audio being played by other apps pausing when displaying a gifv attachment on Mastodon
-
-
-## 2020.1 (5)
-The main focus of this update has been switching to using CoreData internally to cache/synchronize the most up-to-date versions of all statuses. Currently, this does not provide any new functionality, however, it lays the groundwork for several significant features coming in the future, including multiple window support on iPadOS and state restoration/persistence between launches.
-
-Even though there aren't a huge number of new features in this build, a great deal has changed under the hood. As such, this build may suffer somewhat in the stability department. Please bear with me and report any issues you encounter; you can send me a message on the fediverse, email me at me@shadowfacts.net, or file an issue on the project issue tracker at https://git.shadowfacts.net/shadowfacts/Tusker/issues. Thank you!
-
-Features:
-- iPadOS: Add pointer interactions to status action buttons and profile header button
-- iPadOS: Allow scrolling w/ trackpad/magic mouse to dismiss attachment gallery
-- iPadOS: Enable interactive push gesture with trackpad/magic mouse
-- Add drawing attachments using PencilKit
-  - Long-press to open context menu on the 'Add Attachment' button on the Compose screen, select 'Draw Something'
-  - Supports Apple Pencil on iPad, including tilt and pressure sensitivity
-- Add avatar and instance domain in accounts switcher in Preferences
-- Show gifv attachments on Mastodon
-  - Currently doesn't show attachment description or share/close buttons
-- Add 'Clear Cache' option to Preferences -> Advanced for debugging
-
-Bugfixes:
-- Fix size of attachment previews in context menu
-- Fix previewing audio/video attachments
-- Fix incorrect image size during attachment expand/shrink animation
-- Prevent avatars in grouped action notification from overflowing the cell and hiding the timestamp
-- Fix text in conversation main statuses not being de-selectable
-- Fix scroll-to-top sometimes not scrolling all the way to the top
-- Fix account profile descriptions being squashed in the follow notification account list
-
-

Cache

@@ -0,0 +1 @@
+Subproject commit 8c42c575cf28b2ff0e780c9728721e9a8891c92e

Documentation/X-Callback-URL.md

@@ -0,0 +1,355 @@
+# X-Callback-URLs in Tusker
+
+Tusker supports inter-app-communication using the [X-Callback-URL standard](http://x-callback-url.com/).
+
+In short, requests are performed by opening the URL `tusker://x-callback-url/[request]` (where `[request]` is one of the requests listed below) with a variety of parameters.
+
+## Callbacks
+
+X-Callback-URLs support three types of callbacks: on success, on cancellation, and on error. Callbacks are specified as query parameters whose keys identify which callback (`x-success`, `x-cancel`, and `x-error`) and whose values are other URLs that should be opened to run the callback.
+
+Data is passed to callbacks by adding additional query parameters to the callback URL. The `x-error` callback always returns a description of the error in the `error` parameter. Other data is provided depending on the request.
+
+### JSON Responses
+
+By default, callback data is included in URL query parameters of the callback URL. If the `json=true` parameter is provided, the response data will be encoded as JSON, converted to [Base64](https://developer.mozilla.org/en-US/docs/Web/API/WindowBase64/Base64_encoding_and_decoding), and provided in the `response` query parameter of the callback.
+
+## Silent Requests
+
+Tusker X-Callback-URL requests can be performed silently, without user confirmation. Each source app requires user permission on the first attempted silent action.
+
+To perform a silent request:
+
+1. Provide the `silent=true` URL query parameter in the request.
+
+2. Specify the `x-source` parameter. It must be a (human interpretable) name of the source application/service. If `x-source` is not specified, the error callback will be invoked with the error message:
+
+```
+Cannot perform silent action without source app, x-source parameter must be specified.
+```
+
+3. Depending on the current permission state of the source app, one of several things will happen:
+   1. If the permission is **undecided** (i.e. the user has neither accepted nor rejected the silent action request), an alert will be displayed notifying the user that the source app has requested permission to silently perform actions. After the user either accepts or rejects the request, execution will continue with that permission state.
+   2. **Accepted**: the request will be carried out silently and the appropriate callback executed.
+   3. **Rejected**: the request will be performed with the confirmation UI, as if the `silent` parameter had been false/unprovided.
+
+The silent actions permission state of a given source app is not exposed in the callback.
+
+## Other Notes
+
+#### Instance-Local IDs
+
+Instance-local IDs are provided for many responses and accept in place of URLs/URIs/qualified names in many requests. When possible, instance-local IDs should be preferred requests using them can often be performed faster because there's no need to perform a search query or make requests to remote instances.
+
+#### Qualified Usernames
+
+Qualified username refers to the domain-qualified identifier of an account. For example, `shadowfacts@social.shadowfacts.net`. They do not include a leading `@`.
+
+#### Dates
+
+Dates in responses are encoded as Unix timestamps.
+
+## Requests
+
+- [Accounts](#accounts)
+  - [`showAccount`](#showaccount)
+  - [`getCurrentUser`](#getcurrentuser)
+  - [`getAccount`](#getaccount)
+  - [`followUser`](#followuser)
+- [Statuses](#statuses)
+  - [`showStatus`](#showstatus)
+  - [`getStatus`](#getstatus)
+  - [`postStatus`](#poststatus)
+  - [`favoriteStatus`](#favoritestatus)
+  - [`reblogStatus`](#reblogstatus)
+- [Notifications](#notifications)
+  - [`getNotification`](#getnotification)
+  - [`getNotifications`](#getnotifications)
+  - [`dismissNotification`](#dismissnotification)
+  - [`dismissAllNotifications`](#dismissallnotifications)
+- [Instances](#instances)
+  - [`getCurrentInstance`](#getcurrentinstance)
+- [Misc](#misc)
+  - [`search`](#search)
+
+### Accounts
+
+#### `showAccount`
+
+Presents the given account in Tusker.
+
+##### Request
+
+| Parameter (type)     | Description                                                  | Optional |
+| -------------------- | ------------------------------------------------------------ | -------- |
+| `accountID` (string) | The instance-local ID of the account                         | Yes      |
+| `accountURL` (URL)   | The URL of the remote account                                | Yes      |
+| `acct` (string)      | The [qualified username](#qualifiedusernames) of the account | Yes      |
+
+##### Response
+
+No data if successful.
+
+#### `getCurrentUser`
+
+Retrieves the currently logged-in user. 
+
+##### Request
+
+No parameters.
+
+##### Response:
+
+| Parameter (type)       | Description                                   | Optional |
+| ---------------------- | --------------------------------------------- | -------- |
+| `username` (string)    | The [qualified username](#qualifiedusernames) | No       |
+| `displayName` (string) | The display name                              | No       |
+| `locked` (bool)        | Whether the user's account is locked          | No       |
+| `followers` (int)      | The number of followers the user has          | No       |
+| `following` (int)      | The number of accounts user is following      | No       |
+| `url` (URL)            | The URL of the user's account                 | No       |
+| `avatarURL` (URL)      | The URL of the user's avatar image            | No       |
+| `headerURL` (URL)      | The URL of the user's header image            | No       |
+
+#### `getAccount`
+
+Retrieves the given account details. One of `accountID`, `accountURL`, or `acct` must be provided.
+
+##### Request
+
+| Parameter (type)     | Description                                                  | Optional |
+| -------------------- | ------------------------------------------------------------ | -------- |
+| `accountID` (string) | The instance-local ID of the account                         | Yes      |
+| `accountURL` (URL)   | The URL/URI of the account                                   | Yes      |
+| `acct` (string)      | The [qualified username](#qualifiedusernames) of the account | Yes      |
+
+##### Response
+
+| Parameter (type)       | Description                                 | Optional |
+| ---------------------- | ------------------------------------------- | -------- |
+| `username` (string)    | The qualified username                      | No       |
+| `displayName` (string) | The display name                            | No       |
+| `locked` (bool)        | Whether the account is locked               | No       |
+| `followers` (int)      | The number of followers the account has     | No       |
+| `following` (int)      | The number of accounts account is following | No       |
+| `url` (URL)            | The URL of the account                      | No       |
+| `avatarURL` (URL)      | The URL of the account's avatar image       | No       |
+| `headerURL` (URL)      | The URL of the account's header image       | No       |
+
+#### `followUser`
+
+Follows the given account from the logged-in user's account. One of `accountID`, `accountURL`, or `acct` must be provided.
+
+##### Request
+
+| Parameter (type)     | Description                                                  | Optional |
+| -------------------- | ------------------------------------------------------------ | -------- |
+| `accountID` (string) | The instance-local ID of the account                         | Yes      |
+| `accountURL` (URL)   | The URL/URI of the account                                   | Yes      |
+| `acct` (string)      | The [qualified username](#qualifiedusernames) of the account | Yes      |
+
+##### Response
+
+| Parameter (type) | Description                     | Optional |
+| ---------------- | ------------------------------- | -------- |
+| `url` (URL)      | The URL of the followed account | No       |
+
+### Statuses
+
+#### `showStatus`
+
+Presents the given status in Tusker.
+
+##### Request
+
+| Parameter (type)    | Description                         | Optional |
+| ------------------- | ----------------------------------- | -------- |
+| `statusID` (string) | The instance-local ID of the status | Yes      |
+| `statusURL` (URL)   | The URL of a remote status          | Yes      |
+
+##### Response
+
+No data if successful.
+
+#### `getStatus`
+
+Retrieves the given status details. One of `statusID` or `statusURL` must be provided.
+
+##### Request
+
+| Parameter (type)    | Description                                                  | Optional |
+| ------------------- | ------------------------------------------------------------ | -------- |
+| `statusID` (string) | The instance-local ID of the status                          | Yes      |
+| `statusURL` (URL)   | The URL/URI of the status                                    | Yes      |
+| `html` (bool)       | Whether to return the content as HTML or plain-text only. Default: `false` (plain-text). | Yes      |
+
+##### Response
+
+| Parameter (type)     | Description                                                  | Optional |
+| -------------------- | ------------------------------------------------------------ | -------- |
+| `url` (URL)          | The URL of the status                                        | Yes      |
+| `uri` (string)       | The URI of the status                                        | No       |
+| `id` (string)        | The instance-local ID of the status                          |          |
+| `account` (string)   | The [qualified username](#qualifiedusernames) of the account that posted (or reblogged if `reblog` is present) the status | No       |
+| `inReplyTo` (string) | The instance-local ID of the status that this status is a reply to | Yes      |
+| `posted` (date)      | The date the status was posted                               | No       |
+| `content` (string)   | The content of the status (HTML if the `html` parameter was true, plain-text otherwise) | No       |
+| `reblog` (string)    | The **instance-local** ID of the status that this is a reblog of. If not present, this status was not a reblog. | Yes      |
+
+#### `postStatus`
+
+Posts a status from the logged-in user's account.
+
+Can be performed silently.
+
+##### Request
+
+| Parameter (type)    | Description                                                  | Optional |
+| ------------------- | ------------------------------------------------------------ | -------- |
+| `mentioning` (bool) | The [qualified username](#qualifiedusernames) to mention in the status | Yes      |
+| `text` (string)     | The text to post/pre-fill the status text field with         | Yes      |
+
+##### Response
+
+| Parameter (type)     | Description                  | Optional |
+| -------------------- | ---------------------------- | -------- |
+| `statusURL` (URL)    | The URL of the posted status | Yes      |
+| `statusURI` (string) | The URI of the posted status | No       |
+
+#### `favoriteStatus`
+
+Favorites the given status from the logged-in user's account. One of `statusID` or `statusURL` must be provided.
+
+Can be performed silently.
+
+##### Request
+
+| Parameter (type)    | Description                         | Optional |
+| ------------------- | ----------------------------------- | -------- |
+| `statusID` (string) | The instance-local ID of the status | Yes      |
+| `statusURL` (URL)   | The URL/URI of a status             | Yes      |
+
+##### Response
+
+| Parameter (type)     | Description                     | Optional |
+| -------------------- | ------------------------------- | -------- |
+| `statusURL` (URL)    | The URL of the favorited status | Yes      |
+| `statusURI` (string) | The URI of the favorited status | No       |
+
+#### `reblogStatus`
+
+Reblogs the given status from the logged-in user's account. One of `statusID` or `statusURL` must be provided.
+
+Can be performed silently.
+
+##### Request
+
+| Parameter (type)    | Description                         | Optional |
+| ------------------- | ----------------------------------- | -------- |
+| `statusID` (string) | The instance-local ID of the status | Yes      |
+| `statusURL` (URL)   | The URL/URI of a status             | Yes      |
+
+##### Response
+
+| Parameter (type)     | Description                     | Optional |
+| -------------------- | ------------------------------- | -------- |
+| `statusURL` (URL)    | The URL of the reblogged status | Yes      |
+| `statusURI` (string) | The URI of the reblogged status | No       |
+
+### Notifications
+
+#### `getNotification`
+
+Retrieves the given notification details.
+
+##### Request
+
+| Parameter (type)          | Description                               | Optional |
+| ------------------------- | ----------------------------------------- | -------- |
+| `notificationID` (string) | The instance-local ID of the notification | No       |
+
+##### Response
+
+| Parameter (type)     | Description                                                  | Optional |
+| -------------------- | ------------------------------------------------------------ | -------- |
+| `kind` (string)      | One of `mention`, `reblog`, `favourite`, or `follow`         | No       |
+| `date` (date)        | The date the notification was created.                       | No       |
+| `accountID` (string) | The instance-local ID of the account that sent the notification | No       |
+| `statusID` (string)  | The instance-local ID of the status associated with the notification. Not applicable for `kind=follow`. | Yes      |
+
+#### `getNotifications`
+
+Retrieves the most recent notifications.
+
+##### Request
+
+| Parameter (type) | Description                                          | Optional |
+| ---------------- | ---------------------------------------------------- | -------- |
+| `count` (int)    | The number of notifications to retrieve. Default: 20 | Yes      |
+
+##### Response
+
+| Parameter (type)         | Description                                                | Optional |
+| ------------------------ | ---------------------------------------------------------- | -------- |
+| `notifications` (string) | A comma-delimited array of instance-local notification IDs | No       |
+
+#### `dismissNotification`
+
+Dismisses the given notification.
+
+##### Request
+
+| Parameter (type)        | Description                               | Optional |
+| ----------------------- | ----------------------------------------- | -------- |
+| `notification` (string) | The instance-local ID of the notification | No       |
+
+##### Response
+
+No response data if successful.
+
+#### `dismissAllNotifications`
+
+Dismisses all notifications.
+
+##### Request
+
+No parameters.
+
+##### Response
+
+No data if successful.
+
+### Instances
+
+#### `getCurrentInstance`
+
+Retrieves the current instance details.
+
+##### Request
+
+No parameters.
+
+##### Response
+
+| Parameter (type)          | Description                                             | Optional |
+| ------------------------- | ------------------------------------------------------- | -------- |
+| `uri` (string)            | The instance URI                                        | No       |
+| `name` (string)           | The instance name                                       | No       |
+| `description` (string)    | The instance description                                | No       |
+| `contactAccount` (string) | The instance-local ID of the instance's contact account | No       |
+
+
+### Misc
+
+#### `search`
+Performs a search in Tusker with the given query
+
+##### Request
+
+| Parameter (type) | Description              | Optional |
+| ---------------- | ------------------------ |--------- |
+| `query` (string) | The search query to use. | No       |
+
+##### Response
+
+No data if successful.

Gifu

@@ -0,0 +1 @@
+Subproject commit ed572f53ce58b8e23499abeb3a926033cbe480f7

OpenInTusker/Action.js

@@ -1,29 +0,0 @@
-//
-//  Action.js
-//  OpenInTusker
-//
-//  Created by Shadowfacts on 5/22/21.
-//  Copyright © 2021 Shadowfacts. All rights reserved.
-//
-
-var Action = function() {};
-
-Action.prototype = {
-
-    run: function(arguments) {
-        const results = {
-            url: window.location.href,
-        };
-        const el = document.querySelector('link[rel=alternate][type="application/activity+json"]');
-        if (el) {
-            results.activityPubURL = el.href;
-        }
-        arguments.completionFunction(results);
-    },
-
-    finalize: function(arguments) {
-    }
-
-};
-
-var ExtensionPreprocessingJS = new Action();

OpenInTusker/ActionViewController.swift

@@ -1,100 +0,0 @@
-//
-//  ActionViewController.swift
-//  OpenInTusker
-//
-//  Created by Shadowfacts on 5/23/21.
-//  Copyright © 2021 Shadowfacts. All rights reserved.
-//
-
-import UIKit
-import MobileCoreServices
-
-class ActionViewController: UIViewController {
-
-    @IBOutlet weak var imageView: UIImageView!
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        
-        findURLFromWebPage { (components) in
-            if let components = components {
-                self.searchForURLInApp(components)
-            } else {
-                self.findURLItem { (components) in
-                    if let components = components {
-                        self.searchForURLInApp(components)
-                    }
-                }
-            }
-        }
-    }
-    
-    private func findURLFromWebPage(completion: @escaping (URLComponents?) -> Void) {
-        for item in extensionContext!.inputItems as! [NSExtensionItem] {
-            for provider in item.attachments! {
-                guard provider.hasItemConformingToTypeIdentifier(kUTTypePropertyList as String) else {
-                    continue
-                }
-                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,
-                          let components = URLComponents(string: urlString) else {
-                        completion(nil)
-                        return
-                    }
-                    
-                    completion(components)
-                }
-                return
-            }
-        }
-        
-        completion(nil)
-    }
-    
-    private func findURLItem(completion: @escaping (URLComponents?) -> Void) {
-        for item in extensionContext!.inputItems as! [NSExtensionItem] {
-            for provider in item.attachments! {
-                guard provider.hasItemConformingToTypeIdentifier(kUTTypeURL as String) else {
-                    continue
-                }
-                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)
-                        return
-                    }
-                    completion(components)
-                }
-                return
-            }
-        }
-        
-        completion(nil)
-    }
-    
-    private func searchForURLInApp(_ components: URLComponents) {
-        var components = components
-        components.scheme = "tusker"
-        self.openURL(components.url!)
-        self.extensionContext!.completeRequest(returningItems: nil, completionHandler: nil)
-    }
-
-    @objc private func openURL(_ url: URL) {
-        var responder: UIResponder = self
-        while let parent = responder.next {
-            if let application = parent as? UIApplication {
-                application.perform(#selector(openURL(_:)), with: url)
-                break
-            } else {
-                responder = parent
-            }
-        }
-    }
-    
-    @IBAction func done() {
-        extensionContext!.completeRequest(returningItems: nil, completionHandler: nil)
-    }
-
-}

OpenInTusker/Base.lproj/MainInterface.storyboard

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="ObA-dk-sSI">
-    <device id="retina6_1" orientation="portrait" appearance="light"/>
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="System colors in document resources" minToolsVersion="11.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <scenes>
-        <!--Image-->
-        <scene sceneID="7MM-of-jgj">
-            <objects>
-                <viewController title="Image" id="ObA-dk-sSI" customClass="ActionViewController" customModule="OpenInTusker" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="zMn-AG-sqS">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="528"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <navigationBar contentMode="scaleToFill" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="NOA-Dm-cuz">
-                                <rect key="frame" x="0.0" y="44" width="320" height="44"/>
-                                <items>
-                                    <navigationItem id="3HJ-uW-3hn">
-                                        <barButtonItem key="leftBarButtonItem" title="Done" style="done" id="WYi-yp-eM6">
-                                            <connections>
-                                                <action selector="done" destination="ObA-dk-sSI" id="Qdu-qn-U6V"/>
-                                            </connections>
-                                        </barButtonItem>
-                                    </navigationItem>
-                                </items>
-                            </navigationBar>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Unable to find Mastodon link on this page." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yho-gp-VyR">
-                                <rect key="frame" x="0.0" y="254" width="320" height="20.5"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                        </subviews>
-                        <viewLayoutGuide key="safeArea" id="VVe-Uw-JpX"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                        <constraints>
-                            <constraint firstItem="VVe-Uw-JpX" firstAttribute="trailing" secondItem="NOA-Dm-cuz" secondAttribute="trailing" id="A05-Pj-hrr"/>
-                            <constraint firstItem="NOA-Dm-cuz" firstAttribute="leading" secondItem="VVe-Uw-JpX" secondAttribute="leading" id="HxO-8t-aoh"/>
-                            <constraint firstItem="Yho-gp-VyR" firstAttribute="centerY" secondItem="zMn-AG-sqS" secondAttribute="centerY" id="R7q-OB-hhA"/>
-                            <constraint firstItem="Yho-gp-VyR" firstAttribute="leading" secondItem="VVe-Uw-JpX" secondAttribute="leading" id="TEy-zi-dP7"/>
-                            <constraint firstItem="Yho-gp-VyR" firstAttribute="trailing" secondItem="VVe-Uw-JpX" secondAttribute="trailing" id="Uvn-0x-Y6N"/>
-                            <constraint firstItem="NOA-Dm-cuz" firstAttribute="top" secondItem="VVe-Uw-JpX" secondAttribute="top" id="we0-1t-bgp"/>
-                        </constraints>
-                    </view>
-                    <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-                    <size key="freeformSize" width="320" height="528"/>
-                    <connections>
-                        <outlet property="view" destination="zMn-AG-sqS" id="Qma-de-2ek"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="X47-rx-isc" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="-61" y="-57"/>
-        </scene>
-    </scenes>
-    <resources>
-        <systemColor name="systemBackgroundColor">
-            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-        </systemColor>
-    </resources>
-</document>

OpenInTusker/Info.plist

@@ -1,55 +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>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleDisplayName</key>
-	<string>Open in Tusker</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
-	<key>CFBundleShortVersionString</key>
-	<string>$(MARKETING_VERSION)</string>
-	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
-	<key>NSExtension</key>
-	<dict>
-		<key>NSExtensionAttributes</key>
-		<dict>
-			<key>NSExtensionActivationRule</key>
-			<dict>
-				<key>NSExtensionActivationSupportsAttachmentsWithMinCount</key>
-				<integer>1</integer>
-				<key>NSExtensionActivationSupportsWebPageWithMaxCount</key>
-				<integer>1</integer>
-				<key>NSExtensionActivationSupportsWebURLWithMaxCount</key>
-				<integer>1</integer>
-			</dict>
-			<key>NSExtensionJavaScriptPreprocessingFile</key>
-			<string>Action</string>
-			<key>NSExtensionServiceAllowsFinderPreviewItem</key>
-			<true/>
-			<key>NSExtensionServiceAllowsTouchBarItem</key>
-			<true/>
-			<key>NSExtensionServiceFinderPreviewIconName</key>
-			<string>NSActionTemplate</string>
-			<key>NSExtensionServiceTouchBarBezelColorName</key>
-			<string>TouchBarBezel</string>
-			<key>NSExtensionServiceTouchBarIconName</key>
-			<string>NSActionTemplate</string>
-		</dict>
-		<key>NSExtensionMainStoryboard</key>
-		<string>MainInterface</string>
-		<key>NSExtensionPointIdentifier</key>
-		<string>com.apple.ui-services</string>
-	</dict>
-</dict>
-</plist>

OpenInTusker/Media.xcassets/AppIcon.appiconset/Contents.json

@@ -1,103 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "20x20"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "20x20"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "29x29"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "40x40"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "60x60@2x.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "60x60"
-    },
-    {
-      "filename" : "60x60@3x.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "60x60"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "20x20"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "20x20"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "29x29"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "40x40"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "40x40"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "76x76"
-    },
-    {
-      "filename" : "76x76@2x.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "76x76"
-    },
-    {
-      "filename" : "83.5x83.5@2x.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "83.5x83.5"
-    },
-    {
-      "filename" : "1024x1024@1x.png",
-      "idiom" : "ios-marketing",
-      "scale" : "1x",
-      "size" : "1024x1024"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

OpenInTusker/Media.xcassets/Contents.json

@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

OpenInTusker/Media.xcassets/TouchBarBezel.colorset/Contents.json

@@ -1,14 +0,0 @@
-{
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  },
-  "colors" : [
-    {
-      "idiom" : "mac",
-      "color" : {
-        "reference" : "systemPurpleColor"
-      }
-    }
-  ]
-}

Pachyderm/Client.swift

@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import Combine
 
 /**
  The base Mastodon API client.
@@ -26,95 +27,106 @@ public class Client {
     
     public var timeoutInterval: TimeInterval = 60
     
-    static let decoder: JSONDecoder = {
+    lazy var decoder: JSONDecoder = {
         let decoder = JSONDecoder()
-        
         let formatter = DateFormatter()
         formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SZ"
         formatter.timeZone = TimeZone(abbreviation: "UTC")
         formatter.locale = Locale(identifier: "en_US_POSIX")
-        let iso8601 = ISO8601DateFormatter()
-        decoder.dateDecodingStrategy = .custom({ (decoder) in
-            let container = try decoder.singleValueContainer()
-            let str = try container.decode(String.self)
-            // for the next time mastodon accidentally changes date formats >.>
-            if let date = formatter.date(from: str) {
-                return date
-            } else if let date = iso8601.date(from: str) {
-                return date
-            } else {
-                throw DecodingError.typeMismatch(Date.self, .init(codingPath: container.codingPath, debugDescription: "unexpected date format"))
-            }
-        })
-        
+        decoder.dateDecodingStrategy = .formatted(formatter)
         return decoder
     }()
     
-    static let encoder: JSONEncoder = {
-        let encoder = JSONEncoder()
-        let formatter = DateFormatter()
-        formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SZ"
-        formatter.timeZone = TimeZone(abbreviation: "UTC")
-        formatter.locale = Locale(identifier: "en_US_POSIX")
-        encoder.dateEncodingStrategy = .formatted(formatter)
-        return encoder
-    }()
-    
     public init(baseURL: URL, accessToken: String? = nil, session: URLSession = .shared) {
         self.baseURL = baseURL
         self.accessToken = accessToken
         self.session = session
     }
     
-    @discardableResult
-    public func run<Result>(_ request: Request<Result>, completion: @escaping Callback<Result>) -> URLSessionTask? {
-        guard let urlRequest = createURLRequest(request: request) else {
-            completion(.failure(Error(request: request, type: .invalidRequest)))
-            return nil
+    public func run<Result>(_ request: Request<Result>, completion: @escaping Callback<Result>) {
+        guard let request = createURLRequest(request: request) else {
+            completion(.failure(Error.invalidRequest))
+            return
         }
         
-        let task = session.dataTask(with: urlRequest) { data, response, error in
+        let task = session.dataTask(with: request) { data, response, error in
             if let error = error {
-                completion(.failure(Error(request: request, type: .networkError(error))))
+                completion(.failure(error))
                 return
             }
             guard let data = data,
                 let response = response as? HTTPURLResponse else {
-                    completion(.failure(Error(request: request, type: .invalidResponse)))
+                    completion(.failure(Error.invalidResponse))
                     return
             }
             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)))
+                let mastodonError = try? self.decoder.decode(MastodonError.self, from: data)
+                let error = mastodonError.flatMap { Error.mastodonError($0.description) } ?? Error.unknownError
+                completion(.failure(error))
                 return
             }
-            let result: Result
-            do {
-                result = try Client.decoder.decode(Result.self, from: data)
-            } catch {
-                completion(.failure(Error(request: request, type: .invalidModel(error))))
+            guard let result = try? self.decoder.decode(Result.self, from: data) else {
+                completion(.failure(Error.invalidModel))
                 return
             }
+            if var result = result as? ClientModel {
+                result.client = self
+            } else if var result = result as? [ClientModel] {
+                result.client = self
+            }
             let pagination = response.allHeaderFields["Link"].flatMap { $0 as? String }.flatMap(Pagination.init)
             
             completion(.success(result, pagination))
         }
         task.resume()
-        return task
+    }
+    
+    public func run<Result>(_ request: Request<Result>) -> Promise<(Result, Pagination?)> {
+        return Promise { (resolve, reject) in
+            self.run(request) { (response) in
+                switch response {
+                case let .success(result, pagination):
+                    resolve((result, pagination))
+                case let .failure(error):
+                    reject(error)
+                }
+            }
+        }
+    }
+    
+    public func run<Result: Decodable>(_ request: Request<Result>) -> AnyPublisher<(Result, Pagination?), Swift.Error> {
+        guard let request = createURLRequest(request: request) else {
+            return Fail(error: Error.invalidRequest).eraseToAnyPublisher()
+        }
+        return session.dataTaskPublisher(for: request)
+            .mapError { Error.urlError($0) }
+            .tryMap {
+                guard let response = $0.response as? HTTPURLResponse else {
+                    throw Error.invalidResponse
+                }
+                guard response.statusCode == 200 else {
+                    if let mastodonError = try? self.decoder.decode(MastodonError.self, from: $0.data) {
+                        throw Error.mastodonError(mastodonError.description)
+                    } else {
+                        throw Error.unknownError
+                    }
+                }
+                let result = try self.decoder.decode(Result.self, from: $0.data)
+                let pagination = response.allHeaderFields["Link"].flatMap { $0 as? String }.flatMap(Pagination.init)
+                return (result, pagination)
+            }
+            .eraseToAnyPublisher()
     }
     
     func createURLRequest<Result>(request: Request<Result>) -> URLRequest? {
         guard var components = URLComponents(url: baseURL, resolvingAgainstBaseURL: true) else { return nil }
-        components.path = request.endpoint.path
-        components.queryItems = request.queryParameters.isEmpty ? nil : request.queryParameters.queryItems
+        components.path = request.path
+        components.queryItems = request.queryParameters.queryItems
         guard let url = components.url else { return nil }
         var urlRequest = URLRequest(url: url, timeoutInterval: timeoutInterval)
         urlRequest.httpMethod = request.method.name
         urlRequest.httpBody = request.body.data
-        if let mimeType = request.body.mimeType {
-            urlRequest.setValue(mimeType, forHTTPHeaderField: "Content-Type")
-        }
+        urlRequest.setValue(request.body.mimeType, forHTTPHeaderField: "Content-Type")
         if let accessToken = accessToken {
             urlRequest.setValue("Bearer \(accessToken)", forHTTPHeaderField: "Authorization")
         }
@@ -123,7 +135,7 @@ public class Client {
     
     // MARK: - Authorization
     public func registerApp(name: String, redirectURI: String, scopes: [Scope], website: URL? = nil, completion: @escaping Callback<RegisteredApplication>) {
-        let request = Request<RegisteredApplication>(method: .post, path: "/api/v1/apps", body: ParametersBody([
+        let request = Request<RegisteredApplication>(method: .post, path: "/api/v1/apps", body: .parameters([
                 "client_name" => name,
                 "redirect_uris" => redirectURI,
                 "scopes" => scopes.scopeString,
@@ -140,7 +152,7 @@ public class Client {
     }
     
     public func getAccessToken(authorizationCode: String, redirectURI: String, completion: @escaping Callback<LoginSettings>) {
-        let request = Request<LoginSettings>(method: .post, path: "/oauth/token", body: ParametersBody([
+        let request = Request<LoginSettings>(method: .post, path: "/oauth/token", body: .parameters([
                 "client_id" => clientID,
                 "client_secret" => clientSecret,
                 "grant_type" => "authorization_code",
@@ -155,24 +167,6 @@ public class Client {
         }
     }
     
-    public func nodeInfo(completion: @escaping Callback<NodeInfo>) {
-        let wellKnown = Request<WellKnown>(method: .get, path: "/.well-known/nodeinfo")
-        run(wellKnown) { result in
-            switch result {
-            case let .failure(error):
-                completion(.failure(error))
-                
-            case let .success(wellKnown, _):
-                if let url = wellKnown.links.first(where: { $0.rel == "http://nodeinfo.diaspora.software/ns/schema/2.0" }),
-                   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)
-                }
-            }
-        }
-    }
-    
     // MARK: - Self
     public static func getSelfAccount() -> Request<Account> {
         return Request<Account>(method: .get, path: "/api/v1/accounts/verify_credentials")
@@ -217,37 +211,33 @@ public class Client {
     }
     
     public static func block(domain: String) -> Request<Empty> {
-        return Request<Empty>(method: .post, path: "/api/v1/domain_blocks", body: ParametersBody([
+        return Request<Empty>(method: .post, path: "/api/v1/domain_blocks", body: .parameters([
                 "domain" => domain
             ]))
     }
     
     public static func unblock(domain: String) -> Request<Empty> {
-        return Request<Empty>(method: .delete, path: "/api/v1/domain_blocks", body: ParametersBody([
+        return Request<Empty>(method: .delete, path: "/api/v1/domain_blocks", body: .parameters([
                 "domain" => domain
             ]))
     }
     
     // MARK: - Filters
-    public static func getFiltersV1() -> Request<[FilterV1]> {
-        return Request<[FilterV1]>(method: .get, path: "/api/v1/filters")
+    public static func getFilters() -> Request<[Filter]> {
+        return Request<[Filter]>(method: .get, path: "/api/v1/filters")
     }
     
-    public static func createFilterV1(phrase: String, context: [FilterV1.Context], irreversible: Bool? = nil, wholeWord: Bool? = nil, expiresIn: TimeInterval? = nil) -> Request<FilterV1> {
-        return Request<FilterV1>(method: .post, path: "/api/v1/filters", body: ParametersBody([
+    public static func createFilter(phrase: String, context: [Filter.Context], irreversible: Bool? = nil, wholeWord: Bool? = nil, expiresAt: Date? = nil) -> Request<Filter> {
+        return Request<Filter>(method: .post, path: "/api/v1/filters", body: .parameters([
                 "phrase" => phrase,
                 "irreversible" => irreversible,
                 "whole_word" => wholeWord,
-                "expires_in" => expiresIn,
+                "expires_at" => expiresAt
             ] + "context" => context.contextStrings))
     }
     
-    public static func getFilterV1(id: String) -> Request<FilterV1> {
-        return Request<FilterV1>(method: .get, path: "/api/v1/filters/\(id)")
-    }
-    
-    public static func getFiltersV2() -> Request<[FilterV2]> {
-        return Request(method: .get, path: "/api/v2/filters")
+    public static func getFilter(id: String) -> Request<Filter> {
+        return Request<Filter>(method: .get, path: "/api/v1/filters/\(id)")
     }
     
     // MARK: - Follows
@@ -262,11 +252,7 @@ public class Client {
     }
     
     public static func followRemote(acct: String) -> Request<Account> {
-        return Request<Account>(method: .post, path: "/api/v1/follows", body: ParametersBody(["uri" => acct]))
-    }
-    
-    public static func getFollowedHashtags() -> Request<[Hashtag]> {
-        return Request(method: .get, path: "/api/v1/followed_tags")
+        return Request<Account>(method: .post, path: "/api/v1/follows", body: .parameters(["uri" => acct]))
     }
     
     // MARK: - Lists
@@ -279,12 +265,12 @@ public class Client {
     }
     
     public static func createList(title: String) -> Request<List> {
-        return Request<List>(method: .post, path: "/api/v1/lists", body: ParametersBody(["title" => title]))
+        return Request<List>(method: .post, path: "/api/v1/lists", body: .parameters(["title" => title]))
     }
     
     // MARK: - Media
     public static func upload(attachment: FormAttachment, description: String? = nil, focus: (Float, Float)? = nil) -> Request<Attachment> {
-        return Request<Attachment>(method: .post, path: "/api/v1/media", body: FormDataBody([
+        return Request<Attachment>(method: .post, path: "/api/v1/media", body: .formData([
                 "description" => description,
                 "focus" => focus
             ], attachment))
@@ -298,17 +284,9 @@ public class Client {
     }
     
     // MARK: - Notifications
-    public static func getNotifications(allowedTypes: [Notification.Kind], range: RequestRange = .default) -> Request<[Notification]> {
+    public static func getNotifications(excludeTypes: [Notification.Kind], range: RequestRange = .default) -> Request<[Notification]> {
         var request = Request<[Notification]>(method: .get, path: "/api/v1/notifications", queryParameters:
-            "types" => allowedTypes.map { $0.rawValue }
-        )
-        request.range = range
-        return request
-    }
-    
-    public static func getNotifications(excludedTypes: [Notification.Kind], range: RequestRange = .default) -> Request<[Notification]> {
-        var request = Request<[Notification]>(method: .get, path: "/api/v1/notifications", queryParameters:
-            "exclude_types" => excludedTypes.map { $0.rawValue }
+            "exclude_types" => excludeTypes.map { $0.rawValue }
         )
         request.range = range
         return request
@@ -323,30 +301,20 @@ public class Client {
         return Request<[Report]>(method: .get, path: "/api/v1/reports")
     }
     
-    public static func report(
-        account: String,
-        statuses: [String],
-        comment: String,
-        forward: Bool,
-        category: String,
-        ruleIDs: [String]
-    ) -> Request<Report> {
-        return Request<Report>(method: .post, path: "/api/v1/reports", body: ParametersBody([
-                "account_id" => account,
-                "comment" => comment,
-                "forward" => forward,
-                "category" => category,
-            ] + "status_ids" => statuses + "rule_ids" => ruleIDs))
+    public static func report(account: Account, statuses: [Status], comment: String) -> Request<Report> {
+        return Request<Report>(method: .post, path: "/api/v1/reports", body: .parameters([
+                "account_id" => account.id,
+                "comment" => comment
+            ] + "status_ids" => statuses.map { $0.id }))
     }
     
     // MARK: - Search
-    public static func search(query: String, types: [SearchResultType]? = nil, resolve: Bool? = nil, limit: Int? = nil, following: Bool? = nil) -> Request<SearchResults> {
+    public static func search(query: String, resolve: Bool? = nil, limit: Int? = nil) -> Request<SearchResults> {
         return Request<SearchResults>(method: .get, path: "/api/v2/search", queryParameters: [
                 "q" => query,
                 "resolve" => resolve,
-                "limit" => limit,
-                "following" => following,
-        ] + "types" => types?.map { $0.rawValue })
+                "limit" => limit
+            ])
     }
     
     // MARK: - Statuses
@@ -361,23 +329,16 @@ public class Client {
                                     sensitive: Bool? = nil,
                                     spoilerText: String? = nil,
                                     visibility: Status.Visibility? = nil,
-                                    language: String? = nil,
-                                    pollOptions: [String]? = nil,
-                                    pollExpiresIn: Int? = nil,
-                                    pollMultiple: Bool? = nil,
-                                    localOnly: Bool? = nil /* hometown only, not glitch */) -> Request<Status> {
-        return Request<Status>(method: .post, path: "/api/v1/statuses", body: ParametersBody([
+                                    language: String? = nil) -> Request<Status> {
+        return Request<Status>(method: .post, path: "/api/v1/statuses", body: .parameters([
                 "status" => text,
                 "content_type" => contentType.mimeType,
                 "in_reply_to_id" => inReplyTo,
                 "sensitive" => sensitive,
                 "spoiler_text" => spoilerText,
                 "visibility" => visibility?.rawValue,
-                "language" => language,
-                "poll[expires_in]" => pollExpiresIn,
-                "poll[multiple]" => pollMultiple,
-                "local_only" => localOnly,
-            ] + "media_ids" => media?.map { $0.id } + "poll[options]" => pollOptions))
+                "language" => language
+            ] + "media_ids" => media?.map { $0.id }))
     }
     
     // MARK: - Timelines
@@ -386,108 +347,22 @@ public class Client {
     }
     
     
-    // MARK: - Bookmarks
+    // MARK: Bookmarks
     public static func getBookmarks(range: RequestRange = .default) -> Request<[Status]> {
         var request = Request<[Status]>(method: .get, path: "/api/v1/bookmarks")
         request.range = range
         return request
     }
     
-    // MARK: - Instance
-    public static func getTrendingHashtags(limit: Int? = nil) -> Request<[Hashtag]> {
-        let parameters: [Parameter]
-        if let limit = limit {
-            parameters = ["limit" => limit]
-        } else {
-            parameters = []
-        }
-        return Request<[Hashtag]>(method: .get, path: "/api/v1/trends", queryParameters: parameters)
-    }
-    
-    public static func getTrendingStatuses(limit: Int? = nil) -> Request<[Status]> {
-        let parameters: [Parameter]
-        if let limit = limit {
-            parameters = ["limit" => limit]
-        } else {
-            parameters = []
-        }
-        return Request(method: .get, path: "/api/v1/trends/statuses", queryParameters: parameters)
-    }
-    
-    public static func getTrendingLinks(limit: Int? = nil) -> Request<[Card]> {
-        let parameters: [Parameter]
-        if let limit = limit {
-            parameters = ["limit" => limit]
-        } else {
-            parameters = []
-        }
-        return Request(method: .get, path: "/api/v1/trends/links", queryParameters: parameters)
-    }
-    
-    public static func getFeaturedProfiles(local: Bool, order: DirectoryOrder, offset: Int? = nil, limit: Int? = nil) -> Request<[Account]> {
-        var parameters = [
-            "order" => order.rawValue,
-            "local" => local,
-        ]
-        if let offset = offset {
-            parameters.append("offset" => offset)
-        }
-        if let limit = limit {
-            parameters.append("limit" => limit)
-        }
-        return Request<[Account]>(method: .get, path: "/api/v1/directory", queryParameters: parameters)
-    }
-    
-    public static func getSuggestions(limit: Int?) -> Request<[Suggestion]> {
-        return Request(method: .get, path: "/api/v2/suggestions", queryParameters: [
-            "limit" => limit,
-        ])
-    }
-    
 }
 
 extension Client {
-    public struct Error: LocalizedError {
-        public let requestMethod: Method
-        public let requestEndpoint: Endpoint
-        public let type: ErrorType
-        
-        #if DEBUG
-        public static let debug = Error(request: Client.getStatuses(timeline: .home), type: .invalidResponse)
-        #endif
-        
-        init<ResultType: Decodable>(request: Request<ResultType>, type: ErrorType) {
-            self.requestMethod = request.method
-            self.requestEndpoint = request.endpoint
-            self.type = type
-        }
-        
-        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(let code):
-                return "HTTP Code \(code)"
-            case .invalidRequest:
-                return "Invalid Request"
-            case .invalidResponse:
-                return "Invalid Response"
-            case .invalidModel(_):
-                return "Invalid Model"
-            case .mastodonError(let code, let error):
-                return "Server Error (\(code)): \(error)"
-            }
-        }
-    }
-    public enum ErrorType: LocalizedError {
-        case networkError(Swift.Error)
-        case unexpectedStatus(Int)
+    public enum Error: Swift.Error {
+        case unknownError
         case invalidRequest
         case invalidResponse
-        case invalidModel(Swift.Error)
-        case mastodonError(Int, String)
+        case invalidModel
+        case mastodonError(String)
+        case urlError(URLError)
     }
 }

Pachyderm/ClientModel.swift

@@ -0,0 +1,39 @@
+//
+//  ClientModel.swift
+//  Pachyderm
+//
+//  Created by Shadowfacts on 9/9/18.
+//  Copyright © 2018 Shadowfacts. All rights reserved.
+//
+
+import Foundation
+
+protocol ClientModel {
+    var client: Client! { get set }
+}
+
+extension Array where Element == ClientModel {
+    var client: Client! {
+        get {
+            return first?.client
+        }
+        set {
+            for var el in self {
+                el.client = newValue
+            }
+        }
+    }
+}
+
+extension Array where Element: ClientModel {
+    var client: Client! {
+        get {
+            return first?.client
+        }
+        set {
+            for var el in self {
+                el.client = newValue
+            }
+        }
+    }
+}

Pachyderm/Info.plist

@@ -0,0 +1,22 @@
+<?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>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+</dict>
+</plist>

Pachyderm/Model/Account.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 
-public final class Account: AccountProtocol, Decodable {
+public class Account: Decodable {
     public let id: String
     public let username: String
     public let acct: String
@@ -20,15 +20,14 @@ public final class Account: AccountProtocol, Decodable {
     public let statusesCount: Int
     public let note: String
     public let url: URL
-    // required on mastodon, but optional on gotosocial
-    public let avatar: URL?
-    public let avatarStatic: URL?
-    public let header: URL?
-    public let headerStatic: URL?
+    public let avatar: URL
+    public let avatarStatic: URL
+    public let header: URL
+    public let headerStatic: URL
     public private(set) var emojis: [Emoji]
     public let moved: Bool?
     public let movedTo: Account?
-    public let fields: [Field]
+    public let fields: [Field]?
     public let bot: Bool?
     
     public required init(from decoder: Decoder) throws {
@@ -45,17 +44,12 @@ public final class Account: AccountProtocol, Decodable {
         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)
-        self.avatar = try? container.decode(URL.self, forKey: .avatar)
-        self.avatarStatic = try? container.decode(URL.self, forKey: .avatarStatic)
-        self.header = try? container.decode(URL.self, forKey: .header)
-        self.headerStatic = try? container.decode(URL.self, forKey: .headerStatic)
-        // even up-to-date pixelfed instances sometimes lack this, for reasons unclear
-        if let emojis = try container.decodeIfPresent([Emoji].self, forKey: .emojis) {
-            self.emojis = emojis
-        } else {
-            self.emojis = []
-        }
-        self.fields = (try? container.decode([Field].self, forKey: .fields)) ?? []
+        self.avatar = try container.decode(URL.self, forKey: .avatar)
+        self.avatarStatic = try container.decode(URL.self, forKey: .avatarStatic)
+        self.header = try container.decode(URL.self, forKey: .header)
+        self.headerStatic = try container.decode(URL.self, forKey: .url)
+        self.emojis = try container.decode([Emoji].self, forKey: .emojis)
+        self.fields = try? container.decode([Field].self, forKey: .fields)
         self.bot = try? container.decode(Bool.self, forKey: .bot)
         
         if let moved = try? container.decode(Bool.self, forKey: .moved) {
@@ -82,24 +76,23 @@ public final class Account: AccountProtocol, Decodable {
         return Request<Empty>(method: .delete, path: "/api/v1/suggestions/\(account.id)")
     }
     
-    public static func getFollowers(_ accountID: String, range: RequestRange = .default) -> Request<[Account]> {
-        var request = Request<[Account]>(method: .get, path: "/api/v1/accounts/\(accountID)/followers")
+    public static func getFollowers(_ account: Account, range: RequestRange = .default) -> Request<[Account]> {
+        var request = Request<[Account]>(method: .get, path: "/api/v1/accounts/\(account.id)/followers")
         request.range = range
         return request
     }
     
-    public static func getFollowing(_ accountID: String, range: RequestRange = .default) -> Request<[Account]> {
-        var request = Request<[Account]>(method: .get, path: "/api/v1/accounts/\(accountID)/following")
+    public static func getFollowing(_ account: Account, range: RequestRange = .default) -> Request<[Account]> {
+        var request = Request<[Account]>(method: .get, path: "/api/v1/accounts/\(account.id)/following")
         request.range = range
         return request
     }
     
-    public static func getStatuses(_ accountID: String, range: RequestRange = .default, onlyMedia: Bool? = nil, pinned: Bool? = nil, excludeReplies: Bool? = nil, excludeReblogs: Bool? = nil) -> Request<[Status]> {
+    public static func getStatuses(_ accountID: String, range: RequestRange = .default, onlyMedia: Bool? = nil, pinned: Bool? = nil, excludeReplies: Bool? = nil) -> Request<[Status]> {
         var request = Request<[Status]>(method: .get, path: "/api/v1/accounts/\(accountID)/statuses", queryParameters: [
                 "only_media" => onlyMedia,
                 "pinned" => pinned,
-                "exclude_replies" => excludeReplies,
-                "exclude_reblogs" => excludeReblogs,
+                "exclude_replies" => excludeReplies
             ])
         request.range = range
         return request
@@ -113,22 +106,22 @@ public final class Account: AccountProtocol, Decodable {
         return Request<Relationship>(method: .post, path: "/api/v1/accounts/\(accountID)/unfollow")
     }
     
-    public static func block(_ accountID: String) -> Request<Relationship> {
-        return Request<Relationship>(method: .post, path: "/api/v1/accounts/\(accountID)/block")
+    public static func block(_ account: Account) -> Request<Relationship> {
+        return Request<Relationship>(method: .post, path: "/api/v1/accounts/\(account.id)/block")
     }
     
-    public static func unblock(_ accountID: String) -> Request<Relationship> {
-        return Request<Relationship>(method: .post, path: "/api/v1/accounts/\(accountID)/unblock")
+    public static func unblock(_ account: Account) -> Request<Relationship> {
+        return Request<Relationship>(method: .post, path: "/api/v1/accounts/\(account.id)/unblock")
     }
     
-    public static func mute(_ accountID: String, notifications: Bool? = nil) -> Request<Relationship> {
-        return Request<Relationship>(method: .post, path: "/api/v1/accounts/\(accountID)/mute", body: ParametersBody([
+    public static func mute(_ account: Account, notifications: Bool? = nil) -> Request<Relationship> {
+        return Request<Relationship>(method: .post, path: "/api/v1/accounts/\(account.id)/mute", body: .parameters([
                 "notifications" => notifications
             ]))
     }
     
-    public static func unmute(_ accountID: String) -> Request<Relationship> {
-        return Request<Relationship>(method: .post, path: "/api/v1/accounts/\(accountID)/unmute")
+    public static func unmute(_ account: Account) -> Request<Relationship> {
+        return Request<Relationship>(method: .post, path: "/api/v1/accounts/\(account.id)/unmute")
     }
     
     public static func getLists(_ account: Account) -> Request<[List]> {
@@ -168,12 +161,5 @@ extension Account {
     public struct Field: Codable {
         public let name: String
         public let value: String
-        public let verifiedAt: Date?
-        
-        enum CodingKeys: String, CodingKey {
-            case name
-            case value
-            case verifiedAt = "verified_at"
-        }
     }
 }

Pachyderm/Model/Attachment.swift

@@ -8,18 +8,18 @@
 
 import Foundation
 
-public class Attachment: Codable {
+public class Attachment: Decodable {
     public let id: String
     public let kind: Kind
     public let url: URL
     public let remoteURL: URL?
-    public let previewURL: URL?
+    public let previewURL: URL
+    public let textURL: URL?
     public let meta: Metadata?
     public let description: String?
-    public let blurHash: String?
     
     public static func update(_ attachment: Attachment, focus: (Float, Float)?, description: String?) -> Request<Attachment> {
-        return Request<Attachment>(method: .put, path: "/api/v1/media/\(attachment.id)", body: FormDataBody([
+        return Request<Attachment>(method: .put, path: "/api/v1/media/\(attachment.id)", body: .formData([
                 "description" => (description ?? attachment.description),
                 "focus" => focus
             ], nil))
@@ -29,12 +29,20 @@ public class Attachment: Codable {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         self.id = try container.decode(String.self, forKey: .id)
         self.kind = try container.decode(Kind.self, forKey: .kind)
-        self.url = try container.decode(URL.self, forKey: .url)
-        self.previewURL = try? container.decode(URL?.self, forKey: .previewURL)
-        self.remoteURL = try? container.decode(URL?.self, forKey: .remoteURL)
-        self.meta = try? container.decode(Metadata?.self, forKey: .meta)
-        self.description = try? container.decode(String?.self, forKey: .description)
-        self.blurHash = try? container.decode(String?.self, forKey: .blurHash)
+        self.url = URL(lenient: try container.decode(String.self, forKey: .url))!
+        if let remote = try? container.decode(String.self, forKey: .remoteURL) {
+            self.remoteURL = URL(lenient: remote.replacingOccurrences(of: " ", with: "%20"))
+        } else {
+            self.remoteURL = nil
+        }
+        self.previewURL = URL(lenient: try container.decode(String.self, forKey: .previewURL).replacingOccurrences(of: " ", with: "%20"))!
+        if let text = try? container.decode(String.self, forKey: .textURL) {
+            self.textURL = URL(lenient: text.replacingOccurrences(of: " ", with: "%20"))
+        } else {
+            self.textURL = nil
+        }
+        self.meta = try? container.decode(Metadata.self, forKey: .meta)
+        self.description = try? container.decode(String.self, forKey: .description)
     }
     
     private enum CodingKeys: String, CodingKey {
@@ -43,41 +51,24 @@ public class Attachment: Codable {
         case url
         case remoteURL = "remote_url"
         case previewURL = "preview_url"
+        case textURL = "text_url"
         case meta
         case description
-        case blurHash = "blurhash"
     }
 }
 
 extension Attachment {
-    public enum Kind: String, Codable {
+    public enum Kind: String, Decodable {
         case image
         case video
         case gifv
         case audio
         case unknown
-        
-        public init(from decoder: Decoder) throws {
-            let container = try decoder.singleValueContainer()
-            switch try container.decode(String.self) {
-            // gotosocial uses "gif" for gif images
-            case "image", "gif":
-                self = .image
-            case "video":
-                self = .video
-            case "gifv":
-                self = .gifv
-            case "audio":
-                self = .audio
-            default:
-                self = .unknown
-            }
-        }
     }
 }
 
 extension Attachment {
-    public struct Metadata: Codable {
+    public class Metadata: Decodable {
         public let length: String?
         public let duration: Float?
         public let audioEncoding: String?
@@ -108,7 +99,7 @@ extension Attachment {
         }
     }
     
-    public struct ImageMetadata: Codable {
+    public class ImageMetadata: Decodable {
         public let width: Int?
         public let height: Int?
         public let size: String?
@@ -122,3 +113,14 @@ extension Attachment {
         }
     }
 }
+
+fileprivate extension URL {
+    private static let allowedChars = CharacterSet.urlHostAllowed.union(.urlPathAllowed).union(.urlQueryAllowed)
+    
+    init?(lenient string: String) {
+        guard let escaped = string.addingPercentEncoding(withAllowedCharacters: URL.allowedChars) else {
+            return nil
+        }
+        self.init(string: escaped)
+    }
+}

Pachyderm/Model/Card.swift

@@ -0,0 +1,48 @@
+//
+//  Card.swift
+//  Pachyderm
+//
+//  Created by Shadowfacts on 9/9/18.
+//  Copyright © 2018 Shadowfacts. All rights reserved.
+//
+
+import Foundation
+
+public class Card: Decodable {
+    public let url: URL
+    public let title: String
+    public let description: String
+    public let image: URL?
+    public let kind: Kind
+    public let authorName: String?
+    public let authorURL: URL?
+    public let providerName: String?
+    public let providerURL: URL?
+    public let html: String?
+    public let width: Int?
+    public let height: Int?
+    
+    private enum CodingKeys: String, CodingKey {
+        case url
+        case title
+        case description
+        case image
+        case kind = "type"
+        case authorName = "author_name"
+        case authorURL = "author_url"
+        case providerName = "provider_name"
+        case providerURL = "provider_url"
+        case html
+        case width
+        case height
+    }
+}
+
+extension Card {
+    public enum Kind: String, Decodable {
+        case link
+        case photo
+        case video
+        case rich
+    }
+}

Pachyderm/Model/Emoji.swift

@@ -0,0 +1,29 @@
+//
+//  Emoji.swift
+//  Pachyderm
+//
+//  Created by Shadowfacts on 9/8/18.
+//  Copyright © 2018 Shadowfacts. All rights reserved.
+//
+
+import Foundation
+
+public class Emoji: Decodable {
+    public let shortcode: String
+    public let url: URL
+    public let staticURL: URL
+    public let visibleInPicker: Bool
+    
+    private enum CodingKeys: String, CodingKey {
+        case shortcode
+        case url
+        case staticURL = "static_url"
+        case visibleInPicker = "visible_in_picker"
+    }
+}
+
+extension Emoji: CustomDebugStringConvertible {
+    public var debugDescription: String {
+        return ":\(shortcode):"
+    }
+}

Pachyderm/Model/Filter.swift

@@ -1,5 +1,5 @@
 //
-//  FilterV1.swift
+//  Filter.swift
 //  Pachyderm
 //
 //  Created by Shadowfacts on 9/9/18.
@@ -8,7 +8,7 @@
 
 import Foundation
 
-public struct FilterV1: Decodable {
+public class Filter: Decodable {
     public let id: String
     public let phrase: String
     private let context: [String]
@@ -22,16 +22,17 @@ public struct FilterV1: Decodable {
         }
     }
     
-    public static func update(_ filterID: String, phrase: String, context: [Context], irreversible: Bool, wholeWord: Bool, expiresIn: TimeInterval?) -> Request<FilterV1> {
-        return Request<FilterV1>(method: .put, path: "/api/v1/filters/\(filterID)", body: ParametersBody([
-            "phrase" => phrase,
-            "whole_word" => wholeWord,
-            "expires_in" => expiresIn,
-        ] + "context" => context.contextStrings))
+    public static func update(_ filter: Filter, phrase: String? = nil, context: [Context]? = nil, irreversible: Bool? = nil, wholeWord: Bool? = nil, expiresAt: Date? = nil) -> Request<Filter> {
+        return Request<Filter>(method: .put, path: "/api/v1/filters/\(filter.id)", body: .parameters([
+            "phrase" => (phrase ?? filter.phrase),
+            "irreversible" => (irreversible ?? filter.irreversible),
+            "whole_word" => (wholeWord ?? filter.wholeWord),
+            "expires_at" => (expiresAt ?? filter.expiresAt)
+        ] + "context" => (context?.contextStrings ?? filter.context)))
     }
     
-    public static func delete(_ filterID: String) -> Request<Empty> {
-        return Request<Empty>(method: .delete, path: "/api/v1/filters/\(filterID)")
+    public static func delete(_ filter: Filter) -> Request<Empty> {
+        return Request<Empty>(method: .delete, path: "/api/v1/filters/\(filter.id)")
     }
     
     private enum CodingKeys: String, CodingKey {
@@ -44,17 +45,16 @@ public struct FilterV1: Decodable {
     }
 }
 
-extension FilterV1 {
-    public enum Context: String, Decodable, CaseIterable {
+extension Filter {
+    public enum Context: String, Decodable {
         case home
         case notifications
         case `public`
         case thread
-        case account
     }
 }
 
-extension Array where Element == FilterV1.Context {
+extension Array where Element == Filter.Context {
     var contextStrings: [String] {
         return map { $0.rawValue }
     }

Pachyderm/Model/Hashtag.swift

@@ -0,0 +1,84 @@
+//
+//  Hashtag.swift
+//  Pachyderm
+//
+//  Created by Shadowfacts on 9/9/18.
+//  Copyright © 2018 Shadowfacts. All rights reserved.
+//
+
+import Foundation
+
+public class Hashtag: Codable {
+    public let name: String
+    public let url: URL
+    public let history: [History]?
+    
+    public init(name: String, url: URL) {
+        self.name = name
+        self.url = url
+        self.history = nil
+    }
+    
+    private enum CodingKeys: String, CodingKey {
+        case name
+        case url
+        case history
+    }
+}
+
+extension Hashtag {
+    public class History: Codable {
+        public let day: Date
+        public let uses: Int
+        public let accounts: Int
+        
+        public required init(from decoder: Decoder) throws {
+            let container = try decoder.container(keyedBy: CodingKeys.self)
+            
+            if let day = try? container.decode(Date.self, forKey: .day) {
+                self.day = day
+            } else if let unixTimestamp = try? container.decode(Double.self, forKey: .day) {
+                self.day = Date(timeIntervalSince1970: unixTimestamp)
+            } else if let str = try? container.decode(String.self, forKey: .day),
+                let unixTimestamp = Double(str) {
+                self.day = Date(timeIntervalSince1970: unixTimestamp)
+            } else {
+                throw DecodingError.dataCorruptedError(forKey: .day, in: container, debugDescription: "day must be either date or UNIX timestamp")
+            }
+            
+            if let uses = try? container.decode(Int.self, forKey: .uses) {
+                self.uses = uses
+            } else if let str = try? container.decode(String.self, forKey: .uses),
+                let uses = Int(str) {
+                self.uses = uses
+            } else {
+                throw DecodingError.dataCorruptedError(forKey: .uses, in: container, debugDescription: "uses must either be int or string containing int")
+            }
+            
+            if let accounts = try? container.decode(Int.self, forKey: .accounts) {
+                self.accounts = accounts
+            } else if let str = try? container.decode(String.self, forKey: .accounts),
+                let accounts = Int(str) {
+                self.accounts = accounts
+            } else {
+                throw DecodingError.dataCorruptedError(forKey: .accounts, in: container, debugDescription: "accounts must either be int or string containing int")
+            }
+        }
+
+        private enum CodingKeys: String, CodingKey {
+            case day
+            case uses
+            case accounts
+        }
+    }
+}
+
+extension Hashtag: Equatable, Hashable {
+    public static func ==(lhs: Hashtag, rhs: Hashtag) -> Bool {
+        return lhs.name == rhs.name
+    }
+    
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(url)
+    }
+}

Pachyderm/Model/Instance.swift

@@ -0,0 +1,87 @@
+//
+//  Instance.swift
+//  Pachyderm
+//
+//  Created by Shadowfacts on 9/9/18.
+//  Copyright © 2018 Shadowfacts. All rights reserved.
+//
+
+import Foundation
+
+public class Instance: Decodable {
+    public let uri: String
+    public let title: String
+    public let description: String
+    public let email: String?
+    public let version: String
+    public let urls: [String: URL]
+    public let thumbnail: URL?
+    public let languages: [String]?
+    public let stats: Stats?
+
+    // pleroma doesn't currently implement these
+    public let contactAccount: Account?
+    
+    // MARK: Unofficial additions to the Mastodon API.
+    public let maxStatusCharacters: Int?
+    
+    // we need a custom decoder, because all API-compatible implementations don't return some data in the same format
+    public required init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        self.uri = try container.decode(String.self, forKey: .uri)
+        self.title = try container.decode(String.self, forKey: .title)
+        self.description = try container.decode(String.self, forKey: .description)
+        self.email = try container.decodeIfPresent(String.self, forKey: .email)
+        self.version = try container.decode(String.self, forKey: .version)
+        if let urls = try? container.decodeIfPresent([String: URL].self, forKey: .urls) {
+            self.urls = urls
+        } else {
+            self.urls = [:]
+        }
+        
+        self.languages = try? container.decodeIfPresent([String].self, forKey: .languages)
+        self.contactAccount = try? container.decodeIfPresent(Account.self, forKey: .contactAccount)
+        
+        self.stats = try? container.decodeIfPresent(Stats.self, forKey: .stats)
+        self.thumbnail = try? container.decodeIfPresent(URL.self, forKey: .thumbnail)
+        if let maxStatusCharacters = try? container.decodeIfPresent(Int.self, forKey: .maxStatusCharacters) {
+            self.maxStatusCharacters = maxStatusCharacters
+        } else if let str = try? container.decodeIfPresent(String.self, forKey: .maxStatusCharacters),
+            let maxStatusCharacters = Int(str, radix: 10) {
+            self.maxStatusCharacters = maxStatusCharacters
+        } else {
+            self.maxStatusCharacters = nil
+        }
+        
+    }
+    
+    private enum CodingKeys: String, CodingKey {
+        case uri
+        case title
+        case description
+        case email
+        case version
+        case urls
+        case thumbnail
+        case languages
+        case stats
+        
+        case contactAccount = "contact_account"
+        
+        case maxStatusCharacters = "max_toot_chars"
+    }
+}
+
+extension Instance {
+    public class Stats: Decodable {
+        public let domainCount: Int?
+        public let statusCount: Int?
+        public let userCount: Int?
+        
+        private enum CodingKeys: String, CodingKey {
+            case domainCount = "domain_count"
+            case statusCount = "status_count"
+            case userCount = "user_count"
+        }
+    }
+}

Pachyderm/Model/List.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 
-public class List: Decodable, Equatable, Hashable {
+public class List: Decodable {
     public let id: String
     public let title: String
     
@@ -16,15 +16,6 @@ public class List: Decodable, Equatable, Hashable {
         return .list(id: id)
     }
     
-    public static func ==(lhs: List, rhs: List) -> Bool {
-        return lhs.id == rhs.id && lhs.title == rhs.title
-    }
-    
-    public func hash(into hasher: inout Hasher) {
-        hasher.combine(id)
-        hasher.combine(title)
-    }
-    
     public static func getAccounts(_ list: List, range: RequestRange = .default) -> Request<[Account]> {
         var request = Request<[Account]>(method: .get, path: "/api/v1/lists/\(list.id)/accounts")
         request.range = range
@@ -32,7 +23,7 @@ public class List: Decodable, Equatable, Hashable {
     }
     
     public static func update(_ list: List, title: String) -> Request<List> {
-        return Request<List>(method: .put, path: "/api/v1/lists/\(list.id)", body: ParametersBody(["title" => title]))
+        return Request<List>(method: .put, path: "/api/v1/lists/\(list.id)", body: .parameters(["title" => title]))
     }
     
     public static func delete(_ list: List) -> Request<Empty> {
@@ -40,13 +31,13 @@ public class List: Decodable, Equatable, Hashable {
     }
     
     public static func add(_ list: List, accounts accountIDs: [String]) -> Request<Empty> {
-        return Request<Empty>(method: .post, path: "/api/v1/lists/\(list.id)/accounts", body: ParametersBody(
+        return Request<Empty>(method: .post, path: "/api/v1/lists/\(list.id)/accounts", body: .parameters(
                 "account_ids" => accountIDs
             ))
     }
     
     public static func remove(_ list: List, accounts accountIDs: [String]) -> Request<Empty> {
-        return Request<Empty>(method: .delete, path: "/api/v1/lists/\(list.id)/accounts", body: ParametersBody(
+        return Request<Empty>(method: .delete, path: "/api/v1/lists/\(list.id)/accounts", body: .parameters(
                 "account_ids" => accountIDs
             ))
     }

Pachyderm/Model/LoginSettings.swift

@@ -10,10 +10,9 @@ import Foundation
 
 public class LoginSettings: Decodable {
     public let accessToken: String
-    private let scope: String?
+    private let scope: String
     
     public var scopes: [Scope] {
-        guard let scope = scope else { return [] }
         return scope.components(separatedBy: .whitespaces).compactMap(Scope.init)
     }
     

Pachyderm/Model/Mention.swift

@@ -0,0 +1,23 @@
+//
+//  Mention.swift
+//  Pachyderm
+//
+//  Created by Shadowfacts on 9/9/18.
+//  Copyright © 2018 Shadowfacts. All rights reserved.
+//
+
+import Foundation
+
+public class Mention: Decodable {
+    public let url: URL
+    public let username: String
+    public let acct: String
+    public let id: String
+    
+    private enum CodingKeys: String, CodingKey {
+        case url
+        case username
+        case acct
+        case id
+    }
+}

Pachyderm/Model/Notification.swift

@@ -15,26 +15,8 @@ public class Notification: Decodable {
     public let account: Account
     public let status: Status?
     
-    public required init(from decoder: Decoder) throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        
-        self.id = try container.decode(String.self, forKey: .id)
-        if let kind = try? container.decode(Kind.self, forKey: .kind) {
-            self.kind = kind
-        } else if let s = try? container.decode(String.self, forKey: .kind),
-                  s == "status" {
-            // represent notifications of other people posting as regular mentions for now
-            self.kind = .mention
-        } else {
-            self.kind = .unknown
-        }
-        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)
-    }
-
     public static func dismiss(id notificationID: String) -> Request<Empty> {
-        return Request<Empty>(method: .post, path: "/api/v1/notifications/dismiss", body: ParametersBody([
+        return Request<Empty>(method: .post, path: "/api/v1/notifications/dismiss", body: .parameters([
                 "id" => notificationID
             ]))
     }
@@ -55,9 +37,6 @@ extension Notification {
         case favourite
         case follow
         case followRequest = "follow_request"
-        case poll
-        case update
-        case unknown
     }
 }
 

Pachyderm/Model/RegisteredApplication.swift

@@ -0,0 +1,21 @@
+//
+//  RegisteredApplication.swift
+//  Pachyderm
+//
+//  Created by Shadowfacts on 9/9/18.
+//  Copyright © 2018 Shadowfacts. All rights reserved.
+//
+
+import Foundation
+
+public class RegisteredApplication: Decodable {
+    public let id: String
+    public let clientID: String
+    public let clientSecret: String
+    
+    private enum CodingKeys: String, CodingKey {
+        case id
+        case clientID = "client_id"
+        case clientSecret = "client_secret"
+    }
+}

Pachyderm/Model/Relationship.swift

@@ -18,7 +18,6 @@ public class Relationship: Decodable {
     public let followRequested: Bool
     public let domainBlocking: Bool
     public let showingReblogs: Bool
-    public let endorsed: Bool?
     
     private enum CodingKeys: String, CodingKey {
         case id
@@ -30,6 +29,5 @@ public class Relationship: Decodable {
         case followRequested = "requested"
         case domainBlocking = "domain_blocking"
         case showingReblogs = "showing_reblogs"
-        case endorsed
     }
 }

Pachyderm/Model/Status.swift

@@ -7,12 +7,11 @@
 //
 
 import Foundation
-import WebURL
 
-public final class Status: StatusProtocol, Decodable {
+public class Status: Decodable {
     public let id: String
     public let uri: String
-    public let url: WebURL?
+    public let url: URL?
     public let account: Account
     public let inReplyToID: String?
     public let inReplyToAccountID: String?
@@ -37,80 +36,69 @@ public final class Status: StatusProtocol, Decodable {
     public let language: String?
     public let pinned: Bool?
     public let bookmarked: Bool?
-    public let card: Card?
-    public let poll: Poll?
-    // Hometown, Glitch only
-    public let localOnly: Bool?
     
-    public var applicationName: String? { application?.name }
-    
-    public static func getContext(_ statusID: String) -> Request<ConversationContext> {
-        return Request<ConversationContext>(method: .get, path: "/api/v1/statuses/\(statusID)/context")
+    public static func getContext(_ status: Status) -> Request<ConversationContext> {
+        return Request<ConversationContext>(method: .get, path: "/api/v1/statuses/\(status.id)/context")
     }
     
     public static func getCard(_ status: Status) -> Request<Card> {
         return Request<Card>(method: .get, path: "/api/v1/statuses/\(status.id)/card")
     }
     
-    public static func getFavourites(_ statusID: String, range: RequestRange = .default) -> Request<[Account]> {
-        var request = Request<[Account]>(method: .get, path: "/api/v1/statuses/\(statusID)/favourited_by")
+    public static func getFavourites(_ status: Status, range: RequestRange = .default) -> Request<[Account]> {
+        var request = Request<[Account]>(method: .get, path: "/api/v1/statuses/\(status.id)/favourited_by")
         request.range = range
         return request
     }
     
-    public static func getReblogs(_ statusID: String, range: RequestRange = .default) -> Request<[Account]> {
-        var request = Request<[Account]>(method: .get, path: "/api/v1/statuses/\(statusID)/reblogged_by")
+    public static func getReblogs(_ status: Status, range: RequestRange = .default) -> Request<[Account]> {
+        var request = Request<[Account]>(method: .get, path: "/api/v1/statuses/\(status.id)/reblogged_by")
         request.range = range
         return request
     }
     
-    public static func delete(_ statusID: String) -> Request<Empty> {
-        return Request<Empty>(method: .delete, path: "/api/v1/statuses/\(statusID)")
+    public static func delete(_ status: Status) -> Request<Empty> {
+        return Request<Empty>(method: .delete, path: "/api/v1/statuses/\(status.id)")
     }
     
-    public static func reblog(_ statusID: String, visibility: Visibility? = nil) -> Request<Status> {
-        var params: [Parameter] = []
-        if let visibility {
-            assert([.public, .unlisted, .private].contains(visibility))
-            params.append("visibility" => visibility.rawValue)
-        }
-        return Request<Status>(method: .post, path: "/api/v1/statuses/\(statusID)/reblog", queryParameters: params)
+    public static func reblog(_ status: Status) -> Request<Status> {
+        return Request<Status>(method: .post, path: "/api/v1/statuses/\(status.id)/reblog")
     }
     
-    public static func unreblog(_ statusID: String) -> Request<Status> {
-        return Request<Status>(method: .post, path: "/api/v1/statuses/\(statusID)/unreblog")
+    public static func unreblog(_ status: Status) -> Request<Status> {
+        return Request<Status>(method: .post, path: "/api/v1/statuses/\(status.id)/unreblog")
     }
     
-    public static func favourite(_ statusID: String) -> Request<Status> {
-        return Request<Status>(method: .post, path: "/api/v1/statuses/\(statusID)/favourite")
+    public static func favourite(_ status: Status) -> Request<Status> {
+        return Request<Status>(method: .post, path: "/api/v1/statuses/\(status.id)/favourite")
     }
     
-    public static func unfavourite(_ statusID: String) -> Request<Status> {
-        return Request<Status>(method: .post, path: "/api/v1/statuses/\(statusID)/unfavourite")
+    public static func unfavourite(_ status: Status) -> Request<Status> {
+        return Request<Status>(method: .post, path: "/api/v1/statuses/\(status.id)/unfavourite")
     }
     
-    public static func pin(_ statusID: String) -> Request<Status> {
-        return Request<Status>(method: .post, path: "/api/v1/statuses/\(statusID)/pin")
+    public static func pin(_ status: Status) -> Request<Status> {
+        return Request<Status>(method: .post, path: "/api/v1/statuses/\(status.id)/pin")
     }
     
-    public static func unpin(_ statusID: String) -> Request<Status> {
-        return Request<Status>(method: .post, path: "/api/v1/statuses/\(statusID)/unpin")
+    public static func unpin(_ status: Status) -> Request<Status> {
+        return Request<Status>(method: .post, path: "/api/v1/statuses/\(status.id)/unpin")
     }
     
-    public static func bookmark(_ statusID: String) -> Request<Status> {
-        return Request<Status>(method: .post, path: "/api/v1/statuses/\(statusID)/bookmark")
+    public static func bookmark(_ status: Status) -> Request<Status> {
+        return Request<Status>(method: .post, path: "/api/v1/statuses/\(status.id)/bookmark")
     }
     
-    public static func unbookmark(_ statusID: String) -> Request<Status> {
-        return Request<Status>(method: .post, path: "/api/v1/statuses/\(statusID)/unbookmark")
+    public static func unbookmark(_ status: Status) -> Request<Status> {
+        return Request<Status>(method: .post, path: "/api/v1/statuses/\(status.id)/unbookmark")
     }
     
-    public static func muteConversation(_ statusID: String) -> Request<Status> {
-        return Request<Status>(method: .post, path: "/api/v1/statuses/\(statusID)/mute")
+    public static func muteConversation(_ status: Status) -> Request<Status> {
+        return Request<Status>(method: .post, path: "/api/v1/statuses/\(status.id)/mute")
     }
     
-    public static func unmuteConversation(_ statusID: String) -> Request<Status> {
-        return Request<Status>(method: .post, path: "/api/v1/statuses/\(statusID)/unmute")
+    public static func unmuteConversation(_ status: Status) -> Request<Status> {
+        return Request<Status>(method: .post, path: "/api/v1/statuses/\(status.id)/unmute")
     }
     
     private enum CodingKeys: String, CodingKey {
@@ -140,9 +128,6 @@ public final class Status: StatusProtocol, Decodable {
         case language
         case pinned
         case bookmarked
-        case card
-        case poll
-        case localOnly = "local_only"
     }
 }
 

Pachyderm/Model/Timeline.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 
-public enum Timeline: Equatable, Hashable {
+public enum Timeline {
     case home
     case `public`(local: Bool)
     case tag(hashtag: String)
@@ -17,7 +17,7 @@ public enum Timeline: Equatable, Hashable {
 }
 
 extension Timeline {
-    var endpoint: Endpoint {
+    var endpoint: String {
         switch self {
         case .home:
             return "/api/v1/timelines/home"

Pachyderm/Pachyderm.h

@@ -0,0 +1,19 @@
+//
+//  Pachyderm.h
+//  Pachyderm
+//
+//  Created by Shadowfacts on 9/8/18.
+//  Copyright © 2018 Shadowfacts. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+//! Project version number for Pachyderm.
+FOUNDATION_EXPORT double PachydermVersionNumber;
+
+//! Project version string for Pachyderm.
+FOUNDATION_EXPORT const unsigned char PachydermVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <Pachyderm/PublicHeader.h>
+
+

Pachyderm/Promise.swift

@@ -0,0 +1,170 @@
+//
+//  Promise.swift
+//  Pachyderm
+//
+//  Created by Shadowfacts on 2/14/20.
+//  Copyright © 2020 Shadowfacts. All rights reserved.
+//
+
+import Foundation
+
+public class Promise<Result> {
+    private var handlers: [(Result) -> Void] = []
+    private var result: Result?
+    private var catchers: [(Error) -> Void] = []
+    private var error: Error?
+
+    func resolve(_ result: Result) {
+        self.result = result
+        self.handlers.forEach { $0(result) }
+    }
+    
+    func reject(_ error: Error) {
+        self.error = error
+        self.catchers.forEach { $0(error) }
+    }
+    
+    func addHandler(_ handler: @escaping (Result) -> Void) {
+        if let result = result {
+            handler(result)
+        } else {
+            handlers.append(handler)
+        }
+    }
+    
+    func addCatcher(_ catcher: @escaping (Error) -> Void) {
+        if let error = error {
+            catcher(error)
+        } else {
+            catchers.append(catcher)
+        }
+    }
+}
+
+public extension Promise {
+    static func resolve<Result>(_ value: Result) -> Promise<Result> {
+        let promise = Promise<Result>()
+        promise.resolve(value)
+        return promise
+    }
+    
+    static func reject<Result>(_ error: Error) -> Promise<Result> {
+        let promise = Promise<Result>()
+        promise.reject(error)
+        return promise
+    }
+    
+    static func all<Result>(_ promises: [Promise<Result>], queue: DispatchQueue = .main) -> Promise<[Result]> {
+        let group = DispatchGroup()
+        
+        var results = [Result?](repeating: nil, count: promises.count)
+        var firstError: Error?
+
+        for (index, promise) in promises.enumerated() {
+            group.enter()
+            promise.then { (res) in
+                queue.async {
+                    results[index] = res
+                    group.leave()
+                }
+            }.catch { (err) -> Void in
+                if firstError == nil {
+                    firstError = err
+                }
+                group.leave()
+            }
+        }
+        
+        return Promise<[Result]> { (resolve, reject) in
+            group.notify(queue: queue) {
+                if let firstError = firstError {
+                    reject(firstError)
+                } else {
+                    resolve(results.compactMap { $0 })
+                }
+            }
+        }
+    }
+    
+    convenience init(resultProvider: @escaping (_ resolve: @escaping (Result) -> Void, _ reject: @escaping (Error) -> Void) -> Void) {
+        self.init()
+        resultProvider(self.resolve, self.reject)
+    }
+    
+    convenience init<ErrorType>(_ resultProvider: @escaping ((Swift.Result<Result, ErrorType>) -> Void) -> Void) {
+        self.init { (resolve, reject) in
+            resultProvider { (result) in
+                switch result {
+                case let .success(res):
+                    resolve(res)
+                case let .failure(error):
+                    reject(error)
+                }
+            }
+        }
+    }
+
+    @discardableResult
+    func then(_ func: @escaping (Result) -> Void) -> Promise<Result> {
+        addHandler(`func`)
+        return self
+    }
+    
+    func then<Next>(_ mapper: @escaping (Result) -> Promise<Next>) -> Promise<Next> {
+        let next = Promise<Next>()
+        addHandler { (parentResult) in
+            let newPromise = mapper(parentResult)
+            newPromise.addHandler(next.resolve)
+            newPromise.addCatcher(next.reject)
+        }
+        addCatcher(next.reject)
+        return next
+    }
+    
+    func then<Next>(_ mapper: @escaping (Result) -> Next) -> Promise<Next> {
+        let next = Promise<Next>()
+        addHandler { (parentResult) in
+            let newResult = mapper(parentResult)
+            next.resolve(newResult)
+        }
+        addCatcher(next.reject)
+        return next
+    }
+    
+    @discardableResult
+    func `catch`(_ catcher: @escaping (Error) -> Void) -> Promise<Result> {
+        addCatcher(catcher)
+        return self
+    }
+    
+    func `catch`(_ catcher: @escaping (Error) -> Promise<Result>) -> Promise<Result> {
+        let next = Promise<Result>()
+        addHandler(next.resolve)
+        addCatcher { (error) in
+            let newPromise = catcher(error)
+            newPromise.addHandler(next.resolve)
+            newPromise.addCatcher(next.reject)
+        }
+        return next
+    }
+
+    func `catch`(_ catcher: @escaping (Error) -> Result) -> Promise<Result> {
+        let next = Promise<Result>()
+        addHandler(next.resolve)
+        addCatcher { (error) in
+            let newResult = catcher(error)
+            next.resolve(newResult)
+        }
+        return next
+    }
+    
+    func handle(on queue: DispatchQueue) -> Promise<Result> {
+        return self.then { (result) in
+            return Promise { (resolve, reject) in
+                queue.async {
+                    resolve(result)
+                }
+            }
+        }
+    }
+}

Pachyderm/Request/Body.swift

@@ -0,0 +1,63 @@
+//
+//  Body.swift
+//  Pachyderm
+//
+//  Created by Shadowfacts on 9/8/18.
+//  Copyright © 2018 Shadowfacts. All rights reserved.
+//
+
+import Foundation
+
+enum Body {
+    case parameters([Parameter]?)
+    case formData([Parameter]?, FormAttachment?)
+    case empty
+}
+
+extension Body {
+    private static let boundary: String = "PachydermBoundary"
+    
+    var data: Data? {
+        switch self {
+        case let .parameters(parameters):
+            return parameters?.urlEncoded.data(using: .utf8)
+        case let .formData(parameters, attachment):
+            var data = Data()
+            parameters?.forEach { param in
+                guard let value = param.value else { return }
+                data.append("--\(Body.boundary)\r\n")
+                data.append("Content-Disposition: form-data; name=\"\(param.name)\"\r\n\r\n")
+                data.append("\(value)\r\n")
+            }
+            if let attachment = attachment {
+                data.append("--\(Body.boundary)\r\n")
+                data.append("Content-Disposition: form-data; name=\"file\"; filename=\"\(attachment.fileName)\"\r\n")
+                data.append("Content-Type: \(attachment.mimeType)\r\n\r\n")
+                data.append(attachment.data)
+                data.append("\r\n")
+            }
+            
+            data.append("--\(Body.boundary)--\r\n")
+            return data
+        case .empty:
+            return nil
+        }
+    }
+    
+    var mimeType: String? {
+        switch self {
+        case let .parameters(parameters):
+            if parameters == nil {
+                return nil
+            }
+            return "application/x-www-form-urlencoded; charset=utf-8"
+        case let .formData(parameters, attachment):
+            if parameters == nil && attachment == nil {
+                return nil
+            }
+            return "multipart/form-data; boundary=\(Body.boundary)"
+        case .empty:
+            return nil
+        }
+    }
+}

Pachyderm/Request/Method.swift

@@ -8,12 +8,12 @@
 
 import Foundation
 
-public enum Method {
+enum Method {
     case get, post, put, patch, delete
 }
 
 extension Method {
-    public var name: String {
+    var name: String {
         switch self {
         case .get:
             return "GET"

Pachyderm/Request/Parameter.swift

@@ -42,10 +42,6 @@ extension String {
         }
     }
     
-    static func =>(name: String, value: TimeInterval?) -> Parameter {
-        return name => (value == nil ? nil : Int(value!))
-    }
-    
     static func =>(name: String, focus: (Float, Float)?) -> Parameter {
         guard let focus = focus else { return Parameter(name: name, value: nil) }
         return Parameter(name: name, value: "\(focus.0),\(focus.1)")
@@ -56,10 +52,6 @@ extension String {
         let name = "\(name)[]"
         return values.map { Parameter(name: name, value: $0) }
     }
-    
-    static func =>(name: String, values: [Int]) -> [Parameter] {
-        return name => values.map { $0.description }
-    }
 }
 
 extension Parameter: CustomStringConvertible {

Pachyderm/Request/Request.swift

@@ -10,13 +10,13 @@ import Foundation
 
 public struct Request<ResultType: Decodable> {
     let method: Method
-    let endpoint: Endpoint
+    let path: String
     let body: Body
     var queryParameters: [Parameter]
     
-    init(method: Method, path: Endpoint, body: Body = EmptyBody(), queryParameters: [Parameter] = []) {
+    init(method: Method, path: String, body: Body = .empty, queryParameters: [Parameter] = []) {
         self.method = method
-        self.endpoint = path
+        self.path = path
         self.body = body
         self.queryParameters = queryParameters
     }

Pachyderm/Request/RequestRange.swift

@@ -11,9 +11,7 @@ import Foundation
 public enum RequestRange {
     case `default`
     case count(Int)
-    /// Chronologically immediately before the given ID
     case before(id: String, count: Int?)
-    /// Chronologically immediately after the given ID
     case after(id: String, count: Int?)
 }
 

Pachyderm/Response/Response.swift

@@ -10,5 +10,5 @@ import Foundation
 
 public enum Response<Result: Decodable> {
     case success(Result, Pagination?)
-    case failure(Client.Error)
+    case failure(Error)
 }

Pachyderm/Utilities/CharacterCounter.swift

@@ -13,12 +13,12 @@ public struct CharacterCounter {
     static let linkDetector = try! NSDataDetector(types: NSTextCheckingResult.CheckingType.link.rawValue)
     static let mention = try! NSRegularExpression(pattern: "(@[a-z0-9_]+)(?:@[a-z0-9\\-\\.]+[a-z0-9]+)?", options: .caseInsensitive)
     
-    public static func count(text: String, for instance: Instance? = nil) -> Int {
+    public static func count(text: String) -> Int {
         let mentionsRemoved = removeMentions(in: text)
         var count = mentionsRemoved.count
         for match in linkDetector.matches(in: mentionsRemoved, options: [], range: NSRange(location: 0, length: mentionsRemoved.utf16.count)) {
             count -= match.range.length
-            count += instance?.configuration?.statuses.charactersReservedPerURL ?? 23 // default Mastodon link length
+            count += 23 // Mastodon link length
         }
         return count
     }

Pachyderm/Utilities/InstanceSelector.swift

@@ -12,7 +12,7 @@ public class InstanceSelector {
     
     private static let decoder = JSONDecoder()
     
-    public static func getInstances(category: String?, completion: @escaping (Result<[Instance], Client.ErrorType>) -> Void) {
+    public static func getInstances(category: String?, completion: @escaping Client.Callback<[Instance]>) {
         let url: URL
         if let category = category {
             url = URL(string: "https://api.joinmastodon.org/servers?category=\(category)")!
@@ -22,26 +22,23 @@ public class InstanceSelector {
         let request = URLRequest(url: url)
         let task = URLSession.shared.dataTask(with: request) { (data, response, error) in
             if let error = error {
-                completion(.failure(.networkError(error)))
+                completion(.failure(error))
                 return
             }
             guard let data = data,
                 let response = response as? HTTPURLResponse else {
-                    completion(.failure(.invalidResponse))
+                    completion(.failure(Client.Error.invalidResponse))
                     return
             }
             guard response.statusCode == 200 else {
-                completion(.failure(.unexpectedStatus(response.statusCode)))
+                completion(.failure(Client.Error.unknownError))
                 return
             }
-            let result: [Instance]
-            do {
-                result = try decoder.decode([Instance].self, from: data)
-            } catch {
-                completion(.failure(.invalidModel(error)))
+            guard let result = try? decoder.decode([Instance].self, from: data) else {
+                completion(.failure(Client.Error.invalidModel))
                 return
             }
-            completion(.success(result))
+            completion(.success(result, nil))
         }
         task.resume()
     }

Pachyderm/Utilities/InstanceType.swift

@@ -0,0 +1,24 @@
+//
+//  InstanceType.swift
+//  Pachyderm
+//
+//  Created by Shadowfacts on 9/11/19.
+//  Copyright © 2019 Shadowfacts. All rights reserved.
+//
+
+import Foundation
+
+public enum InstanceType {
+    case mastodon, pleroma
+}
+
+public extension Instance {
+    var instanceType: InstanceType {
+        let lowercased = version.lowercased()
+        if lowercased.contains("pleroma") {
+            return .pleroma
+        } else {
+            return .mastodon
+        }
+    }
+}

Pachyderm/Utilities/NotificationGroup.swift

@@ -0,0 +1,48 @@
+//
+//  NotificationGroup.swift
+//  Pachyderm
+//
+//  Created by Shadowfacts on 9/5/19.
+//  Copyright © 2019 Shadowfacts. All rights reserved.
+//
+
+import Foundation
+
+public class NotificationGroup {
+    public let notificationIDs: [String]
+    public let id: String
+    public let kind: Notification.Kind
+    public let statusState: StatusState?
+    
+    init?(notifications: [Notification]) {
+        guard !notifications.isEmpty else { return nil }
+        self.notificationIDs = notifications.map { $0.id }
+        self.id = notifications.first!.id
+        self.kind = notifications.first!.kind
+        if kind == .mention {
+            self.statusState = .unknown
+        } else {
+            self.statusState = nil
+        }
+    }
+
+    public static func createGroups(notifications: [Notification], only allowedTypes: [Notification.Kind]) -> [NotificationGroup] {
+        return notifications.reduce(into: [[Notification]]()) { (groups, notification) in
+            if allowedTypes.contains(notification.kind),
+                let lastGroup = groups.last,
+                let firstStatus = lastGroup.first,
+                firstStatus.kind == notification.kind,
+                firstStatus.status?.id == notification.status?.id {
+                
+                groups[groups.count - 1].append(notification)
+            } else {
+                groups.append([notification])
+            }
+        }.map {
+            NotificationGroup(notifications: $0)!
+        }
+    }
+    
+}
+
+extension NotificationGroup: Identifiable {}

Pachyderm/Utilities/StatusState.swift

@@ -1,5 +1,5 @@
 //
-//  CollapseState.swift
+//  StatusState.swift
 //  Pachyderm
 //
 //  Created by Shadowfacts on 11/24/19.
@@ -8,7 +8,7 @@
 
 import Foundation
 
-public class CollapseState: Equatable {
+public class StatusState: Equatable, Hashable {
     public var collapsible: Bool?
     public var collapsed: Bool?
 
@@ -21,8 +21,8 @@ public class CollapseState: Equatable {
         self.collapsed = collapsed
     }
     
-    public func copy() -> CollapseState {
-        return CollapseState(collapsible: self.collapsible, collapsed: self.collapsed)
+    public func copy() -> StatusState {
+        return StatusState(collapsible: self.collapsible, collapsed: self.collapsed)
     }
     
     public func hash(into hasher: inout Hasher) {
@@ -30,11 +30,11 @@ public class CollapseState: Equatable {
         hasher.combine(collapsed)
     }
 
-    public static var unknown: CollapseState {
-        CollapseState(collapsible: nil, collapsed: nil)
+    public static var unknown: StatusState {
+        StatusState(collapsible: nil, collapsed: nil)
     }
     
-    public static func == (lhs: CollapseState, rhs: CollapseState) -> Bool {
+    public static func == (lhs: StatusState, rhs: StatusState) -> Bool {
         lhs.collapsible == rhs.collapsible && lhs.collapsed == rhs.collapsed
     }
 }

PachydermTests/Info.plist

@@ -0,0 +1,22 @@
+<?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>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>

PachydermTests/PachydermTests.swift

@@ -0,0 +1,34 @@
+//
+//  PachydermTests.swift
+//  PachydermTests
+//
+//  Created by Shadowfacts on 9/8/18.
+//  Copyright © 2018 Shadowfacts. All rights reserved.
+//
+
+import XCTest
+@testable import Pachyderm
+
+class PachydermTests: XCTestCase {
+
+    override func setUp() {
+        // Put setup code here. This method is called before the invocation of each test method in the class.
+    }
+
+    override func tearDown() {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+    }
+
+    func testExample() {
+        // This is an example of a functional test case.
+        // Use XCTAssert and related functions to verify your tests produce the correct results.
+    }
+
+    func testPerformanceExample() {
+        // This is an example of a performance test case.
+        self.measure {
+            // Put the code you want to measure the time of here.
+        }
+    }
+
+}

PachydermTests/PromiseTests.swift

@@ -0,0 +1,126 @@
+//
+//  PromiseTests.swift
+//  PachydermTests
+//
+//  Created by Shadowfacts on 2/14/20.
+//  Copyright © 2020 Shadowfacts. All rights reserved.
+//
+
+import XCTest
+@testable import Pachyderm
+
+class PromiseTests: XCTestCase {
+
+    override func setUpWithError() throws {
+        // Put setup code here. This method is called before the invocation of each test method in the class.
+    }
+
+    override func tearDownWithError() throws {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+    }
+    
+    func assertResultEqual<Result: Equatable>(_ promise: Promise<Result>, _ value: Result, message: String? = nil) {
+        let expectation = self.expectation(description: message ?? "promise result assertion")
+        promise.then {
+            XCTAssertEqual($0, value)
+            expectation.fulfill()
+        }
+        self.waitForExpectations(timeout: 2) { (error) in
+            if let error = error {
+                XCTFail("didn't resolve promise: \(error)")
+            }
+        }
+    }
+
+    func testResolveImmediate() {
+        assertResultEqual(Promise<String>.resolve("blah"), "blah")
+    }
+    
+    func testResolveImmediateMapped() {
+        let promise = Promise<String>.resolve("foo").then {
+            "test \($0)"
+        }.then {
+            Promise<String>.resolve("\($0) bar")
+        }
+        assertResultEqual(promise, "test foo bar")
+    }
+    
+    func testContinueAfterReject() {
+        let promise = Promise<String>.reject(TestError()).then { (res) in
+            XCTFail("then on rejected promise is unreachable")
+        }.catch { (error) -> String in
+            XCTAssertTrue(error is TestError)
+            return "caught"
+        }.then {
+            "\($0) error"
+        }
+        assertResultEqual(promise, "caught error")
+    }
+    
+    func testResolveDelayed() {
+        let promise = Promise<String> { (resolve, reject) in
+            DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+                resolve("blah")
+            }
+        }
+        assertResultEqual(promise, "blah")
+    }
+    
+    func testResolveMappedDelayed() {
+        let promise = Promise<String> { (resolve, reject) in
+            DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+                resolve("foo")
+            }
+        }.then {
+            "\($0) bar"
+        }.then { (result) in
+            Promise<String> { (resolve, reject) in
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+                    resolve("\(result) baz")
+                }
+            }
+        }
+        assertResultEqual(promise, "foo bar baz")
+    }
+    
+    func testResolveAll() {
+        let promise = Promise<[String]>.all([
+            Promise<String>.resolve("a"),
+            Promise<String>.resolve("b"),
+            Promise<String>.resolve("c"),
+        ])
+        assertResultEqual(promise, ["a", "b", "c"])
+    }
+    
+    func testIntermediateReject() {
+        let promise = Promise<String>.resolve("foo").then { (_) -> Promise<String> in
+            Promise<String>.reject(TestError())
+        }.catch { (error) -> String in
+            XCTAssertTrue(error is TestError)
+            return "caught"
+        }.then { (result) -> String in
+            "\(result) error"
+        }
+        assertResultEqual(promise, "caught error")
+    }
+    
+    func testResultHelper() {
+        let success = Promise<String> { (handler) in
+            handler(Result<String, Never>.success("asdf"))
+        }
+        assertResultEqual(success, "asdf")
+        let failure = Promise<String> { (handler) in
+            handler(Result<String, TestError>.failure(TestError()))
+        }.catch { (error) -> String in
+            "blah"
+        }
+        assertResultEqual(failure, "blah")
+    }
+
+}
+
+struct TestError: Error {
+    var localizedDescription: String {
+        "test error"
+    }
+}

Packages/Duckable/.gitignore

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

Packages/Duckable/Package.swift

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

Packages/Duckable/README.md

@@ -1,3 +0,0 @@
-# Duckable
-
-A package that allows modally-presented view controllers to be 'ducked' to make the content behind them accessible (à la Mail.app).

Packages/Duckable/Sources/Duckable/API.swift

@@ -1,44 +0,0 @@
-//
-//  API.swift
-//  Duckable
-//
-//  Created by Shadowfacts on 11/7/22.
-//
-
-import UIKit
-
-public protocol DuckableViewController: UIViewController {
-    var duckableDelegate: DuckableViewControllerDelegate? { get set }
-    
-    func duckableViewControllerMayAttemptToDuck()
-    
-    func duckableViewControllerWillAnimateDuck(withDuration duration: CGFloat, afterDelay delay: CGFloat)
-    
-    func duckableViewControllerDidFinishAnimatingDuck()
-}
-
-extension DuckableViewController {
-    public func duckableViewControllerMayAttemptToDuck() {}
-    public func duckableViewControllerWillAnimateDuck(withDuration duration: CGFloat, afterDelay delay: CGFloat) {}
-    public func duckableViewControllerDidFinishAnimatingDuck() {}
-}
-
-public protocol DuckableViewControllerDelegate: AnyObject {
-    func duckableViewControllerWillDismiss(animated: Bool)
-}
-
-extension UIViewController {
-    @available(iOS 16.0, *)
-    public func presentDuckable(_ viewController: DuckableViewController, animated: Bool, isDucked: Bool = false) -> Bool {
-        var cur: UIViewController? = self
-        while let vc = cur {
-            if let container = vc as? DuckableContainerViewController {
-                container.presentDuckable(viewController, animated: animated, isDucked: isDucked, completion: nil)
-                return true
-            } else {
-                cur = vc.parent
-            }
-        }
-        return false
-    }
-}

Packages/Duckable/Sources/Duckable/DetentIdentifier.swift

@@ -1,12 +0,0 @@
-//
-//  DetentIdentifier.swift
-//  Duckable
-//
-//  Created by Shadowfacts on 11/7/22.
-//
-
-import UIKit
-
-extension UISheetPresentationController.Detent.Identifier {
-    static let bottom = Self("\(Bundle.main.bundleIdentifier!).bottom")
-}

Packages/Duckable/Sources/Duckable/DuckAnimationController.swift

@@ -1,89 +0,0 @@
-//
-//  DuckAnimationController.swift
-//  Duckable
-//
-//  Created by Shadowfacts on 11/7/22.
-//
-
-import UIKit
-
-@available(iOS 16.0, *)
-class DuckAnimationController: NSObject, UIViewControllerAnimatedTransitioning {
-    let owner: DuckableContainerViewController
-    let needsShrinkAnimation: Bool
-    
-    init(owner: DuckableContainerViewController, needsShrinkAnimation: Bool) {
-        self.owner = owner
-        self.needsShrinkAnimation = needsShrinkAnimation
-    }
-    
-    func transitionDuration(using transitionContext: UIViewControllerContextTransitioning?) -> TimeInterval {
-        return 0.2
-    }
-
-    func animateTransition(using transitionContext: UIViewControllerContextTransitioning) {
-        guard case .ducked(let duckable, placeholder: let placeholder) = owner.state,
-              let presented = transitionContext.viewController(forKey: .from) else {
-            transitionContext.completeTransition(false)
-            return
-        }
-
-        guard transitionContext.isAnimated else {
-            transitionContext.completeTransition(true)
-            return
-        }
-        
-        let container = transitionContext.containerView
-        
-
-        if needsShrinkAnimation {
-            
-            duckable.duckableViewControllerWillAnimateDuck(withDuration: 0.2, afterDelay: 0.2)
-
-            let presentedFrameInContainer = container.convert(presented.view.bounds, from: presented.view)
-            let heightToSlide = container.bounds.height - container.safeAreaInsets.bottom - detentHeight - presentedFrameInContainer.minY
-
-            let slideAnimator = UIViewPropertyAnimator(duration: 0.4, dampingRatio: 1)
-            slideAnimator.addAnimations {
-                container.transform = CGAffineTransform(translationX: 0, y: heightToSlide + 10)
-            }
-            slideAnimator.addCompletion { _ in
-                duckable.duckableViewControllerDidFinishAnimatingDuck()
-                transitionContext.completeTransition(true)
-            }
-            slideAnimator.startAnimation()
-
-            placeholder.view.transform = CGAffineTransform(translationX: 0, y: 10)
-            let bounceAnimator = UIViewPropertyAnimator(duration: 0.1, curve: .linear) {
-                placeholder.view.transform = .identity
-                container.transform = CGAffineTransform(translationX: 0, y: heightToSlide)
-            }
-            bounceAnimator.startAnimation(afterDelay: 0.3)
-
-            let fadeAnimator = UIViewPropertyAnimator(duration: 0.1, curve: .linear) {
-                presented.view.layer.opacity = 0
-            }
-            fadeAnimator.startAnimation(afterDelay: 0.3)
-
-        } else {
-            
-            duckable.duckableViewControllerWillAnimateDuck(withDuration: 0.2, afterDelay: 0)
-
-            placeholder.view.transform = CGAffineTransform(translationX: 0, y: 10)
-            let bounceAnimator = UIViewPropertyAnimator(duration: 0.1, curve: .linear) {
-                placeholder.view.transform = .identity
-                container.transform = CGAffineTransform(translationX: 0, y: -10)
-            }
-            bounceAnimator.startAnimation(afterDelay: 0.2)
-
-            let fadeAnimator = UIViewPropertyAnimator(duration: 0.1, curve: .linear) {
-                presented.view.layer.opacity = 0
-            }
-            fadeAnimator.addCompletion { _ in
-                duckable.duckableViewControllerDidFinishAnimatingDuck()
-                transitionContext.completeTransition(true)
-            }
-            fadeAnimator.startAnimation(afterDelay: 0.2)
-        }
-    }
-}

Packages/Duckable/Sources/Duckable/DuckableContainerViewController.swift

@@ -1,239 +0,0 @@
-//
-//  DuckableContainerViewController.swift
-//  Duckable
-//
-//  Created by Shadowfacts on 11/7/22.
-//
-
-import UIKit
-
-let duckedCornerRadius: CGFloat = 10
-let detentHeight: CGFloat = 44
-
-@available(iOS 16.0, *)
-public class DuckableContainerViewController: UIViewController, DuckableViewControllerDelegate {
-    
-    public let child: UIViewController
-    private var bottomConstraint: NSLayoutConstraint!
-    private(set) var state = State.idle
-    
-    public var duckedViewController: DuckableViewController? {
-        if case .ducked(let vc, placeholder: _) = state {
-            return vc
-        } else {
-            return nil
-        }
-    }
-    
-    public init(child: UIViewController) {
-        self.child = child
-        
-        super.init(nibName: nil, bundle: nil)
-        
-        swizzleSheetController()
-    }
-    
-    required init?(coder: NSCoder) {
-        fatalError()
-    }
-
-    public override func viewDidLoad() {
-        super.viewDidLoad()
-        
-        view.backgroundColor = .black
-
-        child.beginAppearanceTransition(true, animated: false)
-        addChild(child)
-        child.didMove(toParent: self)
-        child.view.translatesAutoresizingMaskIntoConstraints = false
-        view.addSubview(child.view)
-        child.endAppearanceTransition()
-        
-        bottomConstraint = child.view.bottomAnchor.constraint(equalTo: view.bottomAnchor)
-        NSLayoutConstraint.activate([
-            child.view.leadingAnchor.constraint(equalTo: view.leadingAnchor),
-            child.view.trailingAnchor.constraint(equalTo: view.trailingAnchor),
-            child.view.topAnchor.constraint(equalTo: view.topAnchor),
-            bottomConstraint,
-        ])
-    }
-    
-    func presentDuckable(_ viewController: DuckableViewController, animated: Bool, isDucked: Bool, completion: (() -> Void)?) {
-        guard case .idle = state else {
-            if animated,
-               case .ducked(_, placeholder: let placeholder) = state {
-                UIImpactFeedbackGenerator(style: .soft).impactOccurred()
-                let origConstant = placeholder.topConstraint.constant
-                UIView.animateKeyframes(withDuration: 0.4, delay: 0) {
-                    UIView.addKeyframe(withRelativeStartTime: 0, relativeDuration: 0.5) {
-                        placeholder.topConstraint.constant = origConstant - 20
-                        self.view.layoutIfNeeded()
-                    }
-                    UIView.addKeyframe(withRelativeStartTime: 0.5, relativeDuration: 0.5) {
-                        placeholder.topConstraint.constant = origConstant
-                        self.view.layoutIfNeeded()
-                    }
-                }
-            }
-            return
-        }
-        if isDucked {
-            state = .ducked(viewController, placeholder: createPlaceholderForDuckedViewController(viewController))
-            configureChildForDuckedPlaceholder()
-        } else {
-            state = .presentingDucked(viewController, isFirstPresentation: true)
-            doPresentDuckable(viewController, animated: animated, completion: completion)
-        }
-    }
-    
-    private func doPresentDuckable(_ viewController: DuckableViewController, animated: Bool, completion: (() -> Void)?) {
-        viewController.duckableDelegate = self
-        let nav = UINavigationController(rootViewController: viewController)
-        nav.modalPresentationStyle = .custom
-        nav.transitioningDelegate = self
-        present(nav, animated: animated) {
-            self.configureChildForDuckedPlaceholder()
-            completion?()
-        }
-    }
-    
-    public func duckableViewControllerWillDismiss(animated: Bool) {
-        state = .idle
-        bottomConstraint.isActive = false
-        bottomConstraint = child.view.bottomAnchor.constraint(equalTo: view.bottomAnchor)
-        bottomConstraint.isActive = true
-        child.view.layer.cornerRadius = 0
-        setOverrideTraitCollection(nil, forChild: child)
-    }
-    
-    func createPlaceholderForDuckedViewController(_ viewController: DuckableViewController) -> DuckedPlaceholderViewController {
-        let placeholder = DuckedPlaceholderViewController(for: viewController, owner: self)
-        placeholder.view.translatesAutoresizingMaskIntoConstraints = false
-        
-        placeholder.beginAppearanceTransition(true, animated: false)
-        self.addChild(placeholder)
-        placeholder.didMove(toParent: self)
-        self.view.addSubview(placeholder.view)
-        placeholder.endAppearanceTransition()
-        
-        let placeholderTopConstraint = placeholder.view.topAnchor.constraint(equalTo: self.view.safeAreaLayoutGuide.bottomAnchor, constant: -detentHeight)
-        placeholder.topConstraint = placeholderTopConstraint
-        NSLayoutConstraint.activate([
-            placeholder.view.leadingAnchor.constraint(equalTo: self.view.leadingAnchor),
-            placeholder.view.trailingAnchor.constraint(equalTo: self.view.trailingAnchor),
-            placeholder.view.bottomAnchor.constraint(equalTo: self.view.bottomAnchor),
-            placeholderTopConstraint
-        ])
-            
-        // otherwise the layout changes get lumped in with the system animation
-        UIView.performWithoutAnimation {
-            self.view.layoutIfNeeded()
-        }
-        return placeholder
-    }
-    
-    func duckViewController() {
-        guard case .presentingDucked(let viewController, isFirstPresentation: _) = state else {
-            return
-        }
-        let placeholder = createPlaceholderForDuckedViewController(viewController)
-        state = .ducked(viewController, placeholder: placeholder)
-        configureChildForDuckedPlaceholder()
-        dismiss(animated: true)
-    }
-    
-    private func configureChildForDuckedPlaceholder() {
-        bottomConstraint.isActive = false
-        bottomConstraint = child.view.bottomAnchor.constraint(equalTo: view.safeAreaLayoutGuide.bottomAnchor, constant: -detentHeight - 4)
-        bottomConstraint.isActive = true
-        
-        child.view.layer.cornerRadius = duckedCornerRadius
-        child.view.layer.maskedCorners = [.layerMinXMaxYCorner, .layerMaxXMaxYCorner]
-        child.view.layer.masksToBounds = true
-    }
-    
-    @objc func unduckViewController() {
-        guard case .ducked(let viewController, placeholder: let placeholder) = state else {
-            return
-        }
-        state = .presentingDucked(viewController, isFirstPresentation: false)
-        doPresentDuckable(viewController, animated: true) {
-            placeholder.view.removeFromSuperview()
-            placeholder.willMove(toParent: nil)
-            placeholder.removeFromParent()
-        }
-    }
-    
-    func sheetOffsetDidChange() {
-        if case .presentingDucked(let duckable, isFirstPresentation: _) = state {
-            duckable.duckableViewControllerMayAttemptToDuck()
-        }
-    }
-    
-    enum State {
-        case idle
-        case presentingDucked(DuckableViewController, isFirstPresentation: Bool)
-        case ducked(DuckableViewController, placeholder: DuckedPlaceholderViewController)
-    }
-
-}
-
-@available(iOS 16.0, *)
-extension DuckableContainerViewController: UIViewControllerTransitioningDelegate {
-    public func presentationController(forPresented presented: UIViewController, presenting: UIViewController?, source: UIViewController) -> UIPresentationController? {
-        let controller = UISheetPresentationController(presentedViewController: presented, presenting: presenting)
-        controller.delegate = self
-        controller.prefersGrabberVisible = true
-        controller.selectedDetentIdentifier = .large
-        controller.largestUndimmedDetentIdentifier = .bottom
-        controller.detents = [
-            .custom(identifier: .bottom, resolver: { context in
-                return detentHeight
-            }),
-            .large(),
-        ]
-        return controller
-    }
-    
-    public func animationController(forDismissed dismissed: UIViewController) -> UIViewControllerAnimatedTransitioning? {
-        if case .ducked(_, placeholder: _) = state {
-            return DuckAnimationController(
-                owner: self,
-                needsShrinkAnimation: isDetentChangingDueToGrabberAction
-            )
-        } else {
-            return nil
-        }
-    }
-}
-
-@available(iOS 16.0, *)
-extension DuckableContainerViewController: UISheetPresentationControllerDelegate {
-    public func presentationController(_ presentationController: UIPresentationController, willPresentWithAdaptiveStyle style: UIModalPresentationStyle, transitionCoordinator: UIViewControllerTransitionCoordinator?) {
-        guard let snapshot = child.view.snapshotView(afterScreenUpdates: false) else {
-            setOverrideTraitCollection(UITraitCollection(userInterfaceLevel: .elevated), forChild: child)
-            return
-        }
-        snapshot.translatesAutoresizingMaskIntoConstraints = false
-        self.view.addSubview(snapshot)
-        NSLayoutConstraint.activate([
-            snapshot.leadingAnchor.constraint(equalTo: child.view.leadingAnchor),
-            snapshot.trailingAnchor.constraint(equalTo: child.view.trailingAnchor),
-            snapshot.topAnchor.constraint(equalTo: child.view.topAnchor),
-            snapshot.bottomAnchor.constraint(equalTo: child.view.bottomAnchor),
-        ])
-        setOverrideTraitCollection(UITraitCollection(userInterfaceLevel: .elevated), forChild: child)
-        transitionCoordinator!.animate { context in
-            snapshot.layer.opacity = 0
-        } completion: { _ in
-            snapshot.removeFromSuperview()
-        }
-    }
-    
-    public func sheetPresentationControllerDidChangeSelectedDetentIdentifier(_ sheetPresentationController: UISheetPresentationController) {
-        if sheetPresentationController.selectedDetentIdentifier == .bottom {
-            duckViewController()
-        }
-    }
-}
-

Packages/Duckable/Sources/Duckable/DuckedPlaceholderViewController.swift

@@ -1,71 +0,0 @@
-//
-//  DuckedPlaceholderView.swift
-//  Duckable
-//
-//  Created by Shadowfacts on 11/7/22.
-//
-
-import UIKit
-
-@available(iOS 16.0, *)
-class DuckedPlaceholderViewController: UIViewController {
-    private unowned let owner: DuckableContainerViewController
-    private let navBar = UINavigationBar()
-    
-    var topConstraint: NSLayoutConstraint!
-    
-    init(for duckableViewController: DuckableViewController, owner: DuckableContainerViewController) {
-        self.owner = owner
-        
-        super.init(nibName: nil, bundle: nil)
-        
-        let item = UINavigationItem()
-        item.title = duckableViewController.navigationItem.title
-        item.titleView = duckableViewController.navigationItem.titleView
-        navBar.setItems([item], animated: false)
-    }
-    
-    required init?(coder: NSCoder) {
-        fatalError()
-    }
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        
-        setBackgroundColor()
-        view.layer.cornerRadius = duckedCornerRadius
-        view.layer.maskedCorners = [.layerMinXMinYCorner, .layerMaxXMinYCorner]
-        view.layer.shadowColor = UIColor.black.cgColor
-        view.layer.shadowOpacity = 0.05
-        
-        view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(placeholderTapped)))
-        
-        let appearance = UINavigationBarAppearance()
-        appearance.configureWithTransparentBackground()
-        navBar.standardAppearance = appearance
-        navBar.isUserInteractionEnabled = false
-        navBar.translatesAutoresizingMaskIntoConstraints = false
-        view.addSubview(navBar)
-        NSLayoutConstraint.activate([
-            navBar.leadingAnchor.constraint(equalTo: view.leadingAnchor),
-            navBar.trailingAnchor.constraint(equalTo: view.trailingAnchor),
-            navBar.topAnchor.constraint(equalTo: view.topAnchor),
-        ])
-    }
-    
-    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
-        super.traitCollectionDidChange(previousTraitCollection)
-        
-        setBackgroundColor()
-    }
-    
-    private func setBackgroundColor() {
-        // when just using .systemBackground and setting the override trait collection for the placeholder VC,
-        // the color doesn't change until after the dismiss animation occurs (but only when tapping the grabber to duck, not when swiping)
-        view.backgroundColor = .systemBackground.resolvedColor(with: UITraitCollection(traitsFrom: [traitCollection, UITraitCollection(userInterfaceLevel: .elevated)]))
-    }
-    
-    @objc private func placeholderTapped() {
-        owner.unduckViewController()
-    }
-}

Packages/Duckable/Sources/Duckable/Swizzler.swift

@@ -1,33 +0,0 @@
-//
-//  Swizzler.swift
-//  Duckable
-//
-//  Created by Shadowfacts on 11/7/22.
-//
-
-import UIKit
-import os.log
-
-private var hasInitialized = false
-var isDetentChangingDueToGrabberAction = false
-
-@available(iOS 16.0, *)
-func swizzleSheetController() {
-    guard !hasInitialized else {
-        return
-    }
-    hasInitialized = true
-    
-    var originalIMP: IMP?
-    let imp = imp_implementationWithBlock({ (self: UISheetPresentationController, param: AnyObject) in
-        let original = unsafeBitCast(originalIMP!, to: (@convention(c) (UISheetPresentationController, AnyObject) -> Void).self)
-        isDetentChangingDueToGrabberAction = true
-        original(self, param)
-        isDetentChangingDueToGrabberAction = false
-    } as @convention(block) (UISheetPresentationController, AnyObject) -> Void)
-    let sel = [":", "PrimaryAction", "GrabberDidTrigger", "dropShadowView", "_"].reversed().joined()
-    originalIMP = class_replaceMethod(UISheetPresentationController.self, Selector(sel), imp, "v@:@")
-    if originalIMP == nil {
-        os_log(.fault, log: .default, "Unable to initialize Duckable grabber tap hook")
-    }
-}

Packages/Pachyderm/Package.swift

@@ -1,34 +0,0 @@
-// swift-tools-version: 5.6
-// The swift-tools-version declares the minimum version of Swift required to build this package.
-
-import PackageDescription
-
-let package = Package(
-    name: "Pachyderm",
-    platforms: [
-        .iOS(.v14),
-    ],
-    products: [
-        // Products define the executables and libraries a package produces, and make them visible to other packages.
-        .library(
-            name: "Pachyderm",
-            targets: ["Pachyderm"]),
-    ],
-    dependencies: [
-        // Dependencies declare other packages that this package depends on.
-        .package(url: "https://github.com/karwa/swift-url.git", branch: "main"),
-    ],
-    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: "Pachyderm",
-            dependencies: [
-                .product(name: "WebURL", package: "swift-url"),
-                .product(name: "WebURLFoundationExtras", package: "swift-url"),
-            ]),
-        .testTarget(
-            name: "PachydermTests",
-            dependencies: ["Pachyderm"]),
-    ]
-)

Packages/Pachyderm/README.md

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

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

@@ -1,84 +0,0 @@
-//
-//  Card.swift
-//  Pachyderm
-//
-//  Created by Shadowfacts on 9/9/18.
-//  Copyright © 2018 Shadowfacts. All rights reserved.
-//
-
-import Foundation
-import WebURL
-
-public class Card: Codable {
-    public let url: WebURL
-    public let title: String
-    public let description: String
-    public let image: WebURL?
-    public let kind: Kind
-    public let authorName: String?
-    public let authorURL: WebURL?
-    public let providerName: String?
-    public let providerURL: WebURL?
-    public let html: String?
-    public let width: Int?
-    public let height: Int?
-    public let blurhash: String?
-    /// Only present when returned from the trending links endpoint
-    public let history: [History]?
-    
-    public required init(from decoder: Decoder) throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        
-        self.url = try container.decode(WebURL.self, forKey: .url)
-        self.title = try container.decode(String.self, forKey: .title)
-        self.description = try container.decode(String.self, forKey: .description)
-        self.kind = try container.decode(Kind.self, forKey: .kind)
-        self.image = try? container.decodeIfPresent(WebURL.self, forKey: .image)
-        self.authorName = try? container.decodeIfPresent(String.self, forKey: .authorName)
-        self.authorURL = try? container.decodeIfPresent(WebURL.self, forKey: .authorURL)
-        self.providerName = try? container.decodeIfPresent(String.self, forKey: .providerName)
-        self.providerURL = try? container.decodeIfPresent(WebURL.self, forKey: .providerURL)
-        self.html = try? container.decodeIfPresent(String.self, forKey: .html)
-        self.width = try? container.decodeIfPresent(Int.self, forKey: .width)
-        self.height = try? container.decodeIfPresent(Int.self, forKey: .height)
-        self.blurhash = try? container.decodeIfPresent(String.self, forKey: .blurhash)
-        self.history = try? container.decodeIfPresent([History].self, forKey: .history)
-    }
-    
-    public func encode(to encoder: Encoder) throws {
-        var container = encoder.container(keyedBy: CodingKeys.self)
-        
-        try container.encode(url, forKey: .url)
-        try container.encode(title, forKey: .title)
-        try container.encode(description, forKey: .description)
-        try container.encode(kind, forKey: .kind)
-        try container.encode(image, forKey: .image)
-        try container.encode(blurhash, forKey: .blurhash)
-    }
-    
-    private enum CodingKeys: String, CodingKey {
-        case url
-        case title
-        case description
-        case image
-        case kind = "type"
-        case authorName = "author_name"
-        case authorURL = "author_url"
-        case providerName = "provider_name"
-        case providerURL = "provider_url"
-        case html
-        case width
-        case height
-        case blurhash
-        case history
-    }
-}
-
-extension Card {
-    public enum Kind: String, Codable {
-        case link
-        case photo
-        case video
-        case rich
-    }
-}

Packages/Pachyderm/Sources/Pachyderm/Model/DirectoryOrder.swift

@@ -1,14 +0,0 @@
-//
-//  DirectoryOrder.swift
-//  Pachyderm
-//
-//  Created by Shadowfacts on 2/6/21.
-//  Copyright © 2021 Shadowfacts. All rights reserved.
-//
-
-import Foundation
-
-public enum DirectoryOrder: String, CaseIterable {
-    case active
-    case new
-}

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

@@ -1,50 +0,0 @@
-//
-//  Emoji.swift
-//  Pachyderm
-//
-//  Created by Shadowfacts on 9/8/18.
-//  Copyright © 2018 Shadowfacts. All rights reserved.
-//
-
-import Foundation
-import WebURL
-
-public class Emoji: Codable {
-    public let shortcode: String
-    // these shouldn't need to be WebURLs as they're not external resources,
-    // but some instances (pleroma?) has emoji urls that Foundation considers malformed so we use WebURL to be more lenient
-    public let url: WebURL
-    public let staticURL: WebURL
-    public let visibleInPicker: Bool
-    public let category: String?
-    
-    public required init(from decoder: Decoder) throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        
-        self.shortcode = try container.decode(String.self, forKey: .shortcode)
-        self.url = try container.decode(WebURL.self, forKey: .url)
-        self.staticURL = try container.decode(WebURL.self, forKey: .staticURL)
-        self.visibleInPicker = try container.decode(Bool.self, forKey: .visibleInPicker)
-        self.category = try container.decodeIfPresent(String.self, forKey: .category)
-    }
-    
-    private enum CodingKeys: String, CodingKey {
-        case shortcode
-        case url
-        case staticURL = "static_url"
-        case visibleInPicker = "visible_in_picker"
-        case category
-    }
-}
-
-extension Emoji: CustomDebugStringConvertible {
-    public var debugDescription: String {
-        return ":\(shortcode):"
-    }
-}
-
-extension Emoji: Equatable {
-    public static func ==(lhs: Emoji, rhs: Emoji) -> Bool {
-        return lhs.shortcode == rhs.shortcode && lhs.url == rhs.url
-    }
-}

Packages/Pachyderm/Sources/Pachyderm/Model/FilterV2.swift

@@ -1,115 +0,0 @@
-//
-//  FilterV2.swift
-//  Pachyderm
-//
-//  Created by Shadowfacts on 12/2/22.
-//
-
-import Foundation
-
-public struct FilterV2: Decodable {
-    public let id: String
-    public let title: String
-    public let context: [FilterV1.Context]
-    public let expiresAt: Date?
-    public let action: Action
-    public let keywords: [Keyword]
-    
-    public static func update(
-        _ filterID: String,
-        title: String,
-        context: [FilterV1.Context],
-        expiresIn: TimeInterval?,
-        action: Action,
-        keywords keywordUpdates: [KeywordUpdate]
-    ) -> Request<FilterV2> {
-        var keywordsParams = [Parameter]()
-        for (index, update) in keywordUpdates.enumerated() {
-            switch update {
-            case .update(id: let id, keyword: let keyword, wholeWord: let wholeWord):
-                keywordsParams.append("keywords_attributes[\(index)][id]" => id)
-                keywordsParams.append("keywords_attributes[\(index)][keyword]" => keyword)
-                keywordsParams.append("keywords_attributes[\(index)][whole_word]" => wholeWord)
-            case .add(keyword: let keyword, wholeWord: let wholeWord):
-                keywordsParams.append("keywords_attributes[\(index)][keyword]" => keyword)
-                keywordsParams.append("keywords_attributes[\(index)][whole_word]" => wholeWord)
-            case .destroy(id: let id):
-                keywordsParams.append("keywords_attributes[\(index)][id]" => id)
-                keywordsParams.append("keywords_attributes[\(index)][_destroy]" => true)
-            }
-        }
-        return Request(method: .put, path: "/api/v2/filters/\(filterID)", body: ParametersBody([
-            "title" => title,
-            "expires_in" => expiresIn,
-            "filter_action" => action.rawValue,
-        ] + "context" => context.contextStrings + keywordsParams))
-    }
-    
-    public static func create(
-        title: String,
-        context: [FilterV1.Context],
-        expiresIn: TimeInterval?,
-        action: Action,
-        keywords keywordUpdates: [KeywordUpdate]
-    ) -> Request<FilterV2> {
-        var keywordsParams = [Parameter]()
-        for (index, update) in keywordUpdates.enumerated() {
-            switch update {
-            case .add(keyword: let keyword, wholeWord: let wholeWord):
-                keywordsParams.append("keywords_attributes[\(index)][keyword]" => keyword)
-                keywordsParams.append("keywords_attributes[\(index)][whole_word]" => wholeWord)
-            default:
-                fatalError("can only add keywords when creating filter")
-            }
-        }
-        return Request(method: .post, path: "/api/v2/filters", body: ParametersBody([
-            "title" => title,
-            "expires_in" => expiresIn,
-            "filter_action" => action.rawValue,
-        ] + "context" => context.contextStrings + keywordsParams))
-    }
-    
-    private enum CodingKeys: String, CodingKey {
-        case id
-        case title
-        case context
-        case expiresAt = "expires_at"
-        case action = "filter_action"
-        case keywords
-    }
-}
-
-extension FilterV2 {
-    public enum Action: String, Decodable, Hashable, CaseIterable {
-        case warn
-        case hide
-    }
-}
-
-extension FilterV2 {
-    public struct Keyword: Decodable {
-        public let id: String
-        public let keyword: String
-        public let wholeWord: Bool
-        
-        public init(id: String, keyword: String, wholeWord: Bool) {
-            self.id = id
-            self.keyword = keyword
-            self.wholeWord = wholeWord
-        }
-        
-        private enum CodingKeys: String, CodingKey {
-            case id
-            case keyword
-            case wholeWord = "whole_word"
-        }
-    }
-}
-
-extension FilterV2 {
-    public enum KeywordUpdate {
-        case update(id: String, keyword: String, wholeWord: Bool)
-        case add(keyword: String, wholeWord: Bool)
-        case destroy(id: String)
-    }
-}

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

@@ -1,69 +0,0 @@
-//
-//  Hashtag.swift
-//  Pachyderm
-//
-//  Created by Shadowfacts on 9/9/18.
-//  Copyright © 2018 Shadowfacts. All rights reserved.
-//
-
-import Foundation
-import WebURL
-import WebURLFoundationExtras
-
-public class Hashtag: Codable {
-    public let name: String
-    public let url: WebURL
-    /// Only present when returned from the trending hashtags endpoint
-    public let history: [History]?
-    /// Only present on Mastodon >= 4 and when logged in
-    public let following: Bool?
-    
-    public init(name: String, url: URL) {
-        self.name = name
-        self.url = WebURL(url)!
-        self.history = nil
-        self.following = nil
-    }
-    
-    public required init(from decoder: Decoder) throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        self.name = try container.decode(String.self, forKey: .name)
-        // pixelfed (possibly others) don't fully escape special characters in the hashtag url
-        self.url = try container.decode(WebURL.self, forKey: .url)
-        self.history = try container.decodeIfPresent([History].self, forKey: .history)
-        self.following = try container.decodeIfPresent(Bool.self, forKey: .following)
-    }
-    
-    public func encode(to encoder: Encoder) throws {
-        var container = encoder.container(keyedBy: CodingKeys.self)
-        try container.encode(name, forKey: .name)
-        try container.encode(url, forKey: .url)
-        try container.encodeIfPresent(history, forKey: .history)
-        try container.encodeIfPresent(following, forKey: .following)
-    }
-    
-    public static func follow(name: String) -> Request<Hashtag> {
-        return Request(method: .post, path: "/api/v1/tags/\(name)/follow")
-    }
-    
-    public static func unfollow(name: String) -> Request<Hashtag> {
-        return Request(method: .post, path: "/api/v1/tags/\(name)/unfollow")
-    }
-    
-    private enum CodingKeys: String, CodingKey {
-        case name
-        case url
-        case history
-        case following
-    }
-}
-
-extension Hashtag: Equatable, Hashable {
-    public static func ==(lhs: Hashtag, rhs: Hashtag) -> Bool {
-        return lhs.name == rhs.name
-    }
-    
-    public func hash(into hasher: inout Hasher) {
-        hasher.combine(url)
-    }
-}

Packages/Pachyderm/Sources/Pachyderm/Model/History.swift

@@ -1,54 +0,0 @@
-//
-//  History.swift
-//  Pachyderm
-//
-//  Created by Shadowfacts on 4/2/22.
-//  Copyright © 2022 Shadowfacts. All rights reserved.
-//
-
-import Foundation
-
-public class History: Codable {
-    public let day: Date
-    public let uses: Int
-    public let accounts: Int
-    
-    public required init(from decoder: Decoder) throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        
-        if let day = try? container.decode(Date.self, forKey: .day) {
-            self.day = day
-        } else if let unixTimestamp = try? container.decode(Double.self, forKey: .day) {
-            self.day = Date(timeIntervalSince1970: unixTimestamp)
-        } else if let str = try? container.decode(String.self, forKey: .day),
-            let unixTimestamp = Double(str) {
-            self.day = Date(timeIntervalSince1970: unixTimestamp)
-        } else {
-            throw DecodingError.dataCorruptedError(forKey: .day, in: container, debugDescription: "day must be either date or UNIX timestamp")
-        }
-        
-        if let uses = try? container.decode(Int.self, forKey: .uses) {
-            self.uses = uses
-        } else if let str = try? container.decode(String.self, forKey: .uses),
-            let uses = Int(str) {
-            self.uses = uses
-        } else {
-            throw DecodingError.dataCorruptedError(forKey: .uses, in: container, debugDescription: "uses must either be int or string containing int")
-        }
-        
-        if let accounts = try? container.decode(Int.self, forKey: .accounts) {
-            self.accounts = accounts
-        } else if let str = try? container.decode(String.self, forKey: .accounts),
-            let accounts = Int(str) {
-            self.accounts = accounts
-        } else {
-            throw DecodingError.dataCorruptedError(forKey: .accounts, in: container, debugDescription: "accounts must either be int or string containing int")
-        }
-    }
-
-    private enum CodingKeys: String, CodingKey {
-        case day
-        case uses
-        case accounts
-    }
-}

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

@@ -1,179 +0,0 @@
-//
-//  Instance.swift
-//  Pachyderm
-//
-//  Created by Shadowfacts on 9/9/18.
-//  Copyright © 2018 Shadowfacts. All rights reserved.
-//
-
-import Foundation
-
-public class Instance: Decodable {
-    public let uri: String
-    public let title: String
-    public let description: String
-    public let shortDescription: String?
-    public let email: String?
-    public let version: String
-    public let urls: [String: URL]
-    public let thumbnail: URL?
-    public let languages: [String]?
-    public let stats: Stats?
-    public let configuration: Configuration?
-    public let rules: [Rule]?
-
-    // pleroma doesn't currently implement these
-    public let contactAccount: Account?
-    
-    // superseded by mastodon's configuration.statuses.max_characters, still used by older instances & pleroma
-    let maxTootCharacters: Int?
-    let pollLimits: PollsConfiguration?
-    
-    public var maxStatusCharacters: Int? {
-        configuration?.statuses.maxCharacters ?? maxTootCharacters
-    }
-    public var pollsConfiguration: PollsConfiguration? {
-        configuration?.polls ?? pollLimits
-    }
-    
-    // we need a custom decoder, because all API-compatible implementations don't return some data in the same format
-    public required init(from decoder: Decoder) throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        self.uri = try container.decode(String.self, forKey: .uri)
-        self.title = try container.decode(String.self, forKey: .title)
-        self.description = try container.decode(String.self, forKey: .description)
-        self.shortDescription = try container.decodeIfPresent(String.self, forKey: .shortDescription)
-        self.email = try container.decodeIfPresent(String.self, forKey: .email)
-        self.version = try container.decode(String.self, forKey: .version)
-        if let urls = try? container.decodeIfPresent([String: URL].self, forKey: .urls) {
-            self.urls = urls
-        } else {
-            self.urls = [:]
-        }
-        
-        self.languages = try? container.decodeIfPresent([String].self, forKey: .languages)
-        self.contactAccount = try? container.decodeIfPresent(Account.self, forKey: .contactAccount)
-        
-        self.stats = try? container.decodeIfPresent(Stats.self, forKey: .stats)
-        self.thumbnail = try? container.decodeIfPresent(URL.self, forKey: .thumbnail)
-        
-        self.configuration = try? container.decodeIfPresent(Configuration.self, forKey: .configuration)
-        self.rules = try? container.decodeIfPresent([Rule].self, forKey: .rules)
-        
-        if let maxTootCharacters = try? container.decodeIfPresent(Int.self, forKey: .maxTootCharacters) {
-            self.maxTootCharacters = maxTootCharacters
-        } else if let str = try? container.decodeIfPresent(String.self, forKey: .maxTootCharacters),
-            let maxTootCharacters = Int(str, radix: 10) {
-            self.maxTootCharacters = maxTootCharacters
-        } else {
-            self.maxTootCharacters = nil
-        }
-        self.pollLimits = try? container.decodeIfPresent(PollsConfiguration.self, forKey: .pollLimits)
-        
-    }
-    
-    private enum CodingKeys: String, CodingKey {
-        case uri
-        case title
-        case description
-        case shortDescription = "short_description"
-        case email
-        case version
-        case urls
-        case thumbnail
-        case languages
-        case stats
-        case configuration
-        case contactAccount = "contact_account"
-        case rules
-        
-        case maxTootCharacters = "max_toot_chars"
-        case pollLimits = "poll_limits"
-    }
-}
-
-extension Instance {
-    public struct Stats: Decodable {
-        public let domainCount: Int?
-        public let statusCount: Int?
-        public let userCount: Int?
-        
-        private enum CodingKeys: String, CodingKey {
-            case domainCount = "domain_count"
-            case statusCount = "status_count"
-            case userCount = "user_count"
-        }
-    }
-}
-
-extension Instance {
-    public struct Configuration: Decodable {
-        public let statuses: StatusesConfiguration
-        public let mediaAttachments: MediaAttachmentsConfiguration
-        /// Use Instance.pollsConfiguration to support older instance that don't have this nested
-        let polls: PollsConfiguration
-        
-        private enum CodingKeys: String, CodingKey {
-            case statuses
-            case mediaAttachments = "media_attachments"
-            case polls
-        }
-    }
-}
-
-extension Instance {
-    public struct StatusesConfiguration: Decodable {
-        public let maxCharacters: Int
-        public let maxMediaAttachments: Int
-        public let charactersReservedPerURL: Int
-        
-        private enum CodingKeys: String, CodingKey {
-            case maxCharacters = "max_characters"
-            case maxMediaAttachments = "max_media_attachments"
-            case charactersReservedPerURL = "characters_reserved_per_url"
-        }
-    }
-}
-
-extension Instance {
-    public struct MediaAttachmentsConfiguration: Decodable {
-        public let supportedMIMETypes: [String]
-        public let imageSizeLimit: Int
-        public let imageMatrixLimit: Int
-        public let videoSizeLimit: Int
-        public let videoFrameRateLimit: Int
-        public let videoMatrixLimit: Int
-        
-        private enum CodingKeys: String, CodingKey {
-            case supportedMIMETypes = "supported_mime_types"
-            case imageSizeLimit = "image_size_limit"
-            case imageMatrixLimit = "image_matrix_limit"
-            case videoSizeLimit = "video_size_limit"
-            case videoFrameRateLimit = "video_frame_rate_limit"
-            case videoMatrixLimit = "video_matrix_limit"
-        }
-    }
-}
-
-extension Instance {
-    public struct PollsConfiguration: Decodable {
-        public let maxOptions: Int
-        public let maxCharactersPerOption: Int
-        public let minExpiration: TimeInterval
-        public let maxExpiration: TimeInterval
-        
-        private enum CodingKeys: String, CodingKey {
-            case maxOptions = "max_options"
-            case maxCharactersPerOption = "max_characters_per_option"
-            case minExpiration = "min_expiration"
-            case maxExpiration = "max_expiration"
-        }
-    }
-}
-
-extension Instance {
-    public struct Rule: Decodable, Identifiable {
-        public let id: String
-        public let text: String
-    }
-}

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

@@ -1,33 +0,0 @@
-//
-//  Mention.swift
-//  Pachyderm
-//
-//  Created by Shadowfacts on 9/9/18.
-//  Copyright © 2018 Shadowfacts. All rights reserved.
-//
-
-import Foundation
-import WebURL
-
-public struct Mention: Codable {
-    public let url: WebURL
-    public let username: String
-    public let acct: String
-    /// The instance-local ID of the user being mentioned.
-    public let id: String
-    
-    public init(from decoder: Decoder) throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        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)
-        self.url = try container.decode(WebURL.self, forKey: .url)
-    }
-    
-    private enum CodingKeys: String, CodingKey {
-        case url
-        case username
-        case acct
-        case id
-    }
-}

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

@@ -1,19 +0,0 @@
-//
-//  NodeInfo.swift
-//  Pachyderm
-//
-//  Created by Shadowfacts on 1/22/22.
-//  Copyright © 2022 Shadowfacts. All rights reserved.
-//
-
-import Foundation
-
-public struct NodeInfo: Decodable {
-    public let version: String
-    public let software: Software
-    
-    public struct Software: Decodable {
-        public let name: String
-        public let version: String
-    }
-}

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

@@ -1,55 +0,0 @@
-//
-//  Poll.swift
-//  Pachyderm
-//
-//  Created by Shadowfacts on 4/25/21.
-//  Copyright © 2021 Shadowfacts. All rights reserved.
-//
-
-import Foundation
-
-public final class Poll: Codable {
-    public let id: String
-    public let expiresAt: Date?
-    public let expired: Bool
-    public let multiple: Bool
-    public let votesCount: Int
-    public let votersCount: Int?
-    public let voted: Bool?
-    public let ownVotes: [Int]?
-    public let options: [Option]
-    public let emojis: [Emoji]
-    
-    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))
-    }
-    
-    private enum CodingKeys: String, CodingKey {
-        case id
-        case expiresAt = "expires_at"
-        case expired
-        case multiple
-        case votesCount = "votes_count"
-        case votersCount = "voters_count"
-        case voted
-        case ownVotes = "own_votes"
-        case options
-        case emojis
-    }
-}
-
-extension Poll {
-    public final class Option: Codable {
-        public let title: String
-        public let votesCount: Int?
-        
-        private enum CodingKeys: String, CodingKey {
-            case title
-            case votesCount = "votes_count"
-        }
-    }
-}

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

@@ -1,33 +0,0 @@
-//
-//  AccountProtocol.swift
-//  Pachyderm
-//
-//  Created by Shadowfacts on 4/11/20.
-//  Copyright © 2020 Shadowfacts. All rights reserved.
-//
-
-import Foundation
-
-public protocol AccountProtocol {
-    associatedtype Account: AccountProtocol
-    
-    var id: String { get }
-    var username: String { get }
-    var acct: String { get }
-    var displayName: String { get }
-    var locked: Bool { get }
-    var createdAt: Date { get }
-    var followersCount: Int { get }
-    var followingCount: Int { get }
-    var statusesCount: Int { get }
-    var note: String { get }
-    var url: URL { get }
-    var avatar: URL? { get }
-    var header: URL? { get }
-    var moved: Bool? { get }
-    var bot: Bool? { get }
-
-    var movedTo: Account? { get }
-    var emojis: [Emoji] { get }
-    var fields: [Pachyderm.Account.Field] { get }
-}

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

@@ -1,39 +0,0 @@
-//
-//  StatusProtocol.swift
-//  Pachyderm
-//
-//  Created by Shadowfacts on 4/11/20.
-//  Copyright © 2020 Shadowfacts. All rights reserved.
-//
-
-import Foundation
-
-public protocol StatusProtocol {
-    associatedtype Status: StatusProtocol
-    associatedtype Account: AccountProtocol
-    
-    var id: String { get }
-    var uri: String { get }
-    var inReplyToID: String? { get }
-    var inReplyToAccountID: String? { get }
-    var content: String { get }
-    var createdAt: Date { get }
-    var reblogsCount: Int { get }
-    var favouritesCount: Int { get }
-    // pachyderm impl wants Bool, StatusMO wants optional. not sure how to resolve it, but we don't need this currently
-//    var reblogged: Bool { get }
-//    var favourited: Bool { get }
-    var sensitive: Bool { get }
-    var spoilerText: String { get }
-    var visibility: Pachyderm.Status.Visibility { get }
-    var applicationName: String? { get }
-    var pinned: Bool? { get }
-    var bookmarked: Bool? { get }
-
-    var account: Account { get }
-    var reblog: Status? { get }
-    var attachments: [Attachment] { get }
-    var emojis: [Emoji] { get }
-    var hashtags: [Hashtag] { get }
-    var mentions: [Mention] { get }
-}

Packages/Pachyderm/Sources/Pachyderm/Model/RegisteredApplication.swift

@@ -1,40 +0,0 @@
-//
-//  RegisteredApplication.swift
-//  Pachyderm
-//
-//  Created by Shadowfacts on 9/9/18.
-//  Copyright © 2018 Shadowfacts. All rights reserved.
-//
-
-import Foundation
-
-public class RegisteredApplication: Decodable {
-    public let id: String
-    public let clientID: String
-    public let clientSecret: String
-    
-    public required init(from decoder: Decoder) throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        
-        // Pixelfed API returns id/client_id as numbers instead of strings
-        func decodeStringOrInt(key: CodingKeys) throws -> String {
-            if let str = try? container.decode(String.self, forKey: key) {
-                return str
-            } else if let int = try? container.decode(Int.self, forKey: key) {
-                return int.description
-            } else {
-                throw DecodingError.typeMismatch(String.self, DecodingError.Context(codingPath: container.codingPath + [CodingKeys.id], debugDescription: ""))
-            }
-        }
-        
-        self.id = try decodeStringOrInt(key: .id)
-        self.clientID = try decodeStringOrInt(key: .clientID)
-        self.clientSecret = try container.decode(String.self, forKey: .clientSecret)
-    }
-    
-    private enum CodingKeys: String, CodingKey {
-        case id
-        case clientID = "client_id"
-        case clientSecret = "client_secret"
-    }
-}

Packages/Pachyderm/Sources/Pachyderm/Model/SearchResultType.swift

@@ -1,15 +0,0 @@
-//
-//  SearchResultType.swift
-//  Pachyderm
-//
-//  Created by Shadowfacts on 10/11/20.
-//  Copyright © 2020 Shadowfacts. All rights reserved.
-//
-
-import Foundation
-
-public enum SearchResultType: String {
-    case accounts
-    case hashtags
-    case statuses
-}

Packages/Pachyderm/Sources/Pachyderm/Model/Suggestion.swift

@@ -1,25 +0,0 @@
-//
-//  Suggestion.swift
-//  Pachyderm
-//
-//  Created by Shadowfacts on 1/22/23.
-//
-
-import Foundation
-
-public struct Suggestion: Decodable {
-    public let source: Source
-    public let account: Account
-    
-    public static func remove(accountID: String) -> Request<Empty> {
-        return Request(method: .delete, path: "/api/v1/suggestions/\(accountID)")
-    }
-}
-
-extension Suggestion {
-    public enum Source: String, Decodable {
-        case staff
-        case pastInteractions = "past_interactions"
-        case global
-    }
-}

Packages/Pachyderm/Sources/Pachyderm/Model/WellKnown.swift

@@ -1,18 +0,0 @@
-//
-//  WellKnown.swift
-//  Pachyderm
-//
-//  Created by Shadowfacts on 1/22/22.
-//  Copyright © 2022 Shadowfacts. All rights reserved.
-//
-
-import Foundation
-
-struct WellKnown: Decodable {
-    let links: [Link]
-    
-    struct Link: Decodable {
-        let href: String
-        let rel: String
-    }
-}

Packages/Pachyderm/Sources/Pachyderm/Request/Body.swift

@@ -1,89 +0,0 @@
-//
-//  Body.swift
-//  Pachyderm
-//
-//  Created by Shadowfacts on 9/8/18.
-//  Copyright © 2018 Shadowfacts. All rights reserved.
-//
-
-import Foundation
-
-protocol Body {
-    var mimeType: String? { get }
-    var data: Data? { get }
-}
-
-struct EmptyBody: Body {
-    var mimeType: String? { nil }
-    var data: Data? { nil }
-}
-
-struct ParametersBody: Body {
-    let parameters: [Parameter]?
-    
-    init(_ parmaeters: [Parameter]?) {
-        self.parameters = parmaeters
-    }
-    
-    var mimeType: String? {
-        if parameters == nil || parameters!.isEmpty {
-            return nil
-        }
-        return "application/x-www-form-urlencoded; charset=utf-8"
-    }
-    
-    var data: Data? {
-        return parameters?.urlEncoded.data(using: .utf8)
-    }
-}
-
-struct FormDataBody: Body {
-    private static let boundary = "PachydermBoundary"
-    
-    let parameters: [Parameter]?
-    let attachment: FormAttachment?
-    
-    init(_ parameters: [Parameter]?, _ attachment: FormAttachment?) {
-        self.parameters = parameters
-        self.attachment = attachment
-    }
-    
-    var mimeType: String? {
-        if parameters == nil && attachment == nil {
-            return nil
-        }
-        return "multipart/form-data; boundary=\(FormDataBody.boundary)"
-    }
-    
-    var data: Data? {
-        var data = Data()
-        parameters?.forEach { param in
-            guard let value = param.value else { return }
-            data.append("--\(FormDataBody.boundary)\r\n")
-            data.append("Content-Disposition: form-data; name=\"\(param.name)\"\r\n\r\n")
-            data.append("\(value)\r\n")
-        }
-        if let attachment = attachment {
-            data.append("--\(FormDataBody.boundary)\r\n")
-            data.append("Content-Disposition: form-data; name=\"file\"; filename=\"\(attachment.fileName)\"\r\n")
-            data.append("Content-Type: \(attachment.mimeType)\r\n\r\n")
-            data.append(attachment.data)
-            data.append("\r\n")
-        }
-
-        data.append("--\(FormDataBody.boundary)--\r\n")
-        return data
-    }
-}
-
-struct JsonBody<T: Encodable>: Body {
-    let value: T
-    
-    init(_ value: T) {
-        self.value = value
-    }
-    
-    var mimeType: String? { "application/json" }
-    
-    var data: Data? { try? Client.encoder.encode(value) }
-}

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

@@ -1,62 +0,0 @@
-//
-//  Endpoint.swift
-//  Pachyderm
-//
-//  Created by Shadowfacts on 3/29/22.
-//  Copyright © 2022 Shadowfacts. All rights reserved.
-//
-
-import Foundation
-
-public struct Endpoint: ExpressibleByStringInterpolation, CustomStringConvertible {
-    let components: [Component]
-    
-    public init(stringLiteral value: StringLiteralType) {
-        self.components = [.literal(value)]
-    }
-    
-    public init(stringInterpolation: StringInterpolation) {
-        self.components = stringInterpolation.components
-    }
-    
-    var path: String {
-        components.map {
-            switch $0 {
-            case .literal(let s), .interpolated(let s):
-                return s
-            }
-        }.joined(separator: "")
-    }
-    
-    public var description: String {
-        components.map {
-            switch $0 {
-            case .literal(let s):
-                return s
-            case .interpolated(_):
-                return "<redacted>"
-            }
-        }.joined(separator: "")
-    }
-    
-    public struct StringInterpolation: StringInterpolationProtocol {
-        var components = [Component]()
-        
-        public init(literalCapacity: Int, interpolationCount: Int) {
-        }
-        
-        public mutating func appendLiteral(_ literal: StringLiteralType) {
-            components.append(.literal(literal))
-        }
-        
-        public mutating func appendInterpolation(_ value: String) {
-            components.append(.interpolated(value))
-        }
-    }
-    
-    enum Component {
-        case literal(String)
-        case interpolated(String)
-    }
-    
-}

Packages/Pachyderm/Sources/Pachyderm/Utilities/NotificationGroup.swift

@@ -1,117 +0,0 @@
-//
-//  NotificationGroup.swift
-//  Pachyderm
-//
-//  Created by Shadowfacts on 9/5/19.
-//  Copyright © 2019 Shadowfacts. All rights reserved.
-//
-
-import Foundation
-
-public struct NotificationGroup: Identifiable, Hashable {
-    public private(set) var notifications: [Notification]
-    public let id: String
-    public let kind: Notification.Kind
-    public let statusState: CollapseState?
-
-    init?(notifications: [Notification]) {
-        guard !notifications.isEmpty else { return nil }
-        self.notifications = notifications
-        self.id = notifications.first!.id
-        self.kind = notifications.first!.kind
-        if kind == .mention {
-            self.statusState = .unknown
-        } else {
-            self.statusState = nil
-        }
-    }
-    
-    public static func ==(lhs: NotificationGroup, rhs: NotificationGroup) -> Bool {
-        guard lhs.notifications.count == rhs.notifications.count else {
-            return false
-        }
-        for (a, b) in zip(lhs.notifications, rhs.notifications) where a.id != b.id {
-            return false
-        }
-        return true
-    }
-    
-    public func hash(into hasher: inout Hasher) {
-        for notification in notifications {
-            hasher.combine(notification.id)
-        }
-    }
-    
-    private mutating func append(_ notification: Notification) {
-        notifications.append(notification)
-    }
-    
-    private mutating func append(group: NotificationGroup) {
-        notifications.append(contentsOf: group.notifications)
-    }
-
-    public static func createGroups(notifications: [Notification], only allowedTypes: [Notification.Kind]) -> [NotificationGroup] {
-        var groups = [NotificationGroup]()
-        for notification in notifications {
-            if allowedTypes.contains(notification.kind) {
-                if let lastGroup = groups.last, canMerge(notification: notification, into: lastGroup) {
-                    groups[groups.count - 1].append(notification)
-                    continue
-                } else if groups.count >= 2 {
-                    let secondToLastGroup = groups[groups.count - 2]
-                    if allowedTypes.contains(groups[groups.count - 1].kind), canMerge(notification: notification, into: secondToLastGroup) {
-                        groups[groups.count - 2].append(notification)
-                        continue
-                    }
-                }
-            }
-            
-            groups.append(NotificationGroup(notifications: [notification])!)
-        }
-        return groups
-    }
-    
-    private static func canMerge(notification: Notification, into group: NotificationGroup) -> Bool {
-        return notification.kind == group.kind && notification.status?.id == group.notifications.first!.status?.id
-    }
-    
-    public static func mergeGroups(first: [NotificationGroup], second: [NotificationGroup], only allowedTypes: [Notification.Kind]) -> [NotificationGroup] {
-        guard !first.isEmpty else {
-            return second
-        }
-        guard !second.isEmpty else {
-            return first
-        }
-
-        var merged = first
-        var second = second
-        merged.reserveCapacity(second.count)
-        while let firstGroupFromSecond = second.first,
-              allowedTypes.contains(firstGroupFromSecond.kind) {
-            
-            second.removeFirst()
-            
-            guard let lastGroup = merged.last,
-                  allowedTypes.contains(lastGroup.kind) else {
-                merged.append(firstGroupFromSecond)
-                break
-            }
-            
-            if canMerge(notification: firstGroupFromSecond.notifications.first!, into: lastGroup) {
-                merged[merged.count - 1].append(group: firstGroupFromSecond)
-            } else if merged.count >= 2 {
-                let secondToLastGroup = merged[merged.count - 2]
-                if allowedTypes.contains(secondToLastGroup.kind), canMerge(notification: firstGroupFromSecond.notifications.first!, into: secondToLastGroup) {
-                    merged[merged.count - 2].append(group: firstGroupFromSecond)
-                } else {
-                    merged.append(firstGroupFromSecond)
-                }
-            } else {
-                merged.append(firstGroupFromSecond)
-            }
-        }
-        merged.append(contentsOf: second)
-        return merged
-    }
-    
-}

Packages/Pachyderm/Tests/PachydermTests/NotificationGroupTests.swift

@@ -1,268 +0,0 @@
-//
-//  NotificationGroupTests.swift
-//  
-//
-//  Created by Shadowfacts on 4/26/22.
-//
-
-import XCTest
-@testable import Pachyderm
-
-class NotificationGroupTests: XCTestCase {
-    
-    let decoder: JSONDecoder = {
-        let d = JSONDecoder()
-        d.dateDecodingStrategy = .iso8601
-        return d
-    }()
-    
-    let statusA = """
-    {
-        "id": "1",
-        "created_at": "2019-11-23T07:28:34Z",
-        "account": {
-          "id": "2",
-          "username": "bar",
-          "acct": "bar",
-          "display_name": "bar",
-          "locked": false,
-          "created_at": "2019-11-01T01:01:01Z",
-          "followers_count": 0,
-          "following_count": 0,
-          "statuses_count": 0,
-          "note": "",
-          "url": "https://example.com/@bar",
-          "uri": "https://example.com/@bar",
-        },
-        "url": "https://example.com/@bar/1",
-        "uri": "https://example.com/@bar/1",
-        "content": "",
-        "emojis": [],
-        "reblogs_count": 0,
-        "favourites_count": 0,
-        "sensitive": false,
-        "spoiler_text": "",
-        "visibility": "public",
-        "media_attachments": [],
-        "mentions": [],
-        "tags": [],
-      }
-    }
-    """
-    lazy var likeA1Data = """
-    {
-      "id": "1",
-      "type": "favourite",
-      "created_at": "2019-11-23T07:29:18Z",
-      "account": {
-        "id": "1",
-        "username": "foo",
-        "acct": "foo",
-        "display_name": "foo",
-        "locked": false,
-        "created_at": "2019-11-01T01:01:01Z",
-        "followers_count": 0,
-        "following_count": 0,
-        "statuses_count": 0,
-        "note": "",
-        "url": "https://example.com/@foo",
-        "uri": "https://example.com/@foo",
-      },
-      "status": \(statusA)
-    """.data(using: .utf8)!
-    lazy var likeA1 = try! decoder.decode(Notification.self, from: likeA1Data)
-    lazy var likeA2Data = """
-    {
-      "id": "2",
-      "type": "favourite",
-      "created_at": "2019-11-23T07:30:00Z",
-      "account": {
-        "id": "2",
-        "username": "baz",
-        "acct": "baz",
-        "display_name": "baz",
-        "locked": false,
-        "created_at": "2019-11-01T01:01:01Z",
-        "followers_count": 0,
-        "following_count": 0,
-        "statuses_count": 0,
-        "note": "",
-        "url": "https://example.com/@baz",
-        "uri": "https://example.com/@baz",
-      },
-      "status": \(statusA)
-    """.data(using: .utf8)!
-    lazy var likeA2 = try! decoder.decode(Notification.self, from: likeA2Data)
-    let statusB = """
-    {
-        "id": "2",
-        "created_at": "2019-11-23T07:28:34Z",
-        "account": {
-          "id": "2",
-          "username": "bar",
-          "acct": "bar",
-          "display_name": "bar",
-          "locked": false,
-          "created_at": "2019-11-01T01:01:01Z",
-          "followers_count": 0,
-          "following_count": 0,
-          "statuses_count": 0,
-          "note": "",
-          "url": "https://example.com/@bar",
-          "uri": "https://example.com/@bar",
-        },
-        "url": "https://example.com/@bar/1",
-        "uri": "https://example.com/@bar/1",
-        "content": "",
-        "emojis": [],
-        "reblogs_count": 0,
-        "favourites_count": 0,
-        "sensitive": false,
-        "spoiler_text": "",
-        "visibility": "public",
-        "media_attachments": [],
-        "mentions": [],
-        "tags": [],
-      }
-    }
-    """
-    lazy var likeBData = """
-    {
-      "id": "3",
-      "type": "favourite",
-      "created_at": "2019-11-23T07:29:18Z",
-      "account": {
-        "id": "1",
-        "username": "foo",
-        "acct": "foo",
-        "display_name": "foo",
-        "locked": false,
-        "created_at": "2019-11-01T01:01:01Z",
-        "followers_count": 0,
-        "following_count": 0,
-        "statuses_count": 0,
-        "note": "",
-        "url": "https://example.com/@foo",
-        "uri": "https://example.com/@foo",
-      },
-      "status": \(statusB)
-    """.data(using: .utf8)!
-    lazy var likeB = try! decoder.decode(Notification.self, from: likeBData)
-    lazy var likeB2Data = """
-    {
-      "id": "4",
-      "type": "favourite",
-      "created_at": "2019-11-23T07:29:18Z",
-      "account": {
-        "id": "2",
-        "username": "bar",
-        "acct": "bar",
-        "display_name": "bar",
-        "locked": false,
-        "created_at": "2019-11-02T01:01:01Z",
-        "followers_count": 0,
-        "following_count": 0,
-        "statuses_count": 0,
-        "note": "",
-        "url": "https://example.com/@bar",
-        "uri": "https://example.com/@bar",
-      },
-      "status": \(statusB)
-    """.data(using: .utf8)!
-    lazy var likeB2 = try! decoder.decode(Notification.self, from: likeB2Data)
-    lazy var mentionBData = """
-    {
-      "id": "5",
-      "type": "mention",
-      "created_at": "2019-11-23T07:29:18Z",
-      "account": {
-        "id": "1",
-        "username": "foo",
-        "acct": "foo",
-        "display_name": "foo",
-        "locked": false,
-        "created_at": "2019-11-01T01:01:01Z",
-        "followers_count": 0,
-        "following_count": 0,
-        "statuses_count": 0,
-        "note": "",
-        "url": "https://example.com/@foo",
-        "uri": "https://example.com/@foo",
-      },
-      "status": \(statusB)
-    """.data(using: .utf8)!
-    lazy var mentionB = try! decoder.decode(Notification.self, from: mentionBData)
-
-
-    func testGroupSimple() {
-        let groups = NotificationGroup.createGroups(notifications: [likeA1, likeA2], only: [.favourite])
-        XCTAssertEqual(groups, [NotificationGroup(notifications: [likeA1, likeA2])!])
-    }
-    
-    func testGroupWithOtherGroupableInBetween() {
-        let groups = NotificationGroup.createGroups(notifications: [likeA1, likeB, likeA2], only: [.favourite])
-        XCTAssertEqual(groups, [
-            NotificationGroup(notifications: [likeA1, likeA2])!,
-            NotificationGroup(notifications: [likeB])!,
-        ])
-    }
-    
-    func testDontGroupWithUngroupableInBetween() {
-        let groups = NotificationGroup.createGroups(notifications: [likeA1, mentionB, likeA2], only: [.favourite])
-        XCTAssertEqual(groups, [
-            NotificationGroup(notifications: [likeA1])!,
-            NotificationGroup(notifications: [mentionB])!,
-            NotificationGroup(notifications: [likeA2])!,
-        ])
-    }
-
-    func testMergeSimpleGroups() {
-        let group1 = NotificationGroup(notifications: [likeA1])!
-        let group2 = NotificationGroup(notifications: [likeA2])!
-        let merged = NotificationGroup.mergeGroups(first: [group1], second: [group2], only: [.favourite])
-        XCTAssertEqual(merged, [
-            NotificationGroup(notifications: [likeA1, likeA2])!
-        ])
-    }
-    
-    func testMergeGroupsWithOtherGroupableInBetween() {
-        let group1 = NotificationGroup(notifications: [likeA1])!
-        let group2 = NotificationGroup(notifications: [likeB])!
-        let group3 = NotificationGroup(notifications: [likeA2])!
-        let merged = NotificationGroup.mergeGroups(first: [group1, group2], second: [group3], only: [.favourite])
-        XCTAssertEqual(merged, [
-            NotificationGroup(notifications: [likeA1, likeA2])!,
-            NotificationGroup(notifications: [likeB])!,
-        ])
-        
-        let merged2 = NotificationGroup.mergeGroups(first: [group1], second: [group2, group3], only: [.favourite])
-        XCTAssertEqual(merged2, [
-            NotificationGroup(notifications: [likeA1, likeA2])!,
-            NotificationGroup(notifications: [likeB])!,
-        ])
-        
-        let group4 = NotificationGroup(notifications: [likeB2])!
-        let group5 = NotificationGroup(notifications: [mentionB])!
-        let merged3 = NotificationGroup.mergeGroups(first: [group1, group5, group2], second: [group4, group3], only: [.favourite])
-        print(merged3.count)
-        XCTAssertEqual(merged3, [
-            group1,
-            group5,
-            NotificationGroup(notifications: [likeB, likeB2]),
-            group3
-        ])
-    }
-    
-    func testDontMergeWithUngroupableInBetween() {
-        let group1 = NotificationGroup(notifications: [likeA1])!
-        let group2 = NotificationGroup(notifications: [mentionB])!
-        let group3 = NotificationGroup(notifications: [likeA2])!
-        let merged = NotificationGroup.mergeGroups(first: [group1, group2], second: [group3], only: [.favourite])
-        XCTAssertEqual(merged, [
-            NotificationGroup(notifications: [likeA1])!,
-            NotificationGroup(notifications: [mentionB])!,
-            NotificationGroup(notifications: [likeA2])!,
-        ])
-    }
-
-}

Packages/Pachyderm/Tests/PachydermTests/URLTests.swift

@@ -1,25 +0,0 @@
-//
-//  URLTests.swift
-//  
-//
-//  Created by Shadowfacts on 5/17/22.
-//
-
-import XCTest
-import WebURL
-import WebURLFoundationExtras
-
-class URLTests: XCTestCase {
-
-    func testDecodeURL() {
-        XCTAssertNotNil(WebURL(URL(string: "https://xn--baw-joa.social/@unituebingen")!))
-        XCTAssertNotNil(WebURL("https://xn--baw-joa.social/@unituebingen"))
-        XCTAssertNotNil(URLComponents(string: "https://xn--baw-joa.social/test/é"))
-        XCTAssertNotNil(WebURL("https://xn--baw-joa.social/test/é"))
-        if #available(iOS 16.0, *) {
-            XCTAssertNotNil(try? URL.ParseStrategy().parse("https://xn--baw-joa.social/test/é"))
-            XCTAssertNotNil(try? URL.ParseStrategy().parse("http://見.香港/热狗/🌭"))
-        }
-    }
-
-}

Packages/TTTKit/.gitignore

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

Packages/TTTKit/Package.swift

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