The Fediverse server that meows at you - a fork of glitch-soc Mastodon
Find a file
Jeremy Kescher 8292e2c912
Some checks failed
CodeQL / Analyze (ruby) (push) Has been cancelled
Check formatting / lint (push) Has been cancelled
Check i18n / check-i18n (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
Ruby Linting / lint (push) Has been cancelled
Historical data migration test / test (14-alpine) (push) Has been cancelled
Historical data migration test / test (15-alpine) (push) Has been cancelled
Ruby Testing / build (production) (push) Has been cancelled
Ruby Testing / build (test) (push) Has been cancelled
Ruby Testing / test (.ruby-version) (push) Has been cancelled
Ruby Testing / test (3.1) (push) Has been cancelled
Ruby Testing / test (3.2) (push) Has been cancelled
Ruby Testing / Libvips tests (.ruby-version) (push) Has been cancelled
Ruby Testing / Libvips tests (3.1) (push) Has been cancelled
Ruby Testing / Libvips tests (3.2) (push) Has been cancelled
Ruby Testing / End to End testing (.ruby-version) (push) Has been cancelled
Ruby Testing / End to End testing (3.1) (push) Has been cancelled
Ruby Testing / End to End testing (3.2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:8.10.2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Merge remote-tracking branch 'upstream/main' into develop
2024-09-21 19:12:23 +02:00
.devcontainer Fix Corepack prompt on Devcontainer (#31729) 2024-09-04 08:20:46 +00:00
.github Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream 2024-09-12 12:09:21 +02:00
.husky Update husky and remove deprecated features (#29338) 2024-02-22 09:02:15 +00:00
.rubocop Enable Rails/Output in spec/ dir (#31905) 2024-09-16 08:29:06 +00:00
.yarn Replace our custom compression-webpack-plugin patch with the fixed upstream version (#28510) 2023-12-29 09:33:06 +00:00
app Merge remote-tracking branch 'upstream/main' into develop 2024-09-21 19:12:23 +02:00
bin Use flatware to parallelize CI specs (#30284) 2024-06-27 07:42:57 +00:00
chart helm: cleanup helm chart, now in mastodon/chart (#21801) 2022-12-09 06:36:29 +01:00
config Merge remote-tracking branch 'upstream/main' into develop 2024-09-20 11:53:07 +02:00
db Merge remote-tracking branch 'upstream/main' into develop 2024-09-20 11:53:07 +02:00
dist Merge remote-tracking branch 'essem/feature/emoji-reactions' into merge/emoji-reactions 2024-01-02 12:16:35 +01:00
lib Bump Catstodon revision to 1.0.1+nightly 2024-09-21 19:11:08 +02:00
log Initial commit 2016-02-20 22:53:20 +01:00
public Merge remote-tracking branch 'upstream/main' into develop 2024-09-20 11:53:07 +02:00
spec Merge remote-tracking branch 'upstream/main' into develop 2024-09-20 11:53:07 +02:00
streaming Merge commit 'fe04291af46d7cb9d3439fa73739b2ffb2b53d72' into glitch-soc/merge-upstream 2024-09-04 19:38:52 +02:00
vendor Increase files checked by ESLint (#9705) 2019-01-04 11:28:38 +01:00
.browserslistrc Target firefox all the way back to Firefox 78 (#31782) 2024-09-06 12:33:38 +00:00
.buildpacks Remove nodejs buildpack from buildpacks (#14364) 2020-07-20 09:48:10 +02:00
.dockerignore Do not copy public/packs-test into Docker (#27736) 2023-11-07 09:22:04 +00:00
.editorconfig Enable EditorConfig trailing whitespace trimming (#23543) 2023-02-12 08:34:17 +01:00
.env.development Enable AR Encryption (#29831) 2024-04-17 09:19:02 +00:00
.env.production.catcatnya Add ability to disable the suspicious sign in detector 2024-05-23 01:16:55 +02:00
.env.production.sample Merge branch 'refs/heads/glitch' into develop 2024-07-16 22:32:15 +02:00
.env.test Add emphasis on ActiveRecord Encryption configuration values being secret (#30340) 2024-05-17 09:28:40 +00:00
.env.vagrant Add elastic search installation into Vagrantfile (#26512) 2023-08-23 15:46:14 +02:00
.eslintignore Increase files checked by ESLint (#9705) 2019-01-04 11:28:38 +01:00
.eslintrc.js Merge commit 'a27f7f4e561c9d2fe21d984059603d2f500c005b' into glitch-soc/merge-upstream 2024-09-12 17:22:06 +02:00
.foreman Replace sprockets/browserify with Webpack (#2617) 2017-05-03 02:04:16 +02:00
.gitattributes Add .gitattributes file to avoid unwanted CRLF (#3954) 2017-06-26 13:15:24 +02:00
.gitignore Remove fuubar gem and custom rspec --format setting (#30594) 2024-09-03 15:24:31 +00:00
.gitmodules Rename themes -> flavours ? ? 2017-12-03 23:26:40 -08:00
.haml-lint.yml Use tt extension for form scaffold template (#29676) 2024-04-10 09:20:21 +00:00
.nvmrc Update dependency node to 20.17 (#31531) 2024-08-22 11:50:46 +00:00
.prettierignore Merge commit '3b3144740805c1b404934c0f196d6cddc14dac0b' into glitch-soc/merge-upstream 2024-02-28 20:27:28 +01:00
.prettierrc.js Use Prettier for ESLint formatting TypeScript (#23631) 2023-05-09 19:02:12 +02:00
.rspec Remove fuubar gem and custom rspec --format setting (#30594) 2024-09-03 15:24:31 +00:00
.rubocop.yml Use rubocop DisplayCopNames and UseCache defaults (true) (#30750) 2024-06-19 09:34:24 +00:00
.rubocop_todo.yml Merge commit '5acec087caed4a2fdf0fd8ed11f891222496f321' into glitch-soc/merge-upstream 2024-09-05 20:36:25 +02:00
.ruby-gemset Make Mastodon use its own gemset (#17858) 2022-08-13 15:44:34 +02:00
.ruby-version Update dependency ruby to v3.3.5 (#31719) 2024-09-04 08:25:37 +00:00
.slugignore Remove Storybook (#4397) 2017-07-27 22:30:27 +02:00
.watchmanconfig Fix Jest config (#27834) 2023-11-13 12:19:41 +00:00
.yarnrc.yml Upgrade to Yarn 4, remove support for Node 16 (#27073) 2023-11-08 10:57:21 +00:00
app.json Refresh Heroku related thingy for heroku-24 stack (#31135) 2024-09-03 16:03:00 +00:00
Aptfile Refresh Heroku related thingy for heroku-24 stack (#31135) 2024-09-03 16:03:00 +00:00
AUTHORS.md Update AUTHORS.md (#27018) 2023-09-21 14:42:15 +02:00
babel.config.js fix(deps): update dependency fuzzysort to v3 (#30315) 2024-07-24 08:13:09 +00:00
CHANGELOG.md Bump Catstodon revision to 1.0.1 2024-09-20 13:31:06 +02:00
CHANGELOG_glitch.md Merge remote-tracking branch 'upstream/main' into develop 2024-09-20 11:53:07 +02:00
CODE_OF_CONDUCT.md Update Contributor Covenant to 2.1 (#23980) 2023-04-23 23:11:50 +02:00
config.ru Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
CONTRIBUTING.md Merge branch 'refs/heads/glitch' into develop 2024-07-19 18:13:52 +02:00
crowdin-glitch.yml Fix Crowdin Github Action (#2311) 2023-07-19 08:36:25 +02:00
crowdin.yml Case correction Github -> GitHub (#30446) 2024-06-08 10:32:39 +00:00
docker-compose.yml Bump version to 4.3.0-beta.2 (#31948) 2024-09-17 15:42:45 +00:00
Dockerfile Update docker.io/ruby Docker tag to v3.3.5 (#31758) 2024-09-05 11:06:05 +00:00
FEDERATION.md docs: update FEDERATION.md to more closely follow FEP conventions. (#28838) 2024-01-22 11:11:47 +00:00
Gemfile Update dependency opentelemetry-instrumentation-pg to '~> 0.29.0' (#31897) 2024-09-13 12:07:33 +00:00
Gemfile.lock Update dependencies omniauth-saml, ruby-xml and ruby-saml (#31926) 2024-09-16 08:48:13 +00:00
ide-helper.js Add JS IDE helper (#13012) 2020-04-27 17:19:53 +02:00
jest.config.js Merge commit '1070804a1a6121170f7bba923789d73b978e6fe7' into glitch-soc/merge-upstream 2024-01-15 20:06:31 +01:00
jsconfig.json Update devDependencies (non-major) (#29089) 2024-02-27 16:07:43 +00:00
LICENSE Fix #49 - License changed from GPL-2.0 to AGPL-3.0 2016-09-21 23:04:34 +02:00
lint-staged.config.js Add rubocop binstub, simplify configuration (#30407) 2024-06-13 14:27:17 +00:00
package.json Merge commit 'a27f7f4e561c9d2fe21d984059603d2f500c005b' into glitch-soc/merge-upstream 2024-09-12 17:22:06 +02:00
postcss.config.js Change PostCSS config to allow logical properties (#31264) 2024-08-02 13:17:36 +00:00
priv-config TOR federation (#7875) 2018-06-26 20:34:12 +02:00
Procfile Refresh Heroku related thingy for heroku-24 stack (#31135) 2024-09-03 16:03:00 +00:00
Procfile.dev Split streaming server from web server (#24702) 2023-11-14 17:43:20 +00:00
Rakefile Run Rubocop on Rakefile (#23871) 2023-07-12 09:47:54 +02:00
README.md Update README.md 2024-07-19 18:19:44 +02:00
redact-env.bash Add changelog info for v4.3.0-alpha.3+glitch+cat+1.2.0 2024-05-12 00:25:31 +02:00
scalingo.json Add S3 region list reference to Scalingo config (#24152) 2023-04-26 16:46:19 +02:00
SECURITY.md Case correction Github -> GitHub (#30446) 2024-06-08 10:32:39 +00:00
stylelint.config.js Merge commit '658addcbf783f6baa922d11c9524ebb9ddbcbc59' into glitch-soc/merge-upstream 2024-08-09 17:15:32 +02:00
tsconfig.json Merge commit 'd20a5c3ec9ed40a991245fe32d0acb6187dd48c4' into glitch-soc/merge-upstream 2024-05-29 17:03:24 +02:00
Vagrantfile Add libvirt provider parameters to Vagrant (#28102) 2024-06-04 20:28:05 +00:00
yarn.lock Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream 2024-09-16 21:08:58 +02:00

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).
  • 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)
  • Environment variable MASTODON_USE_LIBVIPS is true by default.
    • This is a minor change, but it requires all systems running Catstodon to run a recent libvips version (8.13+).
    • Vanilla Mastodon intends to deprecate ImageMagick anyway, so sooner or later, this change will cease being one.
  • Allow dashes in emoji shortcodes
    • This is simply to allow custom emoji compat with other fedi software.
    • Original patch by hazycora: 2dde7a25a4

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)