Somewhat experimental and sporadically maintained fork of a fork of a fork of Mastodon https://girldick.gay
Find a file
2024-05-11 23:31:31 +02:00
.devcontainer Update libretranslate/libretranslate Docker tag to v1.5.7 (#30111) 2024-04-29 08:10:04 +00:00
.github Merge commit 'b7902225d698a107df2cf8b4ca221caad38fa464' into glitch-soc/merge-upstream 2024-05-04 16:28:30 +02:00
.husky Update husky and remove deprecated features (#29338) 2024-02-22 09:02:15 +00:00
.yarn
app Merge branch 'refs/heads/glitch-soc' into develop 2024-05-11 23:31:31 +02:00
bin Add bin/dev script to launch foreman (#28242) 2024-03-02 18:31:43 +00:00
chart
config Merge branch 'refs/heads/glitch-soc' into develop 2024-05-11 23:31:31 +02:00
db Merge branch 'refs/heads/glitch-soc' into develop 2024-05-11 23:31:31 +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 branch 'refs/heads/glitch-soc' into develop 2024-05-11 23:31:31 +02:00
log
public Merge branch 'glitch-soc' into develop 2024-02-28 23:01:31 +01:00
spec Merge branch 'refs/heads/glitch-soc' into develop 2024-05-11 23:31:31 +02:00
streaming Merge commit '5cd13ee4f19c112ea855063c2495e2874746f23a' into glitch-soc/merge-upstream 2024-05-07 12:13:02 +02:00
vendor
.browserslistrc Add back support for old browsers (#29654) 2024-03-20 11:07:10 +00:00
.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.development Enable AR Encryption (#29831) 2024-04-17 09:19:02 +00:00
.env.production.catcatnya Bump Ruby version to 3.3.0, update CatCatNya~ config 2024-01-05 18:02:05 +01:00
.env.production.sample Merge branch 'glitch-soc' into develop 2024-02-06 22:58:23 +01:00
.env.test Enable AR Encryption (#29831) 2024-04-17 09:19:02 +00:00
.env.vagrant
.eslintignore
.eslintrc.js Merge commit '4045c069f8f91200d0e7c64a8097e425aee71041' into glitch-soc/merge-upstream 2024-05-01 17:26:21 +02:00
.foreman
.gitattributes
.gitignore Ignore dotenv *.local files (#29932) 2024-04-26 14:50:39 +00:00
.gitmodules
.haml-lint.yml Use tt extension for form scaffold template (#29676) 2024-04-10 09:20:21 +00:00
.nanoignore
.nvmrc Update dependency node to 20.12 (#29765) 2024-03-28 10:54:16 +00:00
.prettierignore Merge commit '3b3144740805c1b404934c0f196d6cddc14dac0b' into glitch-soc/merge-upstream 2024-02-28 20:27:28 +01:00
.prettierrc.js
.profile
.rspec
.rubocop.yml Disable Style/HashAsLastArrayItem cop (#30041) 2024-04-24 08:32:18 +00:00
.rubocop_todo.yml Merge commit 'b7902225d698a107df2cf8b4ca221caad38fa464' into glitch-soc/merge-upstream 2024-05-04 16:28:30 +02:00
.ruby-gemset
.ruby-version Change default ruby version to 3.3.1 (#28013) 2024-04-29 07:41:59 +00:00
.simplecov
.slugignore
.watchmanconfig
.yarnrc.yml
app.json
Aptfile
AUTHORS.md
babel.config.js
CHANGELOG.md Add changelog for v4.3.0-alpha.3+glitch+cat+1.1.3 2024-04-26 21:28:50 +02:00
CHANGELOG_glitch.md Move CHANGELOG.md to CHANGELOG_glitch.md 2024-02-25 18:32:34 +01:00
CODE_OF_CONDUCT.md
config.ru
CONTRIBUTING.md Merge remote-tracking branch 'essem/feature/emoji-reactions' into merge/emoji-reactions 2024-01-02 12:16:35 +01:00
crowdin-glitch.yml
crowdin.yml
docker-compose.yml docker-compose.yml version is obsolete (#30120) 2024-04-29 17:31:14 +00: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 Update devise-two-factor to version 5.0.0 (#28325) 2024-05-02 09:31:41 +00:00
Gemfile.lock Update dependency aws-sdk-s3 to v1.149.1 (#30196) 2024-05-07 09:39:20 +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 Update devDependencies (non-major) (#29089) 2024-02-27 16:07:43 +00:00
LICENSE
lint-staged.config.js Improve lint-staged config (#28704) 2024-01-12 09:09:57 +00:00
package.json Merge commit 'b7902225d698a107df2cf8b4ca221caad38fa464' into glitch-soc/merge-upstream 2024-05-04 16:28:30 +02:00
postcss.config.js Fix PostCSS config (#29926) 2024-04-15 09:06:06 +00:00
priv-config
Procfile
Procfile.dev
Rakefile
README.md Merge commit '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream 2024-05-01 19:16:48 +02:00
redact-env.bash
scalingo.json
SECURITY.md Remove v3.5 branch from supported Mastodon versions (#28574) 2024-01-03 15:04:10 +00:00
stylelint.config.js
tsconfig.json Merge commit '3f6887557b23d363e7f8f18518db4447739d64bb' into glitch-soc/merge-upstream 2024-05-04 14:59:00 +02:00
Vagrantfile Forward 3035 port (#29710) 2024-04-05 09:19:43 +00:00
yarn.lock Merge commit 'd8c428472356abd70aaf1f514b99114464ee7f61' into glitch-soc/merge-upstream 2024-05-07 20:30:17 +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).
  • 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)