merge upstream

README.md

@@ -46,13 +46,28 @@ Upstream README is below.
     - emojis are sourced from discord's list of emojis
     - emojis are now sorted by category (like on every other emoji picker) instead of alphabetically
     - script to get new emojis is included for future unicode versions
+- cat stuff!!
+  - toggles for:
+    - showing "cat" badge on user profiles
+    - showing cat ears behind users' avatars
+    - "nyaize"-ing posts from authors with "Speak as Cat" enabled
+  - this requires [a backend patch](https://git.notfire.cc/notfire/iceshrimp-patches/src/branch/main/0007-cat-fields-in-akko-api.patch)
 - add toggle for showing post edit notifications
 - add support for accepted follow request notifications
+  - this requires [a backend patch](https://git.notfire.cc/notfire/iceshrimp-patches/src/branch/main/0005-previews-in-mastoapi.patch)
 - add option to prevent page from getting pushed when making a new post with streaming api enabled (similar to 3rd "for unreads" option)
 - add link on user card to open profiles in iceshrimp-fe
+- add option to open conversation view by clicking empty space in posts
+- add ability to close the reply box under posts that were deleted
+  - also an option to close it automatically
 - add a script to download ruffle for flash support (requires python3 and requests library)
   - download by entering `tools/` and running `python3 download_ruffle.py`
 
+### also of note for anyone running this fork
+- aside from the stuff mentioned above, the following features will require patches to work:
+  - mfm ([patch](https://git.notfire.cc/notfire/iceshrimp-patches/src/branch/main/0004-mfm-in-mastoapi.patch))
+  - previewing posts ([patch](https://git.notfire.cc/notfire/iceshrimp-patches/src/branch/main/0005-previews-in-mastoapi.patch))
+
 ---
 
 # Akkoma-FE