Somewhat experimental and sporadically maintained fork of a fork of a fork of Mastodon https://girldick.gay
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
anna df00e5e6cb
merge with catstodon/main
1 month ago
.devcontainer merge with catstodon/main 1 month ago
.github merge with catstodon/main 1 month ago
.husky merge with catstodon/main 1 month ago
.yarn Replace our custom `compression-webpack-plugin` patch with the fixed upstream version (#28510) 5 months ago
app merge with catstodon/main 1 month ago
bin merge with catstodon/main 1 month ago
chart helm: cleanup helm chart, now in mastodon/chart (#21801) 1 year ago
config merge with catstodon/main 1 month ago
db merge with catstodon/main 1 month ago
dist Merge remote-tracking branch 'essem/feature/emoji-reactions' into merge/emoji-reactions 5 months ago
lib merge with catstodon/main 1 month ago
log Initial commit 8 years ago
public merge with catstodon/main 1 month ago
spec merge with catstodon/main 1 month ago
streaming merge with catstodon/main 1 month ago
vendor Increase files checked by ESLint (#9705) 5 years ago
.browserslistrc merge with catstodon/main 1 month ago
.buildpacks Remove nodejs buildpack from buildpacks (#14364) 4 years ago
.bundler-audit.yml Ignore the devise-two-factor advisory as we have rate limits in place (#28733) 4 months ago
.dockerignore Do not copy `public/packs-test` into Docker (#27736) 6 months ago
.editorconfig Enable EditorConfig trailing whitespace trimming (#23543) 1 year ago
.env.production.catcatnya Bump Ruby version to 3.3.0, update CatCatNya~ config 5 months ago
.env.production.sample Merge branch 'glitch-soc' into develop 3 months ago
.env.test Improve Babel configuration and automatically load polyfills (#27333) 7 months ago
.env.vagrant Add elastic search installation into Vagrantfile (#26512) 9 months ago
.eslintignore Increase files checked by ESLint (#9705) 5 years ago
.eslintrc.js merge with catstodon/main 1 month ago
.foreman Replace sprockets/browserify with Webpack (#2617) 7 years ago
.gitattributes Add .gitattributes file to avoid unwanted CRLF (#3954) 7 years ago
.gitignore Upgrade to Yarn 4, remove support for Node 16 (#27073) 6 months ago
.gitmodules Rename themes -> flavours ? ? 7 years ago
.haml-lint.yml merge with catstodon/main 1 month ago
.nanoignore Remove Storybook (#4397) 7 years ago
.nvmrc Update dependency node to 20.11 (#28670) 4 months ago
.prettierignore merge with catstodon/main 1 month ago
.prettierrc.js Use Prettier for ESLint formatting TypeScript (#23631) 1 year ago
.profile Make it possible to upload audio and video to Heroku app (#24866) 1 year ago
.rspec Adding a Mention model, test stubs 8 years ago
.rubocop.yml merge with catstodon/main 1 month ago
.rubocop_todo.yml merge with catstodon/main 1 month ago
.ruby-gemset Make Mastodon use its own gemset (#17858) 2 years ago
.ruby-version Use ruby version 3.2.3 (#28817) 4 months ago
.simplecov Disable simplecov `enable_coverage_for_eval` option, move to standalone file (#27869) 6 months ago
.slugignore Remove Storybook (#4397) 7 years ago
.watchmanconfig Fix Jest config (#27834) 6 months ago
.yarnrc.yml Upgrade to Yarn 4, remove support for Node 16 (#27073) 6 months ago
AUTHORS.md Update AUTHORS.md (#27018) 8 months ago
Aptfile Make it possible to upload audio and video to Heroku app (#24866) 1 year ago
CHANGELOG.md merge with catstodon/main 1 month ago
CHANGELOG_glitch.md merge with catstodon/main 1 month ago
CODE_OF_CONDUCT.md Update Contributor Covenant to 2.1 (#23980) 1 year ago
CONTRIBUTING.md Merge remote-tracking branch 'essem/feature/emoji-reactions' into merge/emoji-reactions 5 months ago
Dockerfile merge with catstodon/main 1 month ago
FEDERATION.md docs: update FEDERATION.md to more closely follow FEP conventions. (#28838) 4 months ago
Gemfile merge with catstodon/main 1 month ago
Gemfile.lock merge with catstodon/main 1 month ago
LICENSE Fix #49 - License changed from GPL-2.0 to AGPL-3.0 8 years ago
Procfile fix: make Procfile compatible with herokuish (#12685) 4 years ago
Procfile.dev Split streaming server from web server (#24702) 6 months ago
README.md merge with catstodon/main 1 month ago
Rakefile Run Rubocop on Rakefile (#23871) 10 months ago
SECURITY.md Remove v3.5 branch from supported Mastodon versions (#28574) 5 months ago
Vagrantfile merge with catstodon/main 1 month ago
app.json Make enable_starttls configurable by envvars (#20321) 2 years ago
babel.config.js Disable Babel polyfill injection in dev (#27691) 7 months ago
config.ru Autofix Rubocop remaining Layout rules (#23679) 1 year ago
crowdin-glitch.yml Fix Crowdin Github Action (#2311) 10 months ago
crowdin.yml Add a Github Action to send translations to Crowdin for each merge in main (#25869) 10 months ago
docker-compose.yml Bump version to v4.3.0-alpha.3 (#29241) 3 months ago
ide-helper.js Add JS IDE helper (#13012) 4 years ago
jest.config.js Merge commit '1070804a1a6121170f7bba923789d73b978e6fe7' into glitch-soc/merge-upstream 4 months ago
jsconfig.json merge with catstodon/main 1 month ago
lint-staged.config.js Improve `lint-staged` config (#28704) 4 months ago
package.json merge with catstodon/main 1 month ago
postcss.config.js merge with catstodon/main 1 month ago
priv-config TOR federation (#7875) 6 years ago
redact-env.bash Add redacted CatCatNya~ production env file. 2 years ago
scalingo.json Add S3 region list reference to Scalingo config (#24152) 1 year ago
stylelint.config.js Merge branch 'main' into glitch-soc/merge-upstream 1 year ago
tsconfig.json merge with catstodon/main 1 month ago
yarn.lock merge with catstodon/main 1 month ago

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)