Somewhat experimental and sporadically maintained fork of a fork of a fork of Mastodon https://girldick.gay
Go to file
anna 7cea9de3b2
merge with catstodon/main
2024-05-30 20:39:38 +02:00
.devcontainer Fix issue with post-create scripts failing on local docker (#28402) 2024-05-24 16:39:03 +00:00
.github Merge commit '1bf661cddbc614d4076e9d9e855575fc29e976c0' into glitch-soc/merge-upstream 2024-05-14 20:47:14 +02:00
.husky Update husky and remove deprecated features (#29338) 2024-02-22 09:02:15 +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 with catstodon/main 2024-05-30 20:39:38 +02:00
bin fix(bin/dev): makes conditional for launching overmind POSIX-compliant (#30271) 2024-05-13 09:40:14 +00:00
chart helm: cleanup helm chart, now in mastodon/chart (#21801) 2022-12-09 06:36:29 +01:00
config merge with catstodon/main 2024-05-30 20:39:38 +02:00
db Bump version to v4.3.0-alpha.4+glitch+cat+1.0.0 2024-05-30 18:51:42 +02:00
dist Merge remote-tracking branch 'essem/feature/emoji-reactions' into merge/emoji-reactions 2024-01-02 12:16:35 +01:00
lib merge with catstodon/main 2024-05-30 20:39:38 +02:00
log Initial commit 2016-02-20 22:53:20 +01:00
public Merge branch 'glitch-soc' into develop 2024-02-28 23:01:31 +01:00
spec Bump version to v4.3.0-alpha.4+glitch+cat+1.0.0 2024-05-30 18:51:42 +02:00
streaming Merge commit '1959365c2f410aa82874c5c05ab92c4eca4c4055' into glitch-soc/merge-upstream 2024-05-11 22:10:56 +02:00
vendor Increase files checked by ESLint (#9705) 2019-01-04 11:28:38 +01:00
.browserslistrc Add back support for old browsers (#29654) 2024-03-20 11:07:10 +00:00
.buildpacks Remove nodejs buildpack from buildpacks (#14364) 2020-07-20 09:48:10 +02:00
.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 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 Add ability to disable the suspicious sign in detector 2024-05-23 01:16:55 +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 '4045c069f8f91200d0e7c64a8097e425aee71041' into glitch-soc/merge-upstream 2024-05-01 17:26:21 +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 Ignore dotenv *.local files (#29932) 2024-04-26 14:50:39 +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
.nanoignore Remove Storybook (#4397) 2017-07-27 22:30:27 +02:00
.nvmrc Update dependency node to 20.13 (#30211) 2024-05-10 09:25:07 +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
.profile Make it possible to upload audio and video to Heroku app (#24866) 2023-05-05 14:41:07 +02:00
.rspec Adding a Mention model, test stubs 2016-02-25 00:17:01 +01:00
.rubocop.yml Disable `Style/RedundantFetchBlock` cop (#30207) 2024-05-15 13:57:13 +00:00
.rubocop_todo.yml Merge commit 'd20a5c3ec9ed40a991245fe32d0acb6187dd48c4' into glitch-soc/merge-upstream 2024-05-29 17:03:24 +02:00
.ruby-gemset Make Mastodon use its own gemset (#17858) 2022-08-13 15:44:34 +02:00
.ruby-version Change default ruby version to 3.3.1 (#28013) 2024-04-29 07:41:59 +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
AUTHORS.md Update AUTHORS.md (#27018) 2023-09-21 14:42:15 +02:00
Aptfile Make it possible to upload audio and video to Heroku app (#24866) 2023-05-05 14:41:07 +02:00
CHANGELOG.md Changelog: Fix version string, clarify where to find upstream changes relevant to this release 2024-05-30 18:53:31 +02:00
CHANGELOG_glitch.md Bump version to v4.3.0-alpha.4+glitch+cat+1.0.0 2024-05-30 18:51:42 +02:00
CODE_OF_CONDUCT.md Merge remote-tracking branch 'upstream/main' into develop 2023-03-05 12:34:16 +01:00
CONTRIBUTING.md Merge remote-tracking branch 'essem/feature/emoji-reactions' into merge/emoji-reactions 2024-01-02 12:16:35 +01:00
Dockerfile Change default ruby version to 3.3.1 (#28013) 2024-04-29 07:41:59 +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 branch 'refs/heads/glitch-soc' into develop 2024-05-29 14:23:08 +02:00
Gemfile.lock Bump version to v4.3.0-alpha.4+glitch+cat+1.0.0 2024-05-30 18:51:42 +02:00
LICENSE Fix #49 - License changed from GPL-2.0 to AGPL-3.0 2016-09-21 23:04:34 +02:00
Procfile fix: make Procfile compatible with herokuish (#12685) 2020-08-29 19:00:30 +02:00
Procfile.dev Split streaming server from web server (#24702) 2023-11-14 17:43:20 +00:00
README.md Add ability to disable the suspicious sign in detector 2024-05-23 01:16:55 +02:00
Rakefile Run Rubocop on Rakefile (#23871) 2023-07-12 09:47:54 +02:00
SECURITY.md Remove v3.5 branch from supported Mastodon versions (#28574) 2024-01-03 15:04:10 +00:00
Vagrantfile Forward 3035 port (#29710) 2024-04-05 09:19:43 +00:00
app.json Make enable_starttls configurable by envvars (#20321) 2022-11-10 21:06:21 +01:00
babel.config.js Disable Babel polyfill injection in dev (#27691) 2023-11-06 10:24:41 +00:00
config.ru Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
crowdin-glitch.yml Fix Crowdin Github Action (#2311) 2023-07-19 08:36:25 +02:00
crowdin.yml Add a Github Action to send translations to Crowdin for each merge in main (#25869) 2023-07-18 16:56:01 +02:00
docker-compose.yml Bump version to v4.3.0-alpha.4 (#30482) 2024-05-30 13:34:46 +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
lint-staged.config.js Improve `lint-staged` config (#28704) 2024-01-12 09:09:57 +00:00
package.json Merge commit 'd20a5c3ec9ed40a991245fe32d0acb6187dd48c4' into glitch-soc/merge-upstream 2024-05-29 17:03:24 +02:00
postcss.config.js Fix PostCSS config (#29926) 2024-04-15 09:06:06 +00:00
priv-config TOR federation (#7875) 2018-06-26 20:34:12 +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
stylelint.config.js Merge branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
tsconfig.json Merge commit 'd20a5c3ec9ed40a991245fe32d0acb6187dd48c4' into glitch-soc/merge-upstream 2024-05-29 17:03:24 +02:00
yarn.lock Merge commit 'd20a5c3ec9ed40a991245fe32d0acb6187dd48c4' into glitch-soc/merge-upstream 2024-05-29 17:03:24 +02:00

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.
  • 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)

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)