The Fediverse server that meows at you - a fork of glitch-soc Mastodon
Find a file
2024-01-28 17:56:47 +01:00
.devcontainer chore(deps): update devdependencies (non-major) (#28840) 2024-01-23 11:44:50 +00:00
.github Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream 2024-01-26 20:47:20 +01:00
.husky
.yarn
app Merge branch 'glitch-soc' into develop 2024-01-28 17:56:47 +01:00
bin Use bundler version 2.5.4 (#28765) 2024-01-17 14:35:55 +00:00
chart
config Merge branch 'glitch-soc' into develop 2024-01-28 02:29:46 +01:00
db Merge branch 'glitch-soc' into develop 2024-01-28 02:29:46 +01:00
dist
lib Merge branch 'glitch-soc' into develop 2024-01-28 17:56:47 +01:00
log
public Merge branch 'glitch-soc' into develop 2024-01-17 22:37:29 +01:00
spec Merge branch 'glitch-soc' into develop 2024-01-28 17:56:47 +01:00
streaming Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream 2024-01-24 20:42:53 +01:00
vendor
.browserslistrc
.buildpacks
.bundler-audit.yml Ignore the devise-two-factor advisory as we have rate limits in place (#28733) 2024-01-15 10:45:48 +00:00
.dockerignore
.editorconfig
.env.production.catcatnya
.env.production.sample
.env.test
.env.vagrant
.eslintignore
.eslintrc.js
.foreman
.gitattributes
.gitignore
.gitmodules
.haml-lint.yml
.haml-lint_todo.yml
.nanoignore
.nvmrc
.prettierignore Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream 2024-01-13 12:11:29 +01:00
.prettierrc.js
.profile
.rspec
.rubocop.yml Fix Rails/RakeEnvironment cop (#28782) 2024-01-17 16:33:17 +00:00
.rubocop_todo.yml Merge commit '42ab855b2339c5cea3229c856ab539f883736b12' into glitch-soc/merge-upstream 2024-01-27 19:06:41 +01:00
.ruby-gemset
.ruby-version Use ruby version 3.2.3 (#28817) 2024-01-22 11:55:51 +00:00
.simplecov
.slugignore
.watchmanconfig
.yarnrc.yml
app.json
Aptfile
AUTHORS.md
babel.config.js
CHANGELOG.md
CODE_OF_CONDUCT.md
config.ru
CONTRIBUTING.md
crowdin-glitch.yml
crowdin.yml
docker-compose.yml
Dockerfile Use ruby version 3.2.3 (#28817) 2024-01-22 11:55:51 +00:00
FEDERATION.md docs: update FEDERATION.md to more closely follow FEP conventions. (#28838) 2024-01-22 11:11:47 +00:00
Gemfile Merge commit '42ab855b2339c5cea3229c856ab539f883736b12' into glitch-soc/merge-upstream 2024-01-27 19:06:41 +01:00
Gemfile.lock Update paperclip and climate_control gems (#28379) 2024-01-25 15:18:15 +00:00
ide-helper.js
jest.config.js Merge commit '1070804a1a6121170f7bba923789d73b978e6fe7' into glitch-soc/merge-upstream 2024-01-15 20:06:31 +01:00
jsconfig.json chore(deps): update devdependencies (non-major) (#28840) 2024-01-23 11:44:50 +00:00
LICENSE
lint-staged.config.js Improve lint-staged config (#28704) 2024-01-12 09:09:57 +00:00
package.json Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream 2024-01-15 20:27:41 +01:00
postcss.config.js
priv-config
Procfile
Procfile.dev
Rakefile
README.md Remove local account check in like and emoji_react inbound activity handling 2024-01-18 19:46:29 +01:00
redact-env.bash
scalingo.json
SECURITY.md
stylelint.config.js
tsconfig.json Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream 2024-01-24 20:42:53 +01:00
Vagrantfile
yarn.lock Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream 2024-01-26 20:47:20 +01:00

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)