6d448d46ff
# Conflicts: # app/javascript/flavours/glitch/actions/interactions.js # app/javascript/flavours/glitch/reducers/statuses.js |
||
---|---|---|
.devcontainer | ||
.github | ||
.husky | ||
.yarn | ||
app | ||
bin | ||
chart | ||
config | ||
db | ||
dist | ||
lib | ||
log | ||
public | ||
spec | ||
streaming | ||
vendor | ||
.browserslistrc | ||
.buildpacks | ||
.bundler-audit.yml | ||
.dockerignore | ||
.editorconfig | ||
.env.development | ||
.env.production.catcatnya | ||
.env.production.sample | ||
.env.test | ||
.env.vagrant | ||
.eslintignore | ||
.eslintrc.js | ||
.foreman | ||
.gitattributes | ||
.gitignore | ||
.gitmodules | ||
.haml-lint.yml | ||
.nanoignore | ||
.nvmrc | ||
.prettierignore | ||
.prettierrc.js | ||
.profile | ||
.rspec | ||
.rubocop.yml | ||
.rubocop_todo.yml | ||
.ruby-gemset | ||
.ruby-version | ||
.slugignore | ||
.watchmanconfig | ||
.yarnrc.yml | ||
app.json | ||
Aptfile | ||
AUTHORS.md | ||
babel.config.js | ||
CHANGELOG.md | ||
CHANGELOG_glitch.md | ||
CODE_OF_CONDUCT.md | ||
config.ru | ||
CONTRIBUTING.md | ||
crowdin-glitch.yml | ||
crowdin.yml | ||
docker-compose.yml | ||
Dockerfile | ||
FEDERATION.md | ||
Gemfile | ||
Gemfile.lock | ||
ide-helper.js | ||
jest.config.js | ||
jsconfig.json | ||
LICENSE | ||
lint-staged.config.js | ||
package.json | ||
postcss.config.js | ||
priv-config | ||
Procfile | ||
Procfile.dev | ||
Rakefile | ||
README.md | ||
redact-env.bash | ||
scalingo.json | ||
SECURITY.md | ||
stylelint.config.js | ||
tsconfig.json | ||
Vagrantfile | ||
yarn.lock |
Catstodon
Introduction
This Mastodon fork is based on the glitch-soc Fork of Mastodon, with changes made to suit CatCatNya~. I intend to contribute some useful differences back to glitch-soc and vanilla Mastodon.
To install, take a look at glitch-soc.github.io/docs/. The instructions and features are the same, except for the differences outlined below.
Contributing guidelines are available here.
Note: Use the main branch only for forks. develop
branch may, at times,
be force-pushed to (mostly for undoing cherry-picking of vanilla commits when upstream adopts them).
I highly suggest only ever running the main
branch in production, as is done for CatCatNya~!
I also highly suggest not rebasing on this if you are maintaining a fork,
instead, use merge (fast-forward, if possible, with merge commit otherwise).
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.
- 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 3840x2160)
- 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, by @oat@hellsite.site), with slight adjustments since.
- Emoji reactions on statuses (with both Unicode and custom emojis, same as for announcements), a feature originally developed for Nyastodon. Ended up as a Catstodon-maintained patch after its initial two Pull Requests to glitch-soc, but was handed over to Essem's fork, Chuckya and is now pending its fourth attempt of merging into glitch-soc.
- Lifts the "only federate local favourites" restriction on favourites/likes and emoji reactions.
- Cherry-picks the activity filter branch from Sakurajima Mastodon.
- Adds the ability to disable the suspicious sign in detection entirely.
- Useful for situations where the instance may not have up-to-date IP information, such as when the period of IP address retention is set to a low value (see Previous differences now merged into vanilla Mastodon)
Previous differences now merged into glitch-soc
- Fixed incorrect upload size limit display when adding new a new custom emoji. (Pull request)
- 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)