Local mirror of Catstodon, for girldick.gay's nyastodon fork
You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 
Go to file
Jeremy Kescher 7122d5381c
Merge branch 'refs/heads/glitch-soc' into develop
# Conflicts:
#	app/javascript/flavours/glitch/features/notifications/components/notification.jsx
1 month ago
.devcontainer Update libretranslate/libretranslate Docker tag to v1.5.6 (#29629) 2 months ago
.github Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream 2 months ago
.husky Update husky and remove deprecated features (#29338) 3 months ago
.yarn Replace our custom `compression-webpack-plugin` patch with the fixed upstream version (#28510) 5 months ago
app Merge branch 'refs/heads/glitch-soc' into develop 1 month ago
bin Add `bin/dev` script to launch foreman (#28242) 3 months ago
chart helm: cleanup helm chart, now in mastodon/chart (#21801) 1 year ago
config Merge branch 'refs/heads/glitch-soc' into develop 1 month ago
db Merge branch 'glitch-soc' into develop 2 months ago
dist Merge remote-tracking branch 'essem/feature/emoji-reactions' into merge/emoji-reactions 5 months ago
lib Merge branch 'glitch-soc' into develop 2 months ago
log Initial commit 8 years ago
public Merge branch 'glitch-soc' into develop 3 months ago
spec Merge branch 'glitch-soc' into develop 2 months ago
streaming Merge commit 'f89512fbedb547f66a72eefdff047768fb505eb6' into glitch-soc/merge-upstream 2 months ago
vendor Increase files checked by ESLint (#9705) 5 years ago
.browserslistrc
.buildpacks
.bundler-audit.yml
.dockerignore
.editorconfig
.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
.simplecov
.slugignore
.watchmanconfig
.yarnrc.yml
AUTHORS.md
Aptfile
CHANGELOG.md
CHANGELOG_glitch.md
CODE_OF_CONDUCT.md
CONTRIBUTING.md
Dockerfile
FEDERATION.md
Gemfile
Gemfile.lock
LICENSE
Procfile
Procfile.dev
README.md
Rakefile
SECURITY.md
Vagrantfile
app.json
babel.config.js
config.ru
crowdin-glitch.yml
crowdin.yml
docker-compose.yml
ide-helper.js
jest.config.js
jsconfig.json
lint-staged.config.js
package.json
postcss.config.js
priv-config
redact-env.bash
scalingo.json
stylelint.config.js
tsconfig.json
yarn.lock

README.md

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.

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)