From 7f571db25448f8e6ba8de6f4960a198cce8169b2 Mon Sep 17 00:00:00 2001 From: Jeremy Kescher Date: Wed, 10 May 2023 21:36:57 +0200 Subject: [PATCH] Update README.md --- README.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4da0932879..05d8c63011 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # Catstodon + ## Introduction + This Mastodon fork is based on the [glitch-soc Fork of Mastodon](https://github.com/glitch-soc/mastodon), with changes made to suit [CatCatNya~](https://catcatnya.com). The aforementioned instance is running the `develop` branch. I intend to contribute some useful differences back to [glitch-soc](https://github.com/glitch-soc/mastodon) and [vanilla Mastodon](https://github.com/mastodon/mastodon). @@ -13,20 +15,25 @@ That branch may, at times, be force-pushed to (mostly for undoing cherry-picking I highly suggest only ever running the `main` branch in production! ## Differences + - Some files are adjusted specifically for the CatCatNya~ instance. Specifically, these: - sounds/boop.mp3 - sounds/boop.ogg -
You might want to revert these to the upstream files (or your own versions!) if you decide to use this fork for your own instance. +
You might want to revert these to the upstream files (or your own versions!) if you decide to use this fork for your own instance. - The web frontend emoji picker is a blobcat instead of the joy emoji. - The rate limits for authenticated users have been relaxed a bit. - The API endpoint `/api/v1/custom_emojis` is no longer affected by AUTHORIZED_FETCH, allowing anyone to copy custom emojis. - Allow higher resolution images. (4096x4096 instead of the previous limit of 1920x1080) - Allow posting polls with only one poll option (if `MIN_POLL_OPTIONS` is set to 1 on your instance). - Added oatstodon flavour (taken from [types.pl fork](https://github.com/ralsei/types.pl), by [@oat@hellsite.site](https://hellsite.site/@oat)) -- Emoji reactions on posts, a feature originally developed for [Nyastodon](https://git.bsd.gay/fef/nyastodon). Currently pending [merge into glitch-soc](https://github.com/glitch-soc/mastodon/pull/1980). +- Emoji reactions on statuses (with both Unicode and custom emojis, same as for announcements), a feature originally developed for [Nyastodon](https://git.bsd.gay/fef/nyastodon). + Ended up as a Catstodon-maintained patch after its initial two Pull Requests to glitch-soc, and is now pending [its third attempt of merging into glitch-soc](https://github.com/glitch-soc/mastodon/pull/2221). + ## Previous differences now merged into glitch-soc + - Fixed incorrect upload size limit display when adding new a new custom emoji. ([Pull request](https://github.com/glitch-soc/mastodon/pull/1763)) - Everything merged into vanilla Mastodon ## Previous differences now merged into vanilla Mastodon + - The period of retention of IP addresses and sessions was made configurable. ([Pull request](https://github.com/mastodon/mastodon/pull/18757))