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 60d54db810
merge with catstodon/main
2 weeks ago
.devcontainer chore(deps): update devdependencies (non-major) (#28840) 1 month ago
.github Fix build-security docker tags 1 month ago
.husky Use Yarn instead of NPX for pre-commit hook (#24287) 11 months ago
.yarn Replace our custom `compression-webpack-plugin` patch with the fixed upstream version (#28510) 2 months ago
app merge with catstodon/main 2 weeks ago
bin Use bundler version 2.5.4 (#28765) 2 months ago
chart helm: cleanup helm chart, now in mastodon/chart (#21801) 1 year ago
config merge with catstodon/main 2 weeks ago
db Merge branch 'glitch-soc' into develop 1 month ago
dist Merge remote-tracking branch 'essem/feature/emoji-reactions' into merge/emoji-reactions 2 months ago
lib merge with catstodon/main 2 weeks ago
log Initial commit 8 years ago
public Merge branch 'glitch-soc' into develop 2 months ago
spec Merge branch 'glitch-soc' into develop 2 weeks ago
streaming Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream 1 month ago
vendor Increase files checked by ESLint (#9705) 5 years ago
.browserslistrc Add ES6 compatibility to browserslist (#18519) 2 years 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) 2 months ago
.dockerignore Do not copy `public/packs-test` into Docker (#27736) 4 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 2 months ago
.env.production.sample Merge branch 'glitch-soc' into develop 4 weeks ago
.env.test Improve Babel configuration and automatically load polyfills (#27333) 4 months ago
.env.vagrant Add elastic search installation into Vagrantfile (#26512) 6 months ago
.eslintignore Increase files checked by ESLint (#9705) 5 years ago
.eslintrc.js Merge commit 'a0e237a96fca2774d3c9ed43063a45e395bb7f40' into glitch-soc/merge-upstream 2 months 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) 4 months ago
.gitmodules Rename themes -> flavours ? ? 6 years ago
.haml-lint.yml Update haml-lint line length configuration to match rubocop value (#27570) 4 months ago
.haml-lint_todo.yml Fix `LineLength` haml-lint in `media/player` view (#28667) 2 months ago
.nanoignore Remove Storybook (#4397) 7 years ago
.nvmrc Update dependency node to 20.11 (#28670) 2 months ago
.prettierignore Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream 2 months ago
.prettierrc.js Use Prettier for ESLint formatting TypeScript (#23631) 10 months ago
.profile Make it possible to upload audio and video to Heroku app (#24866) 10 months ago
.rspec Adding a Mention model, test stubs 8 years ago
.rubocop.yml Fix `Rails/RakeEnvironment` cop (#28782) 2 months ago
.rubocop_todo.yml Merge commit '42ab855b2339c5cea3229c856ab539f883736b12' into glitch-soc/merge-upstream 1 month ago
.ruby-gemset Make Mastodon use its own gemset (#17858) 2 years ago
.ruby-version Use ruby version 3.2.3 (#28817) 1 month ago
.simplecov Disable simplecov `enable_coverage_for_eval` option, move to standalone file (#27869) 4 months ago
.slugignore Remove Storybook (#4397) 7 years ago
.watchmanconfig Fix Jest config (#27834) 4 months ago
.yarnrc.yml Upgrade to Yarn 4, remove support for Node 16 (#27073) 4 months ago
AUTHORS.md Update AUTHORS.md (#27018) 6 months ago
Aptfile Make it possible to upload audio and video to Heroku app (#24866) 10 months ago
CHANGELOG.md Bump version to v4.3.0-alpha.3 (#29241) 2 weeks ago
CODE_OF_CONDUCT.md Merge remote-tracking branch 'upstream/main' into develop 1 year ago
CONTRIBUTING.md Merge remote-tracking branch 'essem/feature/emoji-reactions' into merge/emoji-reactions 2 months ago
Dockerfile Use ruby version 3.2.3 (#28817) 1 month ago
FEDERATION.md docs: update FEDERATION.md to more closely follow FEP conventions. (#28838) 1 month ago
Gemfile Update dependency bootsnap to '~> 1.18.0' (#29019) 4 weeks ago
Gemfile.lock Update dependency pg to v1.5.5 (#29230) 2 weeks 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) 4 months ago
README.md Remove local account check in like and emoji_react inbound activity handling 2 months ago
Rakefile Run Rubocop on Rakefile (#23871) 8 months ago
SECURITY.md Remove v3.5 branch from supported Mastodon versions (#28574) 2 months ago
Vagrantfile Change Vagrant to install Node 20 (#28100) 3 months ago
app.json Make enable_starttls configurable by envvars (#20321) 1 year ago
babel.config.js Disable Babel polyfill injection in dev (#27691) 4 months ago
config.ru Autofix Rubocop remaining Layout rules (#23679) 1 year ago
crowdin-glitch.yml Fix Crowdin Github Action (#2311) 8 months ago
crowdin.yml Add a Github Action to send translations to Crowdin for each merge in main (#25869) 8 months ago
docker-compose.yml Bump version to v4.3.0-alpha.3 (#29241) 2 weeks ago
ide-helper.js Add JS IDE helper (#13012) 4 years ago
jest.config.js Merge commit '1070804a1a6121170f7bba923789d73b978e6fe7' into glitch-soc/merge-upstream 2 months ago
jsconfig.json chore(deps): update devdependencies (non-major) (#28840) 1 month ago
lint-staged.config.js Improve `lint-staged` config (#28704) 2 months ago
package.json Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream 2 months ago
postcss.config.js Update PostCSS dependencies (#23835) 12 months 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) 10 months ago
stylelint.config.js Merge branch 'main' into glitch-soc/merge-upstream 10 months ago
tsconfig.json Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream 1 month ago
yarn.lock Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream 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~. The aforementioned instance is running the develop branch. 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 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, by @oat@hellsite.site)
  • 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.

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)