@@ -3,7 +3,7 @@ version: 2 | |||
aliases: | |||
- &defaults | |||
docker: | |||
- image: circleci/ruby:2.6.0-stretch-node | |||
- image: circleci/ruby:2.7-buster-node | |||
environment: &ruby_environment | |||
BUNDLE_APP_CONFIG: ./.bundle/ | |||
DB_HOST: localhost | |||
@@ -39,7 +39,6 @@ aliases: | |||
steps: | |||
- checkout | |||
- *attach_workspace | |||
- restore_cache: | |||
keys: | |||
- v1-node-dependencies-{{ checksum "yarn.lock" }} | |||
@@ -49,7 +48,6 @@ aliases: | |||
key: v1-node-dependencies-{{ checksum "yarn.lock" }} | |||
paths: | |||
- ./node_modules/ | |||
- *persist_to_workspace | |||
- &install_system_dependencies | |||
@@ -58,16 +56,25 @@ aliases: | |||
command: | | |||
sudo apt-get update | |||
sudo apt-get install -y libicu-dev libidn11-dev libprotobuf-dev protobuf-compiler | |||
## TODO: FIX THESE BUSTER DEPENDANCES | |||
sudo wget http://ftp.au.debian.org/debian/pool/main/i/icu/libicu57_57.1-6+deb9u3_amd64.deb | |||
sudo dpkg -i libicu57_57.1-6+deb9u3_amd64.deb | |||
sudo wget http://ftp.au.debian.org/debian/pool/main/p/protobuf/libprotobuf10_3.0.0-9_amd64.deb | |||
sudo dpkg -i libprotobuf10_3.0.0-9_amd64.deb | |||
- &install_ruby_dependencies | |||
steps: | |||
- *attach_workspace | |||
- *install_system_dependencies | |||
- run: ruby -e 'puts RUBY_VERSION' | tee /tmp/.ruby-version | |||
- *restore_ruby_dependencies | |||
- run: bundle install --clean --jobs 16 --path ./vendor/bundle/ --retry 3 --with pam_authentication --without development production && bundle clean | |||
- run: bundle config set clean 'true' | |||
- run: bundle config set deployment 'true' | |||
- run: bundle config set with 'pam_authentication' | |||
- run: bundle config set without 'development production' | |||
- run: bundle config set frozen 'true' | |||
- run: bundle install --jobs 16 --retry 3 && bundle clean | |||
- save_cache: | |||
key: v2-ruby-dependencies-{{ checksum "/tmp/.ruby-version" }}-{{ checksum "Gemfile.lock" }} | |||
paths: | |||
@@ -82,10 +89,8 @@ aliases: | |||
- &test_steps | |||
steps: | |||
- *attach_workspace | |||
- *install_system_dependencies | |||
- run: sudo apt-get install -y ffmpeg | |||
- run: | |||
name: Prepare Tests | |||
command: ./bin/rails parallel:create parallel:load_schema parallel:prepare | |||
@@ -98,21 +103,21 @@ jobs: | |||
<<: *defaults | |||
<<: *install_steps | |||
install-ruby2.6: | |||
install-ruby2.7: | |||
<<: *defaults | |||
<<: *install_ruby_dependencies | |||
install-ruby2.5: | |||
install-ruby2.6: | |||
<<: *defaults | |||
docker: | |||
- image: circleci/ruby:2.5.3-stretch-node | |||
- image: circleci/ruby:2.6-buster-node | |||
environment: *ruby_environment | |||
<<: *install_ruby_dependencies | |||
install-ruby2.4: | |||
install-ruby2.5: | |||
<<: *defaults | |||
docker: | |||
- image: circleci/ruby:2.4.5-stretch-node | |||
- image: circleci/ruby:2.5-buster-node | |||
environment: *ruby_environment | |||
<<: *install_ruby_dependencies | |||
@@ -128,43 +133,62 @@ jobs: | |||
- ./mastodon/public/assets | |||
- ./mastodon/public/packs-test/ | |||
test-ruby2.6: | |||
test-migrations: | |||
<<: *defaults | |||
docker: | |||
- image: circleci/ruby:2.6.0-stretch-node | |||
- image: circleci/ruby:2.7-buster-node | |||
environment: *ruby_environment | |||
- image: circleci/postgres:10.6-alpine | |||
environment: | |||
POSTGRES_USER: root | |||
- image: circleci/redis:5.0.3-alpine3.8 | |||
- image: circleci/redis:5-alpine | |||
steps: | |||
- *attach_workspace | |||
- *install_system_dependencies | |||
- run: | |||
name: Create database | |||
command: ./bin/rails parallel:create | |||
- run: | |||
name: Run migrations | |||
command: ./bin/rails parallel:migrate | |||
test-ruby2.7: | |||
<<: *defaults | |||
docker: | |||
- image: circleci/ruby:2.7-buster-node | |||
environment: *ruby_environment | |||
- image: circleci/postgres:10.6-alpine | |||
environment: | |||
POSTGRES_USER: root | |||
- image: circleci/redis:5-alpine | |||
<<: *test_steps | |||
test-ruby2.5: | |||
test-ruby2.6: | |||
<<: *defaults | |||
docker: | |||
- image: circleci/ruby:2.5.3-stretch-node | |||
- image: circleci/ruby:2.6-buster-node | |||
environment: *ruby_environment | |||
- image: circleci/postgres:10.6-alpine | |||
environment: | |||
POSTGRES_USER: root | |||
- image: circleci/redis:4.0.12-alpine | |||
- image: circleci/redis:5-alpine | |||
<<: *test_steps | |||
test-ruby2.4: | |||
test-ruby2.5: | |||
<<: *defaults | |||
docker: | |||
- image: circleci/ruby:2.4.5-stretch-node | |||
- image: circleci/ruby:2.5-buster-node | |||
environment: *ruby_environment | |||
- image: circleci/postgres:10.6-alpine | |||
environment: | |||
POSTGRES_USER: root | |||
- image: circleci/redis:4.0.12-alpine | |||
- image: circleci/redis:5-alpine | |||
<<: *test_steps | |||
test-webui: | |||
<<: *defaults | |||
docker: | |||
- image: circleci/node:8.15.0-stretch | |||
- image: circleci/node:12-buster | |||
steps: | |||
- *attach_workspace | |||
- run: ./bin/retry yarn test:jest | |||
@@ -173,30 +197,38 @@ jobs: | |||
<<: *defaults | |||
steps: | |||
- *attach_workspace | |||
- *install_system_dependencies | |||
- run: bundle exec i18n-tasks check-normalized | |||
- run: bundle exec i18n-tasks unused | |||
- run: bundle exec i18n-tasks missing -t plural | |||
- run: bundle exec i18n-tasks unused -l en | |||
- run: bundle exec i18n-tasks check-consistent-interpolations | |||
- run: bundle exec rake repo:check_locales_files | |||
workflows: | |||
version: 2 | |||
build-and-test: | |||
jobs: | |||
- install | |||
- install-ruby2.6: | |||
- install-ruby2.7: | |||
requires: | |||
- install | |||
- install-ruby2.5: | |||
- install-ruby2.6: | |||
requires: | |||
- install | |||
- install-ruby2.6 | |||
- install-ruby2.4: | |||
- install-ruby2.7 | |||
- install-ruby2.5: | |||
requires: | |||
- install | |||
- install-ruby2.6 | |||
- install-ruby2.7 | |||
- build: | |||
requires: | |||
- install-ruby2.6 | |||
- install-ruby2.7 | |||
- test-migrations: | |||
requires: | |||
- install-ruby2.7 | |||
- test-ruby2.7: | |||
requires: | |||
- install-ruby2.7 | |||
- build | |||
- test-ruby2.6: | |||
requires: | |||
- install-ruby2.6 | |||
@@ -205,13 +237,9 @@ workflows: | |||
requires: | |||
- install-ruby2.5 | |||
- build | |||
- test-ruby2.4: | |||
requires: | |||
- install-ruby2.4 | |||
- build | |||
- test-webui: | |||
requires: | |||
- install | |||
- check-i18n: | |||
requires: | |||
- install-ruby2.6 | |||
- install-ruby2.7 |
@@ -27,11 +27,11 @@ plugins: | |||
enabled: true | |||
eslint: | |||
enabled: true | |||
channel: eslint-5 | |||
channel: eslint-6 | |||
rubocop: | |||
enabled: true | |||
channel: rubocop-0-54 | |||
scss-lint: | |||
channel: rubocop-0-76 | |||
sass-lint: | |||
enabled: true | |||
exclude_patterns: | |||
- spec/ | |||
@@ -0,0 +1,10 @@ | |||
version: 1 | |||
update_configs: | |||
- package_manager: "ruby:bundler" | |||
directory: "/" | |||
update_schedule: "weekly" | |||
- package_manager: "javascript" | |||
directory: "/" | |||
update_schedule: "weekly" |
@@ -11,24 +11,14 @@ DB_NAME=gonano | |||
DB_PASS=$DATA_DB_PASS | |||
DB_PORT=5432 | |||
DATABASE_URL=postgresql://$DATA_DB_USER:$DATA_DB_PASS@$DATA_DB_HOST/gonano | |||
# DATABASE_URL=postgresql://$DATA_DB_USER:$DATA_DB_PASS@$DATA_DB_HOST/gonano | |||
# Optional ElasticSearch configuration | |||
ES_ENABLED=true | |||
ES_HOST=$DATA_ELASTIC_HOST | |||
ES_PORT=9200 | |||
# Optimizations | |||
LD_PRELOAD=/data/lib/libjemalloc.so | |||
# ImageMagick optimizations | |||
MAGICK_TEMPORARY_PATH=/app/tmp | |||
MAGICK_MEMORY_LIMIT=128MiB | |||
MAGICK_MAP_LIMIT=64MiB | |||
MAGICK_TIME_LIMIT=15 | |||
MAGICK_AREA_LIMIT=16MP | |||
MAGICK_WIDTH_LIMIT=8KP | |||
MAGICK_HEIGHT_LIMIT=8KP | |||
BIND=0.0.0.0 | |||
# Federation | |||
# Note: Changing LOCAL_DOMAIN at a later time will cause unwanted side effects, including breaking all existing federation. | |||
@@ -84,6 +74,7 @@ SMTP_PORT=587 | |||
SMTP_LOGIN=$SMTP_LOGIN | |||
SMTP_PASSWORD=$SMTP_PASSWORD | |||
SMTP_FROM_ADDRESS=notifications@${APP_NAME}.nanoapp.io | |||
#SMTP_REPLY_TO= | |||
#SMTP_DOMAIN= # defaults to LOCAL_DOMAIN | |||
#SMTP_DELIVERY_METHOD=smtp # delivery method can also be sendmail | |||
#SMTP_AUTH_METHOD=plain | |||
@@ -97,9 +88,17 @@ SMTP_FROM_ADDRESS=notifications@${APP_NAME}.nanoapp.io | |||
# PAPERCLIP_ROOT_URL=/system | |||
# Optional asset host for multi-server setups | |||
# The asset host must allow cross origin request from WEB_DOMAIN or LOCAL_DOMAIN | |||
# if WEB_DOMAIN is not set. For example, the server may have the | |||
# following header field: | |||
# Access-Control-Allow-Origin: https://example.com/ | |||
# CDN_HOST=https://assets.example.com | |||
# S3 (optional) | |||
# The attachment host must allow cross origin request from WEB_DOMAIN or | |||
# LOCAL_DOMAIN if WEB_DOMAIN is not set. For example, the server may have the | |||
# following header field: | |||
# Access-Control-Allow-Origin: https://192.168.1.123:9000/ | |||
# S3_ENABLED=true | |||
# S3_BUCKET= | |||
# AWS_ACCESS_KEY_ID= | |||
@@ -109,6 +108,8 @@ SMTP_FROM_ADDRESS=notifications@${APP_NAME}.nanoapp.io | |||
# S3_HOSTNAME=192.168.1.123:9000 | |||
# S3 (Minio Config (optional) Please check Minio instance for details) | |||
# The attachment host must allow cross origin request - see the description | |||
# above. | |||
# S3_ENABLED=true | |||
# S3_BUCKET= | |||
# AWS_ACCESS_KEY_ID= | |||
@@ -119,12 +120,30 @@ SMTP_FROM_ADDRESS=notifications@${APP_NAME}.nanoapp.io | |||
# S3_ENDPOINT= | |||
# S3_SIGNATURE_VERSION= | |||
# Google Cloud Storage (optional) | |||
# Use S3 compatible API. Since GCS does not support Multipart Upload, | |||
# increase the value of S3_MULTIPART_THRESHOLD to disable Multipart Upload. | |||
# The attachment host must allow cross origin request - see the description | |||
# above. | |||
# S3_ENABLED=true | |||
# AWS_ACCESS_KEY_ID= | |||
# AWS_SECRET_ACCESS_KEY= | |||
# S3_REGION= | |||
# S3_PROTOCOL=https | |||
# S3_HOSTNAME=storage.googleapis.com | |||
# S3_ENDPOINT=https://storage.googleapis.com | |||
# S3_MULTIPART_THRESHOLD=52428801 # 50.megabytes | |||
# Swift (optional) | |||
# The attachment host must allow cross origin request - see the description | |||
# above. | |||
# SWIFT_ENABLED=true | |||
# SWIFT_USERNAME= | |||
# For Keystone V3, the value for SWIFT_TENANT should be the project name | |||
# SWIFT_TENANT= | |||
# SWIFT_PASSWORD= | |||
# Some OpenStack V3 providers require PROJECT_ID (optional) | |||
# SWIFT_PROJECT_ID= | |||
# Keystone V2 and V3 URLs are supported. Use a V3 URL if possible to avoid | |||
# issues with token rate-limiting during high load. | |||
# SWIFT_AUTH_URL= | |||
@@ -164,6 +183,11 @@ SMTP_FROM_ADDRESS=notifications@${APP_NAME}.nanoapp.io | |||
# LDAP_BIND_DN= | |||
# LDAP_PASSWORD= | |||
# LDAP_UID=cn | |||
# LDAP_MAIL=mail | |||
# LDAP_SEARCH_FILTER=(|(%{uid}=%{email})(%{mail}=%{email})) | |||
# LDAP_UID_CONVERSION_ENABLED=true | |||
# LDAP_UID_CONVERSION_SEARCH=., - | |||
# LDAP_UID_CONVERSION_REPLACE=_ | |||
# PAM authentication (optional) | |||
# PAM authentication uses for the email generation the "email" pam variable | |||
@@ -171,8 +195,8 @@ SMTP_FROM_ADDRESS=notifications@${APP_NAME}.nanoapp.io | |||
# The pam environment variable "email" is provided by: | |||
# https://github.com/devkral/pam_email_extractor | |||
# PAM_ENABLED=true | |||
# Fallback Suffix for email address generation (nil by default) | |||
# PAM_DEFAULT_SUFFIX=pam | |||
# Fallback email domain for email address generation (LOCAL_DOMAIN by default) | |||
# PAM_EMAIL_DOMAIN=example.com | |||
# Name of the pam service (pam "auth" section is evaluated) | |||
# PAM_DEFAULT_SERVICE=rpam | |||
# Name of the pam service used for checking if an user can register (pam "account" section is evaluated) (nil (disabled) by default) | |||
@@ -207,8 +231,8 @@ SMTP_FROM_ADDRESS=notifications@${APP_NAME}.nanoapp.io | |||
# Optional SAML authentication (cf. omniauth-saml) | |||
# SAML_ENABLED=true | |||
# SAML_ACS_URL= | |||
# SAML_ISSUER=http://localhost:3000/auth/auth/saml/callback | |||
# SAML_ACS_URL=http://localhost:3000/auth/auth/saml/callback | |||
# SAML_ISSUER=https://example.com | |||
# SAML_IDP_SSO_TARGET_URL=https://idp.testshib.org/idp/profile/SAML2/Redirect/SSO | |||
# SAML_IDP_CERT= | |||
# SAML_IDP_CERT_FINGERPRINT= | |||
@@ -220,7 +244,14 @@ SMTP_FROM_ADDRESS=notifications@${APP_NAME}.nanoapp.io | |||
# SAML_SECURITY_ASSUME_EMAIL_IS_VERIFIED=true | |||
# SAML_ATTRIBUTES_STATEMENTS_UID="urn:oid:0.9.2342.19200300.100.1.1" | |||
# SAML_ATTRIBUTES_STATEMENTS_EMAIL="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" | |||
# SAML_ATTRIBUTES_STATEMENTS_FULL_NAME="urn:oid:2.5.4.42" | |||
# SAML_ATTRIBUTES_STATEMENTS_FULL_NAME="urn:oid:2.16.840.1.113730.3.1.241" | |||
# SAML_ATTRIBUTES_STATEMENTS_FIRST_NAME="urn:oid:2.5.4.42" | |||
# SAML_ATTRIBUTES_STATEMENTS_LAST_NAME="urn:oid:2.5.4.4" | |||
# SAML_UID_ATTRIBUTE="urn:oid:0.9.2342.19200300.100.1.1" | |||
# SAML_ATTRIBUTES_STATEMENTS_VERIFIED= | |||
# SAML_ATTRIBUTES_STATEMENTS_VERIFIED_EMAIL= | |||
# Use HTTP proxy for outgoing request (optional) | |||
# http_proxy=http://gateway.local:8118 | |||
# Access control for hidden service. | |||
# ALLOW_ACCESS_TO_HIDDEN_SERVICE=true |
@@ -10,6 +10,7 @@ DB_NAME=postgres | |||
DB_PASS= | |||
DB_PORT=5432 | |||
# Optional ElasticSearch configuration | |||
# You may also set ES_PREFIX to share the same cluster between multiple Mastodon servers (falls back to REDIS_NAMESPACE if not set) | |||
# ES_ENABLED=true | |||
# ES_HOST=es | |||
# ES_PORT=9200 | |||
@@ -68,6 +69,7 @@ SMTP_PORT=587 | |||
SMTP_LOGIN= | |||
SMTP_PASSWORD= | |||
SMTP_FROM_ADDRESS=notifications@example.com | |||
#SMTP_REPLY_TO= | |||
#SMTP_DOMAIN= # defaults to LOCAL_DOMAIN | |||
#SMTP_DELIVERY_METHOD=smtp # delivery method can also be sendmail | |||
#SMTP_AUTH_METHOD=plain | |||
@@ -113,6 +115,20 @@ SMTP_FROM_ADDRESS=notifications@example.com | |||
# S3_ENDPOINT= | |||
# S3_SIGNATURE_VERSION= | |||
# Google Cloud Storage (optional) | |||
# Use S3 compatible API. Since GCS does not support Multipart Upload, | |||
# increase the value of S3_MULTIPART_THRESHOLD to disable Multipart Upload. | |||
# The attachment host must allow cross origin request - see the description | |||
# above. | |||
# S3_ENABLED=true | |||
# AWS_ACCESS_KEY_ID= | |||
# AWS_SECRET_ACCESS_KEY= | |||
# S3_REGION= | |||
# S3_PROTOCOL=https | |||
# S3_HOSTNAME=storage.googleapis.com | |||
# S3_ENDPOINT=https://storage.googleapis.com | |||
# S3_MULTIPART_THRESHOLD=52428801 # 50.megabytes | |||
# Swift (optional) | |||
# The attachment host must allow cross origin request - see the description | |||
# above. | |||
@@ -162,7 +178,11 @@ STREAMING_CLUSTER_NUM=1 | |||
# LDAP_BIND_DN= | |||
# LDAP_PASSWORD= | |||
# LDAP_UID=cn | |||
# LDAP_SEARCH_FILTER="%{uid}=%{email}" | |||
# LDAP_MAIL=mail | |||
# LDAP_SEARCH_FILTER=(|(%{uid}=%{email})(%{mail}=%{email})) | |||
# LDAP_UID_CONVERSION_ENABLED=true | |||
# LDAP_UID_CONVERSION_SEARCH=., - | |||
# LDAP_UID_CONVERSION_REPLACE=_ | |||
# PAM authentication (optional) | |||
# PAM authentication uses for the email generation the "email" pam variable | |||
@@ -206,8 +226,8 @@ STREAMING_CLUSTER_NUM=1 | |||
# Optional SAML authentication (cf. omniauth-saml) | |||
# SAML_ENABLED=true | |||
# SAML_ACS_URL= | |||
# SAML_ISSUER=http://localhost:3000/auth/auth/saml/callback | |||
# SAML_ACS_URL=http://localhost:3000/auth/auth/saml/callback | |||
# SAML_ISSUER=https://example.com | |||
# SAML_IDP_SSO_TARGET_URL=https://idp.testshib.org/idp/profile/SAML2/Redirect/SSO | |||
# SAML_IDP_CERT= | |||
# SAML_IDP_CERT_FINGERPRINT= | |||
@@ -230,3 +250,13 @@ STREAMING_CLUSTER_NUM=1 | |||
# http_proxy=http://gateway.local:8118 | |||
# Access control for hidden service. | |||
# ALLOW_ACCESS_TO_HIDDEN_SERVICE=true | |||
# Authorized fetch mode (optional) | |||
# Require remote servers to authentify when fetching toots, see | |||
# https://docs.joinmastodon.org/admin/config/#authorized_fetch | |||
# AUTHORIZED_FETCH=true | |||
# Whitelist mode (optional) | |||
# Only allow federation with whitelisted domains, see | |||
# https://docs.joinmastodon.org/admin/config/#whitelist_mode | |||
# WHITELIST_MODE=true |
@@ -1,5 +1,5 @@ | |||
# Node.js | |||
NODE_ENV=test | |||
NODE_ENV=tests | |||
# Federation | |||
LOCAL_DOMAIN=cb6e6126.ngrok.io | |||
LOCAL_HTTPS=true |
@@ -1,2 +1,3 @@ | |||
VAGRANT=true | |||
LOCAL_DOMAIN=mastodon.local | |||
BIND=0.0.0.0 |
@@ -0,0 +1,2 @@ | |||
patreon: mastodon | |||
open_collective: mastodon |
@@ -0,0 +1,5 @@ | |||
blank_issues_enabled: false | |||
contact_links: | |||
- name: Mastodon Meta Discussion Board | |||
url: https://discourse.joinmastodon.org/ | |||
about: Please ask and answer questions here. |
@@ -0,0 +1,10 @@ | |||
daysUntilStale: 120 | |||
daysUntilClose: 7 | |||
exemptLabels: | |||
- security | |||
staleLabel: wontfix | |||
markComment: > | |||
This issue has been automatically marked as stale because it has not had | |||
recent activity. It will be closed if no further activity occurs. Thank you | |||
for your contributions. | |||
only: pulls |
@@ -13,6 +13,7 @@ | |||
/db/*.sqlite3-journal | |||
# Ignore all logfiles and tempfiles. | |||
.eslintcache | |||
/log/* | |||
!/log/.keep | |||
/tmp | |||
@@ -23,6 +24,7 @@ public/packs | |||
public/packs-test | |||
.env | |||
.env.production | |||
.env.development | |||
node_modules/ | |||
build/ | |||
@@ -55,6 +57,8 @@ npm-debug.log | |||
yarn-error.log | |||
yarn-debug.log | |||
# Ignore vagrant log files | |||
ubuntu-xenial-16.04-cloudimg-console.log | |||
# Ignore Docker option files | |||
docker-compose.override.yml | |||
@@ -1 +1 @@ | |||
8 | |||
12 |
@@ -1,3 +1,6 @@ | |||
require: | |||
- rubocop-rails | |||
AllCops: | |||
TargetRubyVersion: 2.3 | |||
Exclude: | |||
@@ -68,6 +71,9 @@ Naming/MemoizedInstanceVariableName: | |||
Rails: | |||
Enabled: true | |||
Rails/EnumHash: | |||
Enabled: false | |||
Rails/HasAndBelongsToMany: | |||
Enabled: false | |||
@@ -82,6 +88,9 @@ Rails/Exit: | |||
- 'lib/mastodon/*' | |||
- 'lib/cli.rb' | |||
Rails/HelperInstanceVariable: | |||
Enabled: false | |||
Style/ClassAndModuleChildren: | |||
Enabled: false | |||
@@ -96,6 +105,9 @@ Style/Documentation: | |||
Style/DoubleNegation: | |||
Enabled: true | |||
Style/FormatStringToken: | |||
Enabled: false | |||
Style/FrozenStringLiteralComment: | |||
Enabled: true | |||
@@ -1 +1 @@ | |||
2.6.1 | |||
2.6.5 |
@@ -0,0 +1,37 @@ | |||
# Linter Documentation: | |||
# https://github.com/sasstools/sass-lint/tree/v1.13.1/docs/options | |||
files: | |||
include: app/javascript/styles/**/*.scss | |||
ignore: | |||
- app/javascript/styles/mastodon/reset.scss | |||
rules: | |||
# Disallows | |||
no-color-literals: 0 | |||
no-css-comments: 0 | |||
no-duplicate-properties: 0 | |||
no-ids: 0 | |||
no-important: 0 | |||
no-mergeable-selectors: 0 | |||
no-misspelled-properties: 0 | |||
no-qualifying-elements: 0 | |||
no-transition-all: 0 | |||
no-vendor-prefixes: 0 | |||
# Nesting | |||
force-element-nesting: 0 | |||
force-attribute-nesting: 0 | |||
force-pseudo-nesting: 0 | |||
# Name Formats | |||
class-name-format: 0 | |||
leading-zero: 0 | |||
# Style Guide | |||
attribute-quotes: 0 | |||
hex-length: 0 | |||
indentation: 0 | |||
nesting-depth: 0 | |||
property-sort-order: 0 | |||
quotes: 0 |
@@ -1,264 +0,0 @@ | |||
# Linter Documentation: | |||
# https://github.com/brigade/scss-lint/blob/v0.42.2/lib/scss_lint/linter/README.md | |||
scss_files: 'app/javascript/styles/**/*.scss' | |||
exclude: | |||
- app/javascript/styles/reset.scss | |||
linters: | |||
# Reports when you use improper spacing around ! (the "bang") in !default, | |||
# !global, !important, and !optional flags. | |||
BangFormat: | |||
enabled: false | |||
# Whether or not to prefer `border: 0` over `border: none`. | |||
BorderZero: | |||
enabled: false | |||
# Reports when you define a rule set using a selector with chained classes | |||
# (a.k.a. adjoining classes). | |||
ChainedClasses: | |||
enabled: false | |||
# Prefer hexadecimal color codes over color keywords. | |||
# (e.g. `color: green` is a color keyword) | |||
ColorKeyword: | |||
enabled: false | |||
# Prefer color literals (keywords or hexadecimal codes) to be used only in | |||
# variable declarations. They should be referred to via variables everywhere | |||
# else. | |||
ColorVariable: | |||
enabled: true | |||
# Which form of comments to prefer in CSS. | |||
Comment: | |||
enabled: false | |||
# Reports @debug statements (which you probably left behind accidentally). | |||
DebugStatement: | |||
enabled: false | |||
# Rule sets should be ordered as follows: | |||
# - @extend declarations | |||
# - @include declarations without inner @content | |||
# - properties, @include declarations with inner @content | |||
# - nested rule sets. | |||
DeclarationOrder: | |||
enabled: false | |||
# `scss-lint:disable` control comments should be preceded by a comment | |||
# explaining why these linters are being disabled for this file. | |||
# See https://github.com/brigade/scss-lint#disabling-linters-via-source for | |||
# more information. | |||
DisableLinterReason: | |||
enabled: true | |||
# Reports when you define the same property twice in a single rule set. | |||
DuplicateProperty: | |||
enabled: false | |||
# Separate rule, function, and mixin declarations with empty lines. | |||
EmptyLineBetweenBlocks: | |||
enabled: true | |||
# Reports when you have an empty rule set. | |||
EmptyRule: | |||
enabled: true | |||
# Reports when you have an @extend directive. | |||
ExtendDirective: | |||
enabled: false | |||
# Files should always have a final newline. This results in better diffs | |||
# when adding lines to the file, since SCM systems such as git won't | |||
# think that you touched the last line. | |||
FinalNewline: | |||
enabled: false | |||
# HEX colors should use three-character values where possible. | |||
HexLength: | |||
enabled: false | |||
# HEX color values should use lower-case colors to differentiate between | |||
# letters and numbers, e.g. `#E3E3E3` vs. `#e3e3e3`. | |||
HexNotation: | |||
enabled: true | |||
# Avoid using ID selectors. | |||
IdSelector: | |||
enabled: false | |||
# The basenames of @imported SCSS partials should not begin with an | |||
# underscore and should not include the filename extension. | |||
ImportPath: | |||
enabled: false | |||
# Avoid using !important in properties. It is usually indicative of a | |||
# misunderstanding of CSS specificity and can lead to brittle code. | |||
ImportantRule: | |||
enabled: false | |||
# Indentation should always be done in increments of 2 spaces. | |||
Indentation: | |||
enabled: true | |||
width: 2 | |||
# Don't write leading zeros for numeric values with a decimal point. | |||
LeadingZero: | |||
enabled: false | |||
# Reports when you define the same selector twice in a single sheet. | |||
MergeableSelector: | |||
enabled: false | |||
# Functions, mixins, variables, and placeholders should be declared | |||
# with all lowercase letters and hyphens instead of underscores. | |||
NameFormat: | |||
enabled: false | |||
# Avoid nesting selectors too deeply. | |||
NestingDepth: | |||
enabled: false | |||
# Always use placeholder selectors in @extend. | |||
PlaceholderInExtend: | |||
enabled: false | |||
# Sort properties in a strict order. | |||
PropertySortOrder: | |||
enabled: false | |||
# Reports when you use an unknown or disabled CSS property | |||
# (ignoring vendor-prefixed properties). | |||
PropertySpelling: | |||
enabled: false | |||
# Configure which units are allowed for property values. | |||
PropertyUnits: | |||
enabled: false | |||
# Pseudo-elements, like ::before, and ::first-letter, should be declared | |||
# with two colons. Pseudo-classes, like :hover and :first-child, should | |||
# be declared with one colon. | |||
PseudoElement: | |||
enabled: true | |||
# Avoid qualifying elements in selectors (also known as "tag-qualifying"). | |||
QualifyingElement: | |||
enabled: false | |||
# Don't write selectors with a depth of applicability greater than 3. | |||
SelectorDepth: | |||
enabled: false | |||
# Selectors should always use hyphenated-lowercase, rather than camelCase or | |||
# snake_case. | |||
SelectorFormat: | |||
enabled: false | |||
convention: hyphenated_lowercase | |||
# Prefer the shortest shorthand form possible for properties that support it. | |||
Shorthand: | |||
enabled: true | |||
# Each property should have its own line, except in the special case of | |||
# single line rulesets. | |||
SingleLinePerProperty: | |||
enabled: true | |||
allow_single_line_rule_sets: true | |||
# Split selectors onto separate lines after each comma, and have each | |||
# individual selector occupy a single line. | |||
SingleLinePerSelector: | |||
enabled: true | |||
# Commas in lists should be followed by a space. | |||
SpaceAfterComma: | |||
enabled: false | |||
# Properties should be formatted with a single space separating the colon | |||
# from the property's value. | |||
SpaceAfterPropertyColon: | |||
enabled: true | |||
# Properties should be formatted with no space between the name and the | |||
# colon. | |||
SpaceAfterPropertyName: | |||
enabled: true | |||
# Variables should be formatted with a single space separating the colon | |||
# from the variable's value. | |||
SpaceAfterVariableColon: | |||
enabled: true | |||
# Variables should be formatted with no space between the name and the | |||
# colon. | |||
SpaceAfterVariableName: | |||
enabled: false | |||
# Operators should be formatted with a single space on both sides of an | |||
# infix operator. | |||
SpaceAroundOperator: | |||
enabled: true | |||
# Opening braces should be preceded by a single space. | |||
SpaceBeforeBrace: | |||
enabled: true | |||
# Parentheses should not be padded with spaces. | |||
SpaceBetweenParens: | |||
enabled: false | |||
# Enforces that string literals should be written with a consistent form | |||
# of quotes (single or double). | |||
StringQuotes: | |||
enabled: false | |||
# Property values, @extend, @include, and @import directives, and variable | |||
# declarations should always end with a semicolon. | |||
TrailingSemicolon: | |||
enabled: true | |||
# Reports lines containing trailing whitespace. | |||
TrailingWhitespace: | |||
enabled: true | |||
# Don't write trailing zeros for numeric values with a decimal point. | |||
TrailingZero: | |||
enabled: false | |||
# Don't use the `all` keyword to specify transition properties. | |||
TransitionAll: | |||
enabled: false | |||
# Numeric values should not contain unnecessary fractional portions. | |||
UnnecessaryMantissa: | |||
enabled: false | |||
# Do not use parent selector references (&) when they would otherwise | |||
# be unnecessary. | |||
UnnecessaryParentReference: | |||
enabled: false | |||
# URLs should be valid and not contain protocols or domain names. | |||
UrlFormat: | |||
enabled: true | |||
# URLs should always be enclosed within quotes. | |||
UrlQuotes: | |||
enabled: true | |||
# Properties, like color and font, are easier to read and maintain | |||
# when defined using variables rather than literals. | |||
VariableForProperty: | |||
enabled: false | |||
# Avoid vendor prefixes. Or rather: don't write them yourself. | |||
VendorPrefix: | |||
enabled: false | |||
# Omit length units on zero values, e.g. `0px` vs. `0`. | |||
ZeroUnit: | |||
enabled: true |
@@ -43,4 +43,4 @@ Gruntfile.js | |||
# for specific ignore | |||
!.svgo.yml | |||
!sass-lint/**/*.yml |
@@ -3,6 +3,666 @@ Changelog | |||
All notable changes to this project will be documented in this file. | |||
## [v3.1.2] - 2020-02-27 | |||
### Added | |||
- Add `--reset-password` option to `tootctl accounts modify` ([ThibG](https://github.com/tootsuite/mastodon/pull/13126)) | |||
- Add source-mapped stacktrace to error message in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/13082)) | |||
### Fixed | |||
- Fix dismissing an announcement twice raising an obscure error ([ThibG](https://github.com/tootsuite/mastodon/pull/13124)) | |||
- Fix misleading error when attempting to re-send a pending follow request ([ThibG](https://github.com/tootsuite/mastodon/pull/13133)) | |||
- Fix backups failing when files are missing from media attachments ([ThibG](https://github.com/tootsuite/mastodon/pull/13146)) | |||
- Fix duplicate accounts being created when fetching an account for its key only ([ThibG](https://github.com/tootsuite/mastodon/pull/13147)) | |||
- Fix `/web` redirecting to `/web/web` in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/13128)) | |||
- Fix previously OStatus-based accounts not being detected as ActivityPub ([ThibG](https://github.com/tootsuite/mastodon/pull/13129)) | |||
- Fix account JSON/RSS not being cacheable due to wrong mime type comparison ([ThibG](https://github.com/tootsuite/mastodon/pull/13116)) | |||
- Fix old browsers crashing because of missing `finally` polyfill in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/13115)) | |||
- Fix account's bio not being shown if there are no proofs/fields in admin UI ([ThibG](https://github.com/tootsuite/mastodon/pull/13075)) | |||
- Fix sign-ups without checked user agreement being accepted through the web form ([ThibG](https://github.com/tootsuite/mastodon/pull/13088)) | |||
- Fix non-x64 architectures not being able to build Docker image because of hardcoded Node.js architecture ([SaraSmiseth](https://github.com/tootsuite/mastodon/pull/13081)) | |||
- Fix invite request input not being shown on sign-up error if left empty ([ThibG](https://github.com/tootsuite/mastodon/pull/13089)) | |||
- Fix some migration hints mentioning GitLab instead of Mastodon ([saper](https://github.com/tootsuite/mastodon/pull/13084)) | |||
### Security | |||
- Fix leak of arbitrary statuses through unfavourite action in REST API ([Gargron](https://github.com/tootsuite/mastodon/pull/13161)) | |||
## [3.1.1] - 2020-02-10 | |||
### Fixed | |||
- Fix yanked dependency preventing installation ([mayaeh](https://github.com/tootsuite/mastodon/pull/13059)) | |||
## [3.1.0] - 2020-02-09 | |||
### Added | |||
- Add bookmarks ([ThibG](https://github.com/tootsuite/mastodon/pull/7107), [Gargron](https://github.com/tootsuite/mastodon/pull/12494), [Gomasy](https://github.com/tootsuite/mastodon/pull/12381)) | |||
- Add announcements ([Gargron](https://github.com/tootsuite/mastodon/pull/12662), [Gargron](https://github.com/tootsuite/mastodon/pull/12967), [Gargron](https://github.com/tootsuite/mastodon/pull/12970), [Gargron](https://github.com/tootsuite/mastodon/pull/12963), [Gargron](https://github.com/tootsuite/mastodon/pull/12950), [Gargron](https://github.com/tootsuite/mastodon/pull/12990), [Gargron](https://github.com/tootsuite/mastodon/pull/12949), [Gargron](https://github.com/tootsuite/mastodon/pull/12989), [Gargron](https://github.com/tootsuite/mastodon/pull/12964), [Gargron](https://github.com/tootsuite/mastodon/pull/12965), [ThibG](https://github.com/tootsuite/mastodon/pull/12958), [ThibG](https://github.com/tootsuite/mastodon/pull/12957), [Gargron](https://github.com/tootsuite/mastodon/pull/12955), [ThibG](https://github.com/tootsuite/mastodon/pull/12946), [ThibG](https://github.com/tootsuite/mastodon/pull/12954)) | |||
- Add number animations in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/12948), [Gargron](https://github.com/tootsuite/mastodon/pull/12971)) | |||
- Add `kab`, `is`, `kn`, `mr`, `ur` to available locales ([Gargron](https://github.com/tootsuite/mastodon/pull/12882), [BoFFire](https://github.com/tootsuite/mastodon/pull/12962), [Gargron](https://github.com/tootsuite/mastodon/pull/12379)) | |||
- Add profile filter category ([ThibG](https://github.com/tootsuite/mastodon/pull/12918)) | |||
- Add ability to add oneself to lists ([ThibG](https://github.com/tootsuite/mastodon/pull/12271)) | |||
- Add hint how to contribute translations to preferences page ([Sasha-Sorokin](https://github.com/tootsuite/mastodon/pull/12736)) | |||
- Add signatures to statuses in archive takeout ([noellabo](https://github.com/tootsuite/mastodon/pull/12649)) | |||
- Add support for `magnet:` and `xmpp` links ([ThibG](https://github.com/tootsuite/mastodon/pull/12905), [ThibG](https://github.com/tootsuite/mastodon/pull/12709)) | |||
- Add `follow_request` notification type ([ThibG](https://github.com/tootsuite/mastodon/pull/12198)) | |||
- Add ability to filter reports by account domain in admin UI ([ThibG](https://github.com/tootsuite/mastodon/pull/12154)) | |||
- Add link to search for users connected from the same IP address to admin UI ([ThibG](https://github.com/tootsuite/mastodon/pull/12157)) | |||
- Add link to reports targeting a specific domain in admin view ([ThibG](https://github.com/tootsuite/mastodon/pull/12513)) | |||
- Add support for EventSource streaming in web UI ([BenLubar](https://github.com/tootsuite/mastodon/pull/12887)) | |||
- Add hotkey for opening media attachments in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/12498), [Kjwon15](https://github.com/tootsuite/mastodon/pull/12546)) | |||
- Add relationship-based options to status dropdowns in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/12377), [ThibG](https://github.com/tootsuite/mastodon/pull/12535), [Gargron](https://github.com/tootsuite/mastodon/pull/12430)) | |||
- Add support for submitting media description with `ctrl`+`enter` in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/12272)) | |||
- Add download button to audio and video players in web UI ([NimaBoscarino](https://github.com/tootsuite/mastodon/pull/12179)) | |||
- Add setting for whether to crop images in timelines in web UI ([duxovni](https://github.com/tootsuite/mastodon/pull/12126)) | |||
- Add support for `Event` activities ([tcitworld](https://github.com/tootsuite/mastodon/pull/12637)) | |||
- Add basic support for `Group` actors ([noellabo](https://github.com/tootsuite/mastodon/pull/12071)) | |||
- Add `S3_OVERRIDE_PATH_STYLE` environment variable ([Gargron](https://github.com/tootsuite/mastodon/pull/12594)) | |||
- Add `S3_OPEN_TIMEOUT` environment variable ([tateisu](https://github.com/tootsuite/mastodon/pull/12459)) | |||
- Add `LDAP_MAIL` environment variable ([madmath03](https://github.com/tootsuite/mastodon/pull/12053)) | |||
- Add `LDAP_UID_CONVERSION_ENABLED` environment variable ([madmath03](https://github.com/tootsuite/mastodon/pull/12461)) | |||
- Add `--remote-only` option to `tootctl emoji purge` ([ThibG](https://github.com/tootsuite/mastodon/pull/12810)) | |||
- Add `tootctl media remove-orphans` ([Gargron](https://github.com/tootsuite/mastodon/pull/12568), [Gargron](https://github.com/tootsuite/mastodon/pull/12571)) | |||
- Add `tootctl media lookup` command ([irlcatgirl](https://github.com/tootsuite/mastodon/pull/12283)) | |||
- Add cache for OEmbed endpoints to avoid extra HTTP requests ([Gargron](https://github.com/tootsuite/mastodon/pull/12403)) | |||
- Add support for KaiOS arrow navigation to public pages ([nolanlawson](https://github.com/tootsuite/mastodon/pull/12251)) | |||
- Add `discoverable` to accounts in REST API ([trwnh](https://github.com/tootsuite/mastodon/pull/12508)) | |||
- Add admin setting to disable default follows ([ArisuOngaku](https://github.com/tootsuite/mastodon/pull/12566)) | |||
- Add support for LDAP and PAM in the OAuth password grant strategy ([ntl-purism](https://github.com/tootsuite/mastodon/pull/12390), [Gargron](https://github.com/tootsuite/mastodon/pull/12743)) | |||
- Allow support for `Accept`/`Reject` activities with a non-embedded object ([puckipedia](https://github.com/tootsuite/mastodon/pull/12199)) | |||
- Add "Show thread" button to public profiles ([Sasha-Sorokin](https://github.com/tootsuite/mastodon/pull/13000)) | |||
### Changed | |||
- Change `last_status_at` to be a date, not datetime in REST API ([ThibG](https://github.com/tootsuite/mastodon/pull/12966)) | |||
- Change followers page to relationships page in admin UI ([Gargron](https://github.com/tootsuite/mastodon/pull/12927), [Gargron](https://github.com/tootsuite/mastodon/pull/12934)) | |||
- Change reported media attachments to always be hidden in admin UI ([Gargron](https://github.com/tootsuite/mastodon/pull/12879), [ThibG](https://github.com/tootsuite/mastodon/pull/12907)) | |||
- Change string from "Disable" to "Disable login" in admin UI ([nileshkumar](https://github.com/tootsuite/mastodon/pull/12201)) | |||
- Change report page structure in admin UI ([Sasha-Sorokin](https://github.com/tootsuite/mastodon/pull/12615)) | |||
- Change swipe sensitivity to be lower on small screens in web UI ([umonaca](https://github.com/tootsuite/mastodon/pull/12168)) | |||
- Change audio/video playback to stop playback when out of view in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/12486)) | |||
- Change media description label based on upload type in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/12270)) | |||
- Change large numbers to render without decimal units in web UI ([noellabo](https://github.com/tootsuite/mastodon/pull/12706)) | |||
- Change "Add a choice" button to be disabled rather than hidden when poll limit reached in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/12319), [hinaloe](https://github.com/tootsuite/mastodon/pull/12544)) | |||
- Change `tootctl statuses remove` to keep statuses favourited or bookmarked by local users ([ThibG](https://github.com/tootsuite/mastodon/pull/11267), [Gomasy](https://github.com/tootsuite/mastodon/pull/12818)) | |||
- Change domain block behavior to update user records (fast) before deleting data (slower) ([ThibG](https://github.com/tootsuite/mastodon/pull/12247)) | |||
- Change behaviour to strip audio metadata on uploads ([hugogameiro](https://github.com/tootsuite/mastodon/pull/12171)) | |||
- Change accepted length of remote media descriptions from 420 to 1,500 characters ([ThibG](https://github.com/tootsuite/mastodon/pull/12262)) | |||
- Change preferences pages structure ([Sasha-Sorokin](https://github.com/tootsuite/mastodon/pull/12497), [mayaeh](https://github.com/tootsuite/mastodon/pull/12517), [Sasha-Sorokin](https://github.com/tootsuite/mastodon/pull/12801), [Sasha-Sorokin](https://github.com/tootsuite/mastodon/pull/12797), [Sasha-Sorokin](https://github.com/tootsuite/mastodon/pull/12799), [Sasha-Sorokin](https://github.com/tootsuite/mastodon/pull/12793)) | |||
- Change format of titles in RSS ([devkral](https://github.com/tootsuite/mastodon/pull/8596)) | |||
- Change favourite icon animation from spring-based motion to CSS animation in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/12175)) | |||
- Change minimum required Node.js version to 10, and default to 12 ([Shleeble](https://github.com/tootsuite/mastodon/pull/12791), [mkody](https://github.com/tootsuite/mastodon/pull/12906), [Shleeble](https://github.com/tootsuite/mastodon/pull/12703)) | |||
- Change spam check to exempt server staff ([ThibG](https://github.com/tootsuite/mastodon/pull/12874)) | |||
- Change to fallback to to `Create` audience when `object` has no defined audience ([ThibG](https://github.com/tootsuite/mastodon/pull/12249)) | |||
- Change Twemoji library to 12.1.3 in web UI ([koyuawsmbrtn](https://github.com/tootsuite/mastodon/pull/12342)) | |||
- Change blocked users to be hidden from following/followers lists ([ThibG](https://github.com/tootsuite/mastodon/pull/12733)) | |||
- Change signature verification to ignore signatures with invalid host ([Gargron](https://github.com/tootsuite/mastodon/pull/13033)) | |||
### Removed | |||
- Remove unused dependencies ([ykzts](https://github.com/tootsuite/mastodon/pull/12861), [mayaeh](https://github.com/tootsuite/mastodon/pull/12826), [ThibG](https://github.com/tootsuite/mastodon/pull/12822), [ykzts](https://github.com/tootsuite/mastodon/pull/12533)) | |||
### Fixed | |||
- Fix some translatable strings being used wrongly ([Sasha-Sorokin](https://github.com/tootsuite/mastodon/pull/12569), [Sasha-Sorokin](https://github.com/tootsuite/mastodon/pull/12589), [Sasha-Sorokin](https://github.com/tootsuite/mastodon/pull/12502), [mayaeh](https://github.com/tootsuite/mastodon/pull/12231)) | |||
- Fix headline of public timeline page when set to local-only ([ykzts](https://github.com/tootsuite/mastodon/pull/12224)) | |||
- Fix space between tabs not being spread evenly in web UI ([Sasha-Sorokin](https://github.com/tootsuite/mastodon/pull/12944), [Sasha-Sorokin](https://github.com/tootsuite/mastodon/pull/12961), [Sasha-Sorokin](https://github.com/tootsuite/mastodon/pull/12446)) | |||
- Fix interactive delays in database migrations with no TTY ([Gargron](https://github.com/tootsuite/mastodon/pull/12969)) | |||
- Fix status overflowing in report dialog in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/12959)) | |||
- Fix unlocalized dropdown button title in web UI ([Sasha-Sorokin](https://github.com/tootsuite/mastodon/pull/12947)) | |||
- Fix media attachments without file being uploadable ([Gargron](https://github.com/tootsuite/mastodon/pull/12562)) | |||
- Fix unfollow confirmations in profile directory in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/12922)) | |||
- Fix duplicate `description` meta tag on accounts public pages ([ThibG](https://github.com/tootsuite/mastodon/pull/12923)) | |||
- Fix slow query of federated timeline ([notozeki](https://github.com/tootsuite/mastodon/pull/12886)) | |||
- Fix not all of account's active IPs showing up in admin UI ([Gargron](https://github.com/tootsuite/mastodon/pull/12909), [Gargron](https://github.com/tootsuite/mastodon/pull/12943)) | |||
- Fix search by IP not using alternative browser sessions in admin UI ([Gargron](https://github.com/tootsuite/mastodon/pull/12904)) | |||
- Fix “X new items” not showing up for slow mode on empty timelines in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/12875)) | |||
- Fix OEmbed endpoint being inaccessible in secure mode ([Gargron](https://github.com/tootsuite/mastodon/pull/12864)) | |||
- Fix proofs API being inaccessible in secure mode ([Gargron](https://github.com/tootsuite/mastodon/pull/12495)) | |||
- Fix Ruby 2.7 incompatibilities ([ThibG](https://github.com/tootsuite/mastodon/pull/12831), [ThibG](https://github.com/tootsuite/mastodon/pull/12824), [Shleeble](https://github.com/tootsuite/mastodon/pull/12759), [zunda](https://github.com/tootsuite/mastodon/pull/12769)) | |||
- Fix invalid poll votes being accepted in REST API ([ThibG](https://github.com/tootsuite/mastodon/pull/12601)) | |||
- Fix old migrations failing because of strong migrations update ([ThibG](https://github.com/tootsuite/mastodon/pull/12787), [ThibG](https://github.com/tootsuite/mastodon/pull/12692)) | |||
- Fix reuse of detailed status components in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/12792)) | |||
- Fix base64-encoded file uploads not being possible in REST API ([Gargron](https://github.com/tootsuite/mastodon/pull/12748), [Gargron](https://github.com/tootsuite/mastodon/pull/12857)) | |||
- Fix error due to missing authentication call in filters controller ([Gargron](https://github.com/tootsuite/mastodon/pull/12746)) | |||
- Fix uncaught unknown format error in host meta controller ([Gargron](https://github.com/tootsuite/mastodon/pull/12747)) | |||
- Fix URL search not returning private toots user has access to ([ThibG](https://github.com/tootsuite/mastodon/pull/12742), [ThibG](https://github.com/tootsuite/mastodon/pull/12336)) | |||
- Fix cache digesting log noise on status embeds ([Gargron](https://github.com/tootsuite/mastodon/pull/12750)) | |||
- Fix slowness due to layout thrashing when reloading a large set of statuses in web UI ([panarom](https://github.com/tootsuite/mastodon/pull/12661), [panarom](https://github.com/tootsuite/mastodon/pull/12744), [Gargron](https://github.com/tootsuite/mastodon/pull/12712)) | |||
- Fix error when fetching followers/following from REST API when user has network hidden ([Gargron](https://github.com/tootsuite/mastodon/pull/12716)) | |||
- Fix IDN mentions not being processed, IDN domains not being rendered ([Gargron](https://github.com/tootsuite/mastodon/pull/12715), [Gargron](https://github.com/tootsuite/mastodon/pull/13035), [Gargron](https://github.com/tootsuite/mastodon/pull/13030)) | |||
- Fix error when searching for empty phrase ([Gargron](https://github.com/tootsuite/mastodon/pull/12711)) | |||
- Fix backups stopping due to read timeouts ([chr-1x](https://github.com/tootsuite/mastodon/pull/12281)) | |||
- Fix batch actions on non-pending tags in admin UI ([ThibG](https://github.com/tootsuite/mastodon/pull/12537)) | |||
- Fix sample `SAML_ACS_URL`, `SAML_ISSUER` ([orlea](https://github.com/tootsuite/mastodon/pull/12669)) | |||
- Fix manual scrolling issue on Firefox/Windows in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/12648)) | |||
- Fix archive takeout failing if total dump size exceeds 2GB ([scd31](https://github.com/tootsuite/mastodon/pull/12602), [Gargron](https://github.com/tootsuite/mastodon/pull/12653)) | |||
- Fix custom emoji category creation silently erroring out on duplicate category ([ThibG](https://github.com/tootsuite/mastodon/pull/12647)) | |||
- Fix link crawler not specifying preferred content type ([ThibG](https://github.com/tootsuite/mastodon/pull/12646)) | |||
- Fix featured hashtag setting page erroring out instead of rejecting invalid tags ([ThibG](https://github.com/tootsuite/mastodon/pull/12436)) | |||
- Fix tooltip messages of single/multiple-choice polls switcher being reversed in web UI ([acid-chicken](https://github.com/tootsuite/mastodon/pull/12616)) | |||
- Fix typo in help text of `tootctl statuses remove` ([trwnh](https://github.com/tootsuite/mastodon/pull/12603)) | |||
- Fix generic HTTP 500 error on duplicate records ([Gargron](https://github.com/tootsuite/mastodon/pull/12563)) | |||
- Fix old migration failing with new status default scope ([ThibG](https://github.com/tootsuite/mastodon/pull/12493)) | |||
- Fix errors when using search API with no query ([Gargron](https://github.com/tootsuite/mastodon/pull/12541), [trwnh](https://github.com/tootsuite/mastodon/pull/12549)) | |||
- Fix poll options not being selectable via keyboard in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/12538)) | |||
- Fix conversations not having an unread indicator in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/12506)) | |||
- Fix lost focus when modals open/close in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/12437)) | |||
- Fix pending upload count not being decremented on error in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/12499)) | |||
- Fix empty poll options not being removed on remote poll update ([ThibG](https://github.com/tootsuite/mastodon/pull/12484)) | |||
- Fix OCR with delete & redraft in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/12465)) | |||
- Fix blur behind closed registration message ([ThibG](https://github.com/tootsuite/mastodon/pull/12442)) | |||
- Fix OEmbed discovery not handling different URL variants in query ([Gargron](https://github.com/tootsuite/mastodon/pull/12439)) | |||
- Fix link crawler crashing on `<a>` tags without `href` ([ThibG](https://github.com/tootsuite/mastodon/pull/12159)) | |||
- Fix whitelisted subdomains being ignored in whitelist mode ([noiob](https://github.com/tootsuite/mastodon/pull/12435)) | |||
- Fix broken audit log in whitelist mode in admin UI ([ThibG](https://github.com/tootsuite/mastodon/pull/12303)) | |||
- Fix unread indicator not honoring "Only media" option in local and federated timelines in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/12330)) | |||
- Fix error when rebuilding home feeds ([dariusk](https://github.com/tootsuite/mastodon/pull/12324)) | |||
- Fix relationship caches being broken as result of a follow request ([ThibG](https://github.com/tootsuite/mastodon/pull/12299)) | |||
- Fix more items than the limit being uploadable in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/12300)) | |||
- Fix various issues with account migration ([ThibG](https://github.com/tootsuite/mastodon/pull/12301)) | |||
- Fix filtered out items being counted as pending items in slow mode in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/12266)) | |||
- Fix notification filters not applying to poll options ([ThibG](https://github.com/tootsuite/mastodon/pull/12269)) | |||
- Fix notification message for user's own poll saying it's a poll they voted on in web UI ([ykzts](https://github.com/tootsuite/mastodon/pull/12219)) | |||
- Fix polls with an expiration not showing up as expired in web UI ([noellabo](https://github.com/tootsuite/mastodon/pull/12222)) | |||
- Fix volume slider having an offset between cursor and slider in Chromium in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/12158)) | |||
- Fix Vagrant image not accepting connections ([shrft](https://github.com/tootsuite/mastodon/pull/12180)) | |||
- Fix batch actions being hidden on small screens in admin UI ([ThibG](https://github.com/tootsuite/mastodon/pull/12183)) | |||
- Fix incoming federation not working in whitelist mode ([ThibG](https://github.com/tootsuite/mastodon/pull/12185)) | |||
- Fix error when passing empty `source` param to `PUT /api/v1/accounts/update_credentials` ([jglauche](https://github.com/tootsuite/mastodon/pull/12259)) | |||
- Fix HTTP-based streaming API being cacheable by proxies ([BenLubar](https://github.com/tootsuite/mastodon/pull/12945)) | |||
- Fix users being able to register while `tootctl self-destruct` is in progress ([Kjwon15](https://github.com/tootsuite/mastodon/pull/12877)) | |||
- Fix microformats detection in link crawler not ignoring `h-card` links ([nightpool](https://github.com/tootsuite/mastodon/pull/12189)) | |||
- Fix outline on full-screen video in web UI ([hinaloe](https://github.com/tootsuite/mastodon/pull/12176)) | |||
- Fix TLD domain blocks not being editable ([ThibG](https://github.com/tootsuite/mastodon/pull/12805)) | |||
- Fix Nanobox deploy hooks ([danhunsaker](https://github.com/tootsuite/mastodon/pull/12663)) | |||
- Fix needlessly complicated SQL query when performing account search amongst followings ([ThibG](https://github.com/tootsuite/mastodon/pull/12302)) | |||
- Fix favourites count not updating when unfavouriting in web UI ([NimaBoscarino](https://github.com/tootsuite/mastodon/pull/12140)) | |||
- Fix occasional crash on scroll in Chromium in web UI ([hinaloe](https://github.com/tootsuite/mastodon/pull/12274)) | |||
- Fix intersection observer not working in single-column mode web UI ([panarom](https://github.com/tootsuite/mastodon/pull/12735)) | |||
- Fix voting issue with remote polls that contain trailing spaces ([ThibG](https://github.com/tootsuite/mastodon/pull/12515)) | |||
- Fix dynamic elements not working in pgHero due to CSP rules ([ykzts](https://github.com/tootsuite/mastodon/pull/12489)) | |||
- Fix overly verbose backtraces when delivering ActivityPub payloads ([zunda](https://github.com/tootsuite/mastodon/pull/12798)) | |||
- Fix rendering `<a>` without `href` when scheme unsupported ([Gargron](https://github.com/tootsuite/mastodon/pull/13040)) | |||
- Fix unfiltered params error when generating ActivityPub tag pagination ([Gargron](https://github.com/tootsuite/mastodon/pull/13049)) | |||
- Fix malformed HTML causing uncaught error ([Gargron](https://github.com/tootsuite/mastodon/pull/13042)) | |||
- Fix native share button not being displayed for unlisted toots ([ThibG](https://github.com/tootsuite/mastodon/pull/13045)) | |||
- Fix remote convertible media attachments (e.g. GIFs) not being saved ([Gargron](https://github.com/tootsuite/mastodon/pull/13032)) | |||
- Fix account query not using faster index ([abcang](https://github.com/tootsuite/mastodon/pull/13016)) | |||
- Fix error when sending moderation notification ([renatolond](https://github.com/tootsuite/mastodon/pull/13014)) | |||
### Security | |||
- Fix OEmbed leaking information about existence of non-public statuses ([Gargron](https://github.com/tootsuite/mastodon/pull/12930)) | |||
- Fix password change/reset not immediately invalidating other sessions ([Gargron](https://github.com/tootsuite/mastodon/pull/12928)) | |||
- Fix settings pages being cacheable by the browser ([Gargron](https://github.com/tootsuite/mastodon/pull/12714)) | |||
## [3.0.1] - 2019-10-10 | |||
### Added | |||
- Add `tootctl media usage` command ([Gargron](https://github.com/tootsuite/mastodon/pull/12115)) | |||
- Add admin setting to auto-approve trending hashtags ([Gargron](https://github.com/tootsuite/mastodon/pull/12122), [Gargron](https://github.com/tootsuite/mastodon/pull/12130)) | |||
### Changed | |||
- Change `tootctl media refresh` to skip already downloaded attachments ([Gargron](https://github.com/tootsuite/mastodon/pull/12118)) | |||
### Removed | |||
- Remove auto-silence behaviour from spam check ([Gargron](https://github.com/tootsuite/mastodon/pull/12117)) | |||
- Remove HTML `lang` attribute from individual statuses in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/12124)) | |||
- Remove fallback to long description on sidebar and meta description ([Gargron](https://github.com/tootsuite/mastodon/pull/12119)) | |||
### Fixed | |||
- Fix preloaded JSON-LD context for identity not being used ([Gargron](https://github.com/tootsuite/mastodon/pull/12138)) | |||
- Fix media editing modal changing dimensions once the image loads ([Gargron](https://github.com/tootsuite/mastodon/pull/12131)) | |||
- Fix not showing whether a custom emoji has a local counterpart in admin UI ([Gargron](https://github.com/tootsuite/mastodon/pull/12135)) | |||
- Fix attachment not being re-downloaded even if file is not stored ([Gargron](https://github.com/tootsuite/mastodon/pull/12125)) | |||
- Fix old migration trying to use new column due to default status scope ([Gargron](https://github.com/tootsuite/mastodon/pull/12095)) | |||
- Fix column back button missing for not found accounts ([trwnh](https://github.com/tootsuite/mastodon/pull/12094)) | |||
- Fix issues with tootctl's parallelization and progress reporting ([Gargron](https://github.com/tootsuite/mastodon/pull/12093), [Gargron](https://github.com/tootsuite/mastodon/pull/12097)) | |||
- Fix existing user records with now-renamed `pt` locale ([Gargron](https://github.com/tootsuite/mastodon/pull/12092)) | |||
- Fix hashtag timeline REST API accepting too many hashtags ([Gargron](https://github.com/tootsuite/mastodon/pull/12091)) | |||
- Fix `GET /api/v1/instance` REST APIs being unavailable in secure mode ([Gargron](https://github.com/tootsuite/mastodon/pull/12089)) | |||
- Fix performance of home feed regeneration and merging ([Gargron](https://github.com/tootsuite/mastodon/pull/12084)) | |||
- Fix ffmpeg performance issues due to stdout buffer overflow ([hugogameiro](https://github.com/tootsuite/mastodon/pull/12088)) | |||
- Fix S3 adapter retrying failing uploads with exponential backoff ([Gargron](https://github.com/tootsuite/mastodon/pull/12085)) | |||
- Fix `tootctl accounts cull` advertising unused option flag ([Kjwon15](https://github.com/tootsuite/mastodon/pull/12074)) | |||
## [3.0.0] - 2019-10-03 | |||
### Added | |||
- Add "not available" label to unloaded media attachments in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/11715), [Gargron](https://github.com/tootsuite/mastodon/pull/11745)) | |||
- **Add profile directory to web UI** ([Gargron](https://github.com/tootsuite/mastodon/pull/11688), [mayaeh](https://github.com/tootsuite/mastodon/pull/11872)) | |||
- Add profile directory opt-in federation | |||
- Add profile directory REST API | |||
- Add special alert for throttled requests in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/11677)) | |||
- Add confirmation modal when logging out from the web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/11671)) | |||
- **Add audio player in web UI** ([Gargron](https://github.com/tootsuite/mastodon/pull/11644), [Gargron](https://github.com/tootsuite/mastodon/pull/11652), [Gargron](https://github.com/tootsuite/mastodon/pull/11654), [ThibG](https://github.com/tootsuite/mastodon/pull/11629), [Gargron](https://github.com/tootsuite/mastodon/pull/12056)) | |||
- **Add autosuggestions for hashtags in web UI** ([Gargron](https://github.com/tootsuite/mastodon/pull/11422), [ThibG](https://github.com/tootsuite/mastodon/pull/11632), [Gargron](https://github.com/tootsuite/mastodon/pull/11764), [Gargron](https://github.com/tootsuite/mastodon/pull/11588), [Gargron](https://github.com/tootsuite/mastodon/pull/11442)) | |||
- **Add media editing modal with OCR tool in web UI** ([Gargron](https://github.com/tootsuite/mastodon/pull/11563), [Gargron](https://github.com/tootsuite/mastodon/pull/11566), [ThibG](https://github.com/tootsuite/mastodon/pull/11575), [ThibG](https://github.com/tootsuite/mastodon/pull/11576), [Gargron](https://github.com/tootsuite/mastodon/pull/11577), [Gargron](https://github.com/tootsuite/mastodon/pull/11573), [Gargron](https://github.com/tootsuite/mastodon/pull/11571)) | |||
- Add indicator of unread notifications to window title when web UI is out of focus ([Gargron](https://github.com/tootsuite/mastodon/pull/11560), [Gargron](https://github.com/tootsuite/mastodon/pull/11572)) | |||
- Add indicator for which options you voted for in a poll in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/11195)) | |||
- **Add search results pagination to web UI** ([Gargron](https://github.com/tootsuite/mastodon/pull/11409), [ThibG](https://github.com/tootsuite/mastodon/pull/11447)) | |||
- **Add option to disable real-time updates in web UI ("slow mode")** ([Gargron](https://github.com/tootsuite/mastodon/pull/9984), [ykzts](https://github.com/tootsuite/mastodon/pull/11880), [ThibG](https://github.com/tootsuite/mastodon/pull/11883), [Gargron](https://github.com/tootsuite/mastodon/pull/11898), [ThibG](https://github.com/tootsuite/mastodon/pull/11859)) | |||
- Add option to disable blurhash previews in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/11188)) | |||
- Add native smooth scrolling when supported in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/11207)) | |||
- Add scrolling to the search bar on focus in web UI ([Kjwon15](https://github.com/tootsuite/mastodon/pull/12032)) | |||
- Add refresh button to list of rebloggers/favouriters in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/12031)) | |||
- Add error description and button to copy stack trace to web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/12033)) | |||
- Add search and sort functions to hashtag admin UI ([mayaeh](https://github.com/tootsuite/mastodon/pull/11829), [Gargron](https://github.com/tootsuite/mastodon/pull/11897), [mayaeh](https://github.com/tootsuite/mastodon/pull/11875)) | |||
- Add setting for default search engine indexing in admin UI ([brortao](https://github.com/tootsuite/mastodon/pull/11804)) | |||
- Add account bio to account view in admin UI ([ThibG](https://github.com/tootsuite/mastodon/pull/11473)) | |||
- **Add option to include reported statuses in warning e-mail from admin UI** ([Gargron](https://github.com/tootsuite/mastodon/pull/11639), [Gargron](https://github.com/tootsuite/mastodon/pull/11812), [Gargron](https://github.com/tootsuite/mastodon/pull/11741), [Gargron](https://github.com/tootsuite/mastodon/pull/11698), [mayaeh](https://github.com/tootsuite/mastodon/pull/11765)) | |||
- Add number of pending accounts and pending hashtags to dashboard in admin UI ([Gargron](https://github.com/tootsuite/mastodon/pull/11514)) | |||
- **Add account migration UI** ([Gargron](https://github.com/tootsuite/mastodon/pull/11846), [noellabo](https://github.com/tootsuite/mastodon/pull/11905), [noellabo](https://github.com/tootsuite/mastodon/pull/11907), [noellabo](https://github.com/tootsuite/mastodon/pull/11906), [noellabo](https://github.com/tootsuite/mastodon/pull/11902)) | |||
- **Add table of contents to about page** ([Gargron](https://github.com/tootsuite/mastodon/pull/11885), [ykzts](https://github.com/tootsuite/mastodon/pull/11941), [ykzts](https://github.com/tootsuite/mastodon/pull/11895), [Kjwon15](https://github.com/tootsuite/mastodon/pull/11916)) | |||
- **Add password challenge to 2FA settings, e-mail notifications** ([Gargron](https://github.com/tootsuite/mastodon/pull/11878)) | |||
- **Add optional public list of domain blocks with comments** ([ThibG](https://github.com/tootsuite/mastodon/pull/11298), [ThibG](https://github.com/tootsuite/mastodon/pull/11515), [Gargron](https://github.com/tootsuite/mastodon/pull/11908)) | |||
- Add an RSS feed for featured hashtags ([noellabo](https://github.com/tootsuite/mastodon/pull/10502)) | |||
- Add explanations to featured hashtags UI and profile ([Gargron](https://github.com/tootsuite/mastodon/pull/11586)) | |||
- **Add hashtag trends with admin and user settings** ([Gargron](https://github.com/tootsuite/mastodon/pull/11490), [Gargron](https://github.com/tootsuite/mastodon/pull/11502), [Gargron](https://github.com/tootsuite/mastodon/pull/11641), [Gargron](https://github.com/tootsuite/mastodon/pull/11594), [Gargron](https://github.com/tootsuite/mastodon/pull/11517), [mayaeh](https://github.com/tootsuite/mastodon/pull/11845), [Gargron](https://github.com/tootsuite/mastodon/pull/11774), [Gargron](https://github.com/tootsuite/mastodon/pull/11712), [Gargron](https://github.com/tootsuite/mastodon/pull/11791), [Gargron](https://github.com/tootsuite/mastodon/pull/11743), [Gargron](https://github.com/tootsuite/mastodon/pull/11740), [Gargron](https://github.com/tootsuite/mastodon/pull/11714), [ThibG](https://github.com/tootsuite/mastodon/pull/11631), [Sasha-Sorokin](https://github.com/tootsuite/mastodon/pull/11569), [Gargron](https://github.com/tootsuite/mastodon/pull/11524), [Gargron](https://github.com/tootsuite/mastodon/pull/11513)) | |||
- Add hashtag usage breakdown to admin UI | |||
- Add batch actions for hashtags to admin UI | |||
- Add trends to web UI | |||
- Add trends to public pages | |||
- Add user preference to hide trends | |||
- Add admin setting to disable trends | |||
- **Add categories for custom emojis** ([Gargron](https://github.com/tootsuite/mastodon/pull/11196), [Gargron](https://github.com/tootsuite/mastodon/pull/11793), [Gargron](https://github.com/tootsuite/mastodon/pull/11920), [highemerly](https://github.com/tootsuite/mastodon/pull/11876)) | |||
- Add custom emoji categories to emoji picker in web UI | |||
- Add `category` to custom emojis in REST API | |||
- Add batch actions for custom emojis in admin UI | |||
- Add max image dimensions to error message ([raboof](https://github.com/tootsuite/mastodon/pull/11552)) | |||
- Add aac, m4a, 3gp, amr, wma to allowed audio formats ([Gargron](https://github.com/tootsuite/mastodon/pull/11342), [umonaca](https://github.com/tootsuite/mastodon/pull/11687)) | |||
- **Add search syntax for operators and phrases** ([Gargron](https://github.com/tootsuite/mastodon/pull/11411)) | |||
- **Add REST API for managing featured hashtags** ([noellabo](https://github.com/tootsuite/mastodon/pull/11778)) | |||
- **Add REST API for managing timeline read markers** ([Gargron](https://github.com/tootsuite/mastodon/pull/11762)) | |||
- Add `exclude_unreviewed` param to `GET /api/v2/search` REST API ([Gargron](https://github.com/tootsuite/mastodon/pull/11977)) | |||
- Add `reason` param to `POST /api/v1/accounts` REST API ([Gargron](https://github.com/tootsuite/mastodon/pull/12064)) | |||
- **Add ActivityPub secure mode** ([Gargron](https://github.com/tootsuite/mastodon/pull/11269), [ThibG](https://github.com/tootsuite/mastodon/pull/11332), [ThibG](https://github.com/tootsuite/mastodon/pull/11295)) | |||
- Add HTTP signatures to all outgoing ActivityPub GET requests ([Gargron](https://github.com/tootsuite/mastodon/pull/11284), [ThibG](https://github.com/tootsuite/mastodon/pull/11300)) | |||
- Add support for ActivityPub Audio activities ([ThibG](https://github.com/tootsuite/mastodon/pull/11189)) | |||
- Add ActivityPub actor representing the entire server ([ThibG](https://github.com/tootsuite/mastodon/pull/11321), [rtucker](https://github.com/tootsuite/mastodon/pull/11400), [ThibG](https://github.com/tootsuite/mastodon/pull/11561), [Gargron](https://github.com/tootsuite/mastodon/pull/11798)) | |||
- **Add whitelist mode** ([Gargron](https://github.com/tootsuite/mastodon/pull/11291), [mayaeh](https://github.com/tootsuite/mastodon/pull/11634)) | |||
- Add config of multipart threshold for S3 ([ykzts](https://github.com/tootsuite/mastodon/pull/11924), [ykzts](https://github.com/tootsuite/mastodon/pull/11944)) | |||
- Add health check endpoint for web ([ykzts](https://github.com/tootsuite/mastodon/pull/11770), [ykzts](https://github.com/tootsuite/mastodon/pull/11947)) | |||
- Add HTTP signature keyId to request log ([Gargron](https://github.com/tootsuite/mastodon/pull/11591)) | |||
- Add `SMTP_REPLY_TO` environment variable ([hugogameiro](https://github.com/tootsuite/mastodon/pull/11718)) | |||
- Add `tootctl preview_cards remove` command ([mayaeh](https://github.com/tootsuite/mastodon/pull/11320)) | |||
- Add `tootctl media refresh` command ([Gargron](https://github.com/tootsuite/mastodon/pull/11775)) | |||
- Add `tootctl cache recount` command ([Gargron](https://github.com/tootsuite/mastodon/pull/11597)) | |||
- Add option to exclude suspended domains from `tootctl domains crawl` ([dariusk](https://github.com/tootsuite/mastodon/pull/11454)) | |||
- Add parallelization to `tootctl search deploy` ([noellabo](https://github.com/tootsuite/mastodon/pull/12051)) | |||
- Add soft delete for statuses for instant deletes through API ([Gargron](https://github.com/tootsuite/mastodon/pull/11623), [Gargron](https://github.com/tootsuite/mastodon/pull/11648)) | |||
- Add rails-level JSON caching ([Gargron](https://github.com/tootsuite/mastodon/pull/11333), [Gargron](https://github.com/tootsuite/mastodon/pull/11271)) | |||
- **Add request pool to improve delivery performance** ([Gargron](https://github.com/tootsuite/mastodon/pull/10353), [ykzts](https://github.com/tootsuite/mastodon/pull/11756)) | |||
- Add concurrent connection attempts to resolved IP addresses ([ThibG](https://github.com/tootsuite/mastodon/pull/11757)) | |||
- Add index for remember_token to improve login performance ([abcang](https://github.com/tootsuite/mastodon/pull/11881)) | |||
- **Add more accurate hashtag search** ([Gargron](https://github.com/tootsuite/mastodon/pull/11579), [Gargron](https://github.com/tootsuite/mastodon/pull/11427), [Gargron](https://github.com/tootsuite/mastodon/pull/11448)) | |||
- **Add more accurate account search** ([Gargron](https://github.com/tootsuite/mastodon/pull/11537), [Gargron](https://github.com/tootsuite/mastodon/pull/11580)) | |||
- **Add a spam check** ([Gargron](https://github.com/tootsuite/mastodon/pull/11217), [Gargron](https://github.com/tootsuite/mastodon/pull/11806), [ThibG](https://github.com/tootsuite/mastodon/pull/11296)) | |||
- Add new languages ([Gargron](https://github.com/tootsuite/mastodon/pull/12062)) | |||
- Breton | |||
- Spanish (Argentina) | |||
- Estonian | |||
- Macedonian | |||
- New Norwegian | |||
- Add NodeInfo endpoint ([Gargron](https://github.com/tootsuite/mastodon/pull/12002), [Gargron](https://github.com/tootsuite/mastodon/pull/12058)) | |||
### Changed | |||
- **Change conversations UI** ([Gargron](https://github.com/tootsuite/mastodon/pull/11896)) | |||
- Change dashboard to short number notation ([noellabo](https://github.com/tootsuite/mastodon/pull/11847), [noellabo](https://github.com/tootsuite/mastodon/pull/11911)) | |||
- Change REST API `GET /api/v1/timelines/public` to require authentication when public preview is off ([ThibG](https://github.com/tootsuite/mastodon/pull/11802)) | |||
- Change REST API `POST /api/v1/follow_requests/:id/(approve|reject)` to return relationship ([ThibG](https://github.com/tootsuite/mastodon/pull/11800)) | |||
- Change rate limit for media proxy ([ykzts](https://github.com/tootsuite/mastodon/pull/11814)) | |||
- Change unlisted custom emoji to not appear in autosuggestions ([Gargron](https://github.com/tootsuite/mastodon/pull/11818)) | |||
- Change max length of media descriptions from 420 to 1500 characters ([Gargron](https://github.com/tootsuite/mastodon/pull/11819), [ThibG](https://github.com/tootsuite/mastodon/pull/11836)) | |||
- **Change deletes to preserve soft-deleted statuses in unresolved reports** ([Gargron](https://github.com/tootsuite/mastodon/pull/11805)) | |||
- **Change tootctl to use inline parallelization instead of Sidekiq** ([Gargron](https://github.com/tootsuite/mastodon/pull/11776)) | |||
- **Change account deletion page to have better explanations** ([Gargron](https://github.com/tootsuite/mastodon/pull/11753), [Gargron](https://github.com/tootsuite/mastodon/pull/11763)) | |||
- Change hashtag component in web UI to show numbers for 2 last days ([Gargron](https://github.com/tootsuite/mastodon/pull/11742), [Gargron](https://github.com/tootsuite/mastodon/pull/11755), [Gargron](https://github.com/tootsuite/mastodon/pull/11754)) | |||
- Change OpenGraph description on sign-up page to reflect invite ([Gargron](https://github.com/tootsuite/mastodon/pull/11744)) | |||
- Change layout of public profile directory to be the same as in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/11705)) | |||
- Change detailed status child ordering to sort self-replies on top ([ThibG](https://github.com/tootsuite/mastodon/pull/11686)) | |||
- Change window resize handler to switch to/from mobile layout as soon as needed ([ThibG](https://github.com/tootsuite/mastodon/pull/11656)) | |||
- Change icon button styles to make hover/focus states more obvious ([ThibG](https://github.com/tootsuite/mastodon/pull/11474)) | |||
- Change contrast of status links that are not mentions or hashtags ([ThibG](https://github.com/tootsuite/mastodon/pull/11406)) | |||
- **Change hashtags to preserve first-used casing** ([Gargron](https://github.com/tootsuite/mastodon/pull/11416), [Gargron](https://github.com/tootsuite/mastodon/pull/11508), [Gargron](https://github.com/tootsuite/mastodon/pull/11504), [Gargron](https://github.com/tootsuite/mastodon/pull/11507), [Gargron](https://github.com/tootsuite/mastodon/pull/11441)) | |||
- **Change unconfirmed user login behaviour** ([Gargron](https://github.com/tootsuite/mastodon/pull/11375), [ThibG](https://github.com/tootsuite/mastodon/pull/11394), [Gargron](https://github.com/tootsuite/mastodon/pull/11860)) | |||
- **Change single-column mode to scroll the whole page** ([Gargron](https://github.com/tootsuite/mastodon/pull/11359), [Gargron](https://github.com/tootsuite/mastodon/pull/11894), [Gargron](https://github.com/tootsuite/mastodon/pull/11891), [ThibG](https://github.com/tootsuite/mastodon/pull/11655), [Gargron](https://github.com/tootsuite/mastodon/pull/11463), [Gargron](https://github.com/tootsuite/mastodon/pull/11458), [ThibG](https://github.com/tootsuite/mastodon/pull/11395), [Gargron](https://github.com/tootsuite/mastodon/pull/11418)) | |||
- Change `tootctl accounts follow` to only work with local accounts ([angristan](https://github.com/tootsuite/mastodon/pull/11592)) | |||
- Change Dockerfile ([Shleeble](https://github.com/tootsuite/mastodon/pull/11710), [ykzts](https://github.com/tootsuite/mastodon/pull/11768), [Shleeble](https://github.com/tootsuite/mastodon/pull/11707)) | |||
- Change supported Node versions to include v12 ([abcang](https://github.com/tootsuite/mastodon/pull/11706)) | |||
- Change Portuguese language from `pt` to `pt-PT` ([Gargron](https://github.com/tootsuite/mastodon/pull/11820)) | |||
- Change domain block silence to always require approval on follow ([ThibG](https://github.com/tootsuite/mastodon/pull/11975)) | |||
- Change link preview fetcher to not perform a HEAD request first ([Gargron](https://github.com/tootsuite/mastodon/pull/12028)) | |||
- Change `tootctl domains purge` to accept multiple domains at once ([Gargron](https://github.com/tootsuite/mastodon/pull/12046)) | |||
### Removed | |||
- **Remove OStatus support** ([Gargron](https://github.com/tootsuite/mastodon/pull/11205), [Gargron](https://github.com/tootsuite/mastodon/pull/11303), [Gargron](https://github.com/tootsuite/mastodon/pull/11460), [ThibG](https://github.com/tootsuite/mastodon/pull/11280), [ThibG](https://github.com/tootsuite/mastodon/pull/11278)) | |||
- Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` ([Gargron](https://github.com/tootsuite/mastodon/pull/11247)) | |||
- Remove WebP support ([angristan](https://github.com/tootsuite/mastodon/pull/11589)) | |||
- Remove deprecated config options from Heroku and Scalingo ([ykzts](https://github.com/tootsuite/mastodon/pull/11925)) | |||
- Remove deprecated REST API `GET /api/v1/search` API ([Gargron](https://github.com/tootsuite/mastodon/pull/11823)) | |||
- Remove deprecated REST API `GET /api/v1/statuses/:id/card` ([Gargron](https://github.com/tootsuite/mastodon/pull/11213)) | |||
- Remove deprecated REST API `POST /api/v1/notifications/dismiss?id=:id` ([Gargron](https://github.com/tootsuite/mastodon/pull/11214)) | |||
- Remove deprecated REST API `GET /api/v1/timelines/direct` ([Gargron](https://github.com/tootsuite/mastodon/pull/11212)) | |||
### Fixed | |||
- Fix manifest warning ([ykzts](https://github.com/tootsuite/mastodon/pull/11767)) | |||
- Fix admin UI for custom emoji not respecting GIF autoplay preference ([ThibG](https://github.com/tootsuite/mastodon/pull/11801)) | |||
- Fix page body not being scrollable in admin/settings layout ([Gargron](https://github.com/tootsuite/mastodon/pull/11893)) | |||
- Fix placeholder colors for inputs not being explicitly defined ([Gargron](https://github.com/tootsuite/mastodon/pull/11890)) | |||
- Fix incorrect enclosure length in RSS ([tsia](https://github.com/tootsuite/mastodon/pull/11889)) | |||
- Fix TOTP codes not being filtered from logs during enabling/disabling ([Gargron](https://github.com/tootsuite/mastodon/pull/11877)) | |||
- Fix webfinger response not returning 410 when account is suspended ([Gargron](https://github.com/tootsuite/mastodon/pull/11869)) | |||
- Fix ActivityPub Move handler queuing jobs that will fail if account is suspended ([Gargron](https://github.com/tootsuite/mastodon/pull/11864)) | |||
- Fix SSO login not using existing account when e-mail is verified ([Gargron](https://github.com/tootsuite/mastodon/pull/11862)) | |||
- Fix web UI allowing uploads past status limit via drag & drop ([Gargron](https://github.com/tootsuite/mastodon/pull/11863)) | |||
- Fix expiring polls not being displayed as such in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/11835)) | |||
- Fix 2FA challenge and password challenge for non-database users ([Gargron](https://github.com/tootsuite/mastodon/pull/11831), [Gargron](https://github.com/tootsuite/mastodon/pull/11943)) | |||
- Fix profile fields overflowing page width in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/11828)) | |||
- Fix web push subscriptions being deleted on rate limit or timeout ([Gargron](https://github.com/tootsuite/mastodon/pull/11826)) | |||
- Fix display of long poll options in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/11717), [ThibG](https://github.com/tootsuite/mastodon/pull/11833)) | |||
- Fix search API not resolving URL when `type` is given ([Gargron](https://github.com/tootsuite/mastodon/pull/11822)) | |||
- Fix hashtags being split by ZWNJ character ([Gargron](https://github.com/tootsuite/mastodon/pull/11821)) | |||
- Fix scroll position resetting when opening media modals in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/11815)) | |||
- Fix duplicate HTML IDs on about page ([ThibG](https://github.com/tootsuite/mastodon/pull/11803)) | |||
- Fix admin UI showing superfluous reject media/reports on suspended domain blocks ([ThibG](https://github.com/tootsuite/mastodon/pull/11749)) | |||
- Fix ActivityPub context not being dynamically computed ([ThibG](https://github.com/tootsuite/mastodon/pull/11746)) | |||
- Fix Mastodon logo style on hover on public pages' footer ([ThibG](https://github.com/tootsuite/mastodon/pull/11735)) | |||
- Fix height of dashboard counters ([ThibG](https://github.com/tootsuite/mastodon/pull/11736)) | |||
- Fix custom emoji animation on hover in web UI directory bios ([ThibG](https://github.com/tootsuite/mastodon/pull/11716)) | |||
- Fix non-numbers being passed to Redis and causing an error ([Gargron](https://github.com/tootsuite/mastodon/pull/11697)) | |||
- Fix error in REST API for an account's statuses ([Gargron](https://github.com/tootsuite/mastodon/pull/11700)) | |||
- Fix uncaught error when resource param is missing in Webfinger request ([Gargron](https://github.com/tootsuite/mastodon/pull/11701)) | |||
- Fix uncaught domain normalization error in remote follow ([Gargron](https://github.com/tootsuite/mastodon/pull/11703)) | |||
- Fix uncaught 422 and 500 errors ([Gargron](https://github.com/tootsuite/mastodon/pull/11590), [Gargron](https://github.com/tootsuite/mastodon/pull/11811)) | |||
- Fix uncaught parameter missing exceptions and missing error templates ([Gargron](https://github.com/tootsuite/mastodon/pull/11702)) | |||
- Fix encoding error when checking e-mail MX records ([Gargron](https://github.com/tootsuite/mastodon/pull/11696)) | |||
- Fix items in StatusContent render list not all having a key ([ThibG](https://github.com/tootsuite/mastodon/pull/11645)) | |||
- Fix remote and staff-removed statuses leaving media behind for a day ([Gargron](https://github.com/tootsuite/mastodon/pull/11638)) | |||
- Fix CSP needlessly allowing blob URLs in script-src ([ThibG](https://github.com/tootsuite/mastodon/pull/11620)) | |||
- Fix ignoring whole status because of one invalid hashtag ([Gargron](https://github.com/tootsuite/mastodon/pull/11621)) | |||
- Fix hidden statuses losing focus ([ThibG](https://github.com/tootsuite/mastodon/pull/11208)) | |||
- Fix loading bar being obscured by other elements in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/11598)) | |||
- Fix multiple issues with replies collection for pages further than self-replies ([ThibG](https://github.com/tootsuite/mastodon/pull/11582)) | |||
- Fix blurhash and autoplay not working on public pages ([Gargron](https://github.com/tootsuite/mastodon/pull/11585)) | |||
- Fix 422 being returned instead of 404 when POSTing to unmatched routes ([Gargron](https://github.com/tootsuite/mastodon/pull/11574), [Gargron](https://github.com/tootsuite/mastodon/pull/11704)) | |||
- Fix client-side resizing of image uploads ([ThibG](https://github.com/tootsuite/mastodon/pull/11570)) | |||
- Fix short number formatting for numbers above million in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/11559)) | |||
- Fix ActivityPub and REST API queries setting cookies and preventing caching ([ThibG](https://github.com/tootsuite/mastodon/pull/11539), [ThibG](https://github.com/tootsuite/mastodon/pull/11557), [ThibG](https://github.com/tootsuite/mastodon/pull/11336), [ThibG](https://github.com/tootsuite/mastodon/pull/11331)) | |||
- Fix some emojis in profile metadata labels are not emojified. ([kedamaDQ](https://github.com/tootsuite/mastodon/pull/11534)) | |||
- Fix account search always returning exact match on paginated results ([Gargron](https://github.com/tootsuite/mastodon/pull/11525)) | |||
- Fix acct URIs with IDN domains not being resolved ([Gargron](https://github.com/tootsuite/mastodon/pull/11520)) | |||
- Fix admin dashboard missing latest features ([Gargron](https://github.com/tootsuite/mastodon/pull/11505)) | |||
- Fix jumping of toot date when clicking spoiler button ([ariasuni](https://github.com/tootsuite/mastodon/pull/11449)) | |||
- Fix boost to original audience not working on mobile in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/11371)) | |||
- Fix handling of webfinger redirects in ResolveAccountService ([ThibG](https://github.com/tootsuite/mastodon/pull/11279)) | |||
- Fix URLs appearing twice in errors of ActivityPub::DeliveryWorker ([Gargron](https://github.com/tootsuite/mastodon/pull/11231)) | |||
- Fix support for HTTP proxies ([ThibG](https://github.com/tootsuite/mastodon/pull/11245)) | |||
- Fix HTTP requests to IPv6 hosts ([ThibG](https://github.com/tootsuite/mastodon/pull/11240)) | |||
- Fix error in ElasticSearch index import ([mayaeh](https://github.com/tootsuite/mastodon/pull/11192)) | |||
- Fix duplicate account error when seeding development database ([ysksn](https://github.com/tootsuite/mastodon/pull/11366)) | |||
- Fix performance of session clean-up scheduler ([abcang](https://github.com/tootsuite/mastodon/pull/11871)) | |||
- Fix older migrations not running ([zunda](https://github.com/tootsuite/mastodon/pull/11377)) | |||
- Fix URLs counting towards RTL detection ([ahangarha](https://github.com/tootsuite/mastodon/pull/11759)) | |||
- Fix unnecessary status re-rendering in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/11211)) | |||
- Fix http_parser.rb gem not being compiled when no network available ([petabyteboy](https://github.com/tootsuite/mastodon/pull/11444)) | |||
- Fix muted text color not applying to all text ([trwnh](https://github.com/tootsuite/mastodon/pull/11996)) | |||
- Fix follower/following lists resetting on back-navigation in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/11986)) | |||
- Fix n+1 query when approving multiple follow requests ([abcang](https://github.com/tootsuite/mastodon/pull/12004)) | |||
- Fix records not being indexed into ElasticSearch sometimes ([Gargron](https://github.com/tootsuite/mastodon/pull/12024)) | |||
- Fix needlessly indexing unsearchable statuses into ElasticSearch ([Gargron](https://github.com/tootsuite/mastodon/pull/12041)) | |||
- Fix new user bootstrapping crashing when to-be-followed accounts are invalid ([ThibG](https://github.com/tootsuite/mastodon/pull/12037)) | |||
- Fix featured hashtag URL being interpreted as media or replies tab ([Gargron](https://github.com/tootsuite/mastodon/pull/12048)) | |||
- Fix account counters being overwritten by parallel writes ([Gargron](https://github.com/tootsuite/mastodon/pull/12045)) | |||
### Security | |||
- Fix performance of GIF re-encoding and always strip EXIF data from videos ([Gargron](https://github.com/tootsuite/mastodon/pull/12057)) | |||
## [2.9.3] - 2019-08-10 | |||
### Added | |||
- Add GIF and WebP support for custom emojis ([Gargron](https://github.com/tootsuite/mastodon/pull/11519)) | |||
- Add logout link to dropdown menu in web UI ([koyuawsmbrtn](https://github.com/tootsuite/mastodon/pull/11353)) | |||
- Add indication that text search is unavailable in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/11112), [ThibG](https://github.com/tootsuite/mastodon/pull/11202)) | |||
- Add `suffix` to `Mastodon::Version` to help forks ([clarfon](https://github.com/tootsuite/mastodon/pull/11407)) | |||
- Add on-hover animation to animated custom emoji in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/11348), [ThibG](https://github.com/tootsuite/mastodon/pull/11404), [ThibG](https://github.com/tootsuite/mastodon/pull/11522)) | |||
- Add custom emoji support in profile metadata labels ([ThibG](https://github.com/tootsuite/mastodon/pull/11350)) | |||
### Changed | |||
- Change default interface of web and streaming from 0.0.0.0 to 127.0.0.1 ([Gargron](https://github.com/tootsuite/mastodon/pull/11302), [zunda](https://github.com/tootsuite/mastodon/pull/11378), [Gargron](https://github.com/tootsuite/mastodon/pull/11351), [zunda](https://github.com/tootsuite/mastodon/pull/11326)) | |||
- Change the retry limit of web push notifications ([highemerly](https://github.com/tootsuite/mastodon/pull/11292)) | |||
- Change ActivityPub deliveries to not retry HTTP 501 errors ([Gargron](https://github.com/tootsuite/mastodon/pull/11233)) | |||
- Change language detection to include hashtags as words ([Gargron](https://github.com/tootsuite/mastodon/pull/11341)) | |||
- Change terms and privacy policy pages to always be accessible ([Gargron](https://github.com/tootsuite/mastodon/pull/11334)) | |||
- Change robots tag to include `noarchive` when user opts out of indexing ([Kjwon15](https://github.com/tootsuite/mastodon/pull/11421)) | |||
### Fixed | |||
- Fix account domain block not clearing out notifications ([Gargron](https://github.com/tootsuite/mastodon/pull/11393)) | |||
- Fix incorrect locale sometimes being detected for browser ([Gargron](https://github.com/tootsuite/mastodon/pull/8657)) | |||
- Fix crash when saving invalid domain name ([Gargron](https://github.com/tootsuite/mastodon/pull/11528)) | |||
- Fix pinned statuses REST API returning pagination headers ([Gargron](https://github.com/tootsuite/mastodon/pull/11526)) | |||
- Fix "cancel follow request" button having unreadable text in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/11521)) | |||
- Fix image uploads being blank when canvas read access is blocked ([ThibG](https://github.com/tootsuite/mastodon/pull/11499)) | |||
- Fix avatars not being animated on hover when not logged in ([ThibG](https://github.com/tootsuite/mastodon/pull/11349)) | |||
- Fix overzealous sanitization of HTML lists ([ThibG](https://github.com/tootsuite/mastodon/pull/11354)) | |||
- Fix block crashing when a follow request exists ([ThibG](https://github.com/tootsuite/mastodon/pull/11288)) | |||
- Fix backup service crashing when an attachment is missing ([ThibG](https://github.com/tootsuite/mastodon/pull/11241)) | |||
- Fix account moderation action always sending e-mail notification ([Gargron](https://github.com/tootsuite/mastodon/pull/11242)) | |||
- Fix swiping columns on mobile sometimes failing in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/11200)) | |||
- Fix wrong actor URI being serialized into poll updates ([ThibG](https://github.com/tootsuite/mastodon/pull/11194)) | |||
- Fix statsd UDP sockets not being cleaned up in Sidekiq ([Gargron](https://github.com/tootsuite/mastodon/pull/11230)) | |||
- Fix expiration date of filters being set to "never" when editing them ([ThibG](https://github.com/tootsuite/mastodon/pull/11204)) | |||
- Fix support for MP4 files that are actually M4V files ([Gargron](https://github.com/tootsuite/mastodon/pull/11210)) | |||
- Fix `alerts` not being typecast correctly in push subscription in REST API ([Gargron](https://github.com/tootsuite/mastodon/pull/11343)) | |||
- Fix some notices staying on unrelated pages ([ThibG](https://github.com/tootsuite/mastodon/pull/11364)) | |||
- Fix unboosting sometimes preventing a boost from reappearing on feed ([ThibG](https://github.com/tootsuite/mastodon/pull/11405), [Gargron](https://github.com/tootsuite/mastodon/pull/11450)) | |||
- Fix only one middle dot being recognized in hashtags ([Gargron](https://github.com/tootsuite/mastodon/pull/11345), [ThibG](https://github.com/tootsuite/mastodon/pull/11363)) | |||
- Fix unnecessary SQL query performed on unauthenticated requests ([Gargron](https://github.com/tootsuite/mastodon/pull/11179)) | |||
- Fix incorrect timestamp displayed on featured tags ([Kjwon15](https://github.com/tootsuite/mastodon/pull/11477)) | |||
- Fix privacy dropdown active state when dropdown is placed on top of it ([ThibG](https://github.com/tootsuite/mastodon/pull/11495)) | |||
- Fix filters not being applied to poll options ([ThibG](https://github.com/tootsuite/mastodon/pull/11174)) | |||
- Fix keyboard navigation on various dropdowns ([ThibG](https://github.com/tootsuite/mastodon/pull/11511), [ThibG](https://github.com/tootsuite/mastodon/pull/11492), [ThibG](https://github.com/tootsuite/mastodon/pull/11491)) | |||
- Fix keyboard navigation in modals ([ThibG](https://github.com/tootsuite/mastodon/pull/11493)) | |||
- Fix image conversation being non-deterministic due to timestamps ([Gargron](https://github.com/tootsuite/mastodon/pull/11408)) | |||
- Fix web UI performance ([ThibG](https://github.com/tootsuite/mastodon/pull/11211), [ThibG](https://github.com/tootsuite/mastodon/pull/11234)) | |||
- Fix scrolling to compose form when not necessary in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/11246), [ThibG](https://github.com/tootsuite/mastodon/pull/11182)) | |||
- Fix save button being enabled when list title is empty in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/11475)) | |||
- Fix poll expiration not being pre-filled on delete & redraft in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/11203)) | |||
- Fix content warning sometimes being set when not requested in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/11206)) | |||
### Security | |||
- Fix invites not being disabled upon account suspension ([ThibG](https://github.com/tootsuite/mastodon/pull/11412)) | |||
- Fix blocked domains still being able to fill database with account records ([Gargron](https://github.com/tootsuite/mastodon/pull/11219)) | |||
## [2.9.2] - 2019-06-22 | |||
### Added | |||
- Add `short_description` and `approval_required` to `GET /api/v1/instance` ([Gargron](https://github.com/tootsuite/mastodon/pull/11146)) | |||
### Changed | |||
- Change camera icon to paperclip icon in upload form ([koyuawsmbrtn](https://github.com/tootsuite/mastodon/pull/11149)) | |||
### Fixed | |||
- Fix audio-only OGG and WebM files not being processed as such ([Gargron](https://github.com/tootsuite/mastodon/pull/11151)) | |||
- Fix audio not being downloaded from remote servers ([Gargron](https://github.com/tootsuite/mastodon/pull/11145)) | |||
## [2.9.1] - 2019-06-22 | |||
### Added | |||
- Add moderation API ([Gargron](https://github.com/tootsuite/mastodon/pull/9387)) | |||
- Add audio uploads ([Gargron](https://github.com/tootsuite/mastodon/pull/11123), [Gargron](https://github.com/tootsuite/mastodon/pull/11141)) | |||
### Changed | |||
- Change domain blocks to automatically support subdomains ([Gargron](https://github.com/tootsuite/mastodon/pull/11138)) | |||
- Change Nanobox configuration to bring it up to date ([danhunsaker](https://github.com/tootsuite/mastodon/pull/11083)) | |||
### Removed | |||
- Remove expensive counters from federation page in admin UI ([Gargron](https://github.com/tootsuite/mastodon/pull/11139)) | |||
### Fixed | |||
- Fix converted media being saved with original extension and mime type ([Gargron](https://github.com/tootsuite/mastodon/pull/11130)) | |||
- Fix layout of identity proofs settings ([acid-chicken](https://github.com/tootsuite/mastodon/pull/11126)) | |||
- Fix active scope only returning suspended users ([ThibG](https://github.com/tootsuite/mastodon/pull/11111)) | |||
- Fix sanitizer making block level elements unreadable ([Gargron](https://github.com/tootsuite/mastodon/pull/10836)) | |||
- Fix label for site theme not being translated in admin UI ([palindromordnilap](https://github.com/tootsuite/mastodon/pull/11121)) | |||
- Fix statuses not being filtered irreversibly in web UI under some circumstances ([ThibG](https://github.com/tootsuite/mastodon/pull/11113)) | |||
- Fix scrolling behaviour in compose form ([ThibG](https://github.com/tootsuite/mastodon/pull/11093)) | |||
## [2.9.0] - 2019-06-13 | |||
### Added | |||
- **Add single-column mode in web UI** ([Gargron](https://github.com/tootsuite/mastodon/pull/10807), [Gargron](https://github.com/tootsuite/mastodon/pull/10848), [Gargron](https://github.com/tootsuite/mastodon/pull/11003), [Gargron](https://github.com/tootsuite/mastodon/pull/10961), [Hanage999](https://github.com/tootsuite/mastodon/pull/10915), [noellabo](https://github.com/tootsuite/mastodon/pull/10917), [abcang](https://github.com/tootsuite/mastodon/pull/10859), [Gargron](https://github.com/tootsuite/mastodon/pull/10820), [Gargron](https://github.com/tootsuite/mastodon/pull/10835), [Gargron](https://github.com/tootsuite/mastodon/pull/10809), [Gargron](https://github.com/tootsuite/mastodon/pull/10963), [noellabo](https://github.com/tootsuite/mastodon/pull/10883), [Hanage999](https://github.com/tootsuite/mastodon/pull/10839)) | |||
- Add waiting time to the list of pending accounts in admin UI ([Gargron](https://github.com/tootsuite/mastodon/pull/10985)) | |||
- Add a keyboard shortcut to hide/show media in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/10647), [Gargron](https://github.com/tootsuite/mastodon/pull/10838), [ThibG](https://github.com/tootsuite/mastodon/pull/10872)) | |||
- Add `account_id` param to `GET /api/v1/notifications` ([pwoolcoc](https://github.com/tootsuite/mastodon/pull/10796)) | |||
- Add confirmation modal for unboosting toots in web UI ([aurelien-reeves](https://github.com/tootsuite/mastodon/pull/10287)) | |||
- Add emoji suggestions to content warning and poll option fields in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/10555)) | |||
- Add `source` attribute to response of `DELETE /api/v1/statuses/:id` ([ThibG](https://github.com/tootsuite/mastodon/pull/10669)) | |||
- Add some caching for HTML versions of public status pages ([ThibG](https://github.com/tootsuite/mastodon/pull/10701)) | |||
- Add button to conveniently copy OAuth code ([ThibG](https://github.com/tootsuite/mastodon/pull/11065)) | |||
### Changed | |||
- **Change default layout to single column in web UI** ([Gargron](https://github.com/tootsuite/mastodon/pull/10847)) | |||
- **Change light theme** ([Gargron](https://github.com/tootsuite/mastodon/pull/10992), [Gargron](https://github.com/tootsuite/mastodon/pull/10996), [yuzulabo](https://github.com/tootsuite/mastodon/pull/10754), [Gargron](https://github.com/tootsuite/mastodon/pull/10845)) | |||
- **Change preferences page into appearance, notifications, and other** ([Gargron](https://github.com/tootsuite/mastodon/pull/10977), [Gargron](https://github.com/tootsuite/mastodon/pull/10988)) | |||
- Change priority of delete activity forwards for replies and reblogs ([Gargron](https://github.com/tootsuite/mastodon/pull/11002)) | |||
- Change Mastodon logo to use primary text color of the given theme ([Gargron](https://github.com/tootsuite/mastodon/pull/10994)) | |||
- Change reblogs counter to be updated when boosted privately ([Gargron](https://github.com/tootsuite/mastodon/pull/10964)) | |||
- Change bio limit from 160 to 500 characters ([trwnh](https://github.com/tootsuite/mastodon/pull/10790)) | |||
- Change API rate limiting to reduce allowed unauthenticated requests ([ThibG](https://github.com/tootsuite/mastodon/pull/10860), [hinaloe](https://github.com/tootsuite/mastodon/pull/10868), [mayaeh](https://github.com/tootsuite/mastodon/pull/10867)) | |||
- Change help text of `tootctl emoji import` command to specify a gzipped TAR archive is required ([dariusk](https://github.com/tootsuite/mastodon/pull/11000)) | |||
- Change web UI to hide poll options behind content warnings ([ThibG](https://github.com/tootsuite/mastodon/pull/10983)) | |||
- Change silencing to ensure local effects and remote effects are the same for silenced local users ([ThibG](https://github.com/tootsuite/mastodon/pull/10575)) | |||
- Change `tootctl domains purge` to remove custom emoji as well ([Kjwon15](https://github.com/tootsuite/mastodon/pull/10721)) | |||
- Change Docker image to keep `apt` working ([SuperSandro2000](https://github.com/tootsuite/mastodon/pull/10830)) | |||
### Removed | |||
- Remove `dist-upgrade` from Docker image ([SuperSandro2000](https://github.com/tootsuite/mastodon/pull/10822)) | |||
### Fixed | |||
- Fix RTL layout not being RTL within the columns area in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/10990)) | |||
- Fix display of alternative text when a media attachment is not available in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/10981)) | |||
- Fix not being able to directly switch between list timelines in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/10973)) | |||
- Fix media sensitivity not being maintained in delete & redraft in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/10980)) | |||
- Fix emoji picker being always displayed in web UI ([noellabo](https://github.com/tootsuite/mastodon/pull/10979), [yuzulabo](https://github.com/tootsuite/mastodon/pull/10801), [wcpaez](https://github.com/tootsuite/mastodon/pull/10978)) | |||
- Fix potential private status leak through caching ([ThibG](https://github.com/tootsuite/mastodon/pull/10969)) | |||
- Fix refreshing featured toots when the new collection is empty in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/10971)) | |||
- Fix undoing domain block also undoing individual moderation on users from before the domain block ([ThibG](https://github.com/tootsuite/mastodon/pull/10660)) | |||
- Fix time not being local in the audit log ([yuzulabo](https://github.com/tootsuite/mastodon/pull/10751)) | |||
- Fix statuses removed by moderation re-appearing on subsequent fetches ([Kjwon15](https://github.com/tootsuite/mastodon/pull/10732)) | |||
- Fix misattribution of inlined announces if `attributedTo` isn't present in ActivityPub ([ThibG](https://github.com/tootsuite/mastodon/pull/10967)) | |||
- Fix `GET /api/v1/polls/:id` not requiring authentication for non-public polls ([Gargron](https://github.com/tootsuite/mastodon/pull/10960)) | |||
- Fix handling of blank poll options in ActivityPub ([ThibG](https://github.com/tootsuite/mastodon/pull/10946)) | |||
- Fix avatar preview aspect ratio on edit profile page ([Kjwon15](https://github.com/tootsuite/mastodon/pull/10931)) | |||
- Fix web push notifications not being sent for polls ([ThibG](https://github.com/tootsuite/mastodon/pull/10864)) | |||
- Fix cut off letters in last paragraph of statuses in web UI ([ariasuni](https://github.com/tootsuite/mastodon/pull/10821)) | |||
- Fix list not being automatically unpinned when it returns 404 in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/11045)) | |||
- Fix login sometimes redirecting to paths that are not pages ([Gargron](https://github.com/tootsuite/mastodon/pull/11019)) | |||
## [2.8.4] - 2019-05-24 | |||
### Fixed | |||
- Fix delivery not retrying on some inbox errors that should be retriable ([ThibG](https://github.com/tootsuite/mastodon/pull/10812)) | |||
- Fix unnecessary 5 minute cooldowns on signature verifications in some cases ([ThibG](https://github.com/tootsuite/mastodon/pull/10813)) | |||
- Fix possible race condition when processing statuses ([ThibG](https://github.com/tootsuite/mastodon/pull/10815)) | |||
### Security | |||
- Require specific OAuth scopes for specific endpoints of the streaming API, instead of merely requiring a token for all endpoints, and allow using WebSockets protocol negotiation to specify the access token instead of using a query string ([ThibG](https://github.com/tootsuite/mastodon/pull/10818)) | |||
## [2.8.3] - 2019-05-19 | |||
### Added | |||
- Add `og:image:alt` OpenGraph tag ([BenLubar](https://github.com/tootsuite/mastodon/pull/10779)) | |||
- Add clickable area below avatar in statuses in web UI ([Dar13](https://github.com/tootsuite/mastodon/pull/10766)) | |||
- Add crossed-out eye icon on account gallery in web UI ([Kjwon15](https://github.com/tootsuite/mastodon/pull/10715)) | |||
- Add media description tooltip to thumbnails in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/10713)) | |||
### Changed | |||
- Change "mark as sensitive" button into a checkbox for clarity ([ThibG](https://github.com/tootsuite/mastodon/pull/10748)) | |||
### Fixed | |||
- Fix bug allowing users to publicly boost their private statuses ([ThibG](https://github.com/tootsuite/mastodon/pull/10775), [ThibG](https://github.com/tootsuite/mastodon/pull/10783)) | |||
- Fix performance in formatter by a little ([ThibG](https://github.com/tootsuite/mastodon/pull/10765)) | |||
- Fix some colors in the light theme ([yuzulabo](https://github.com/tootsuite/mastodon/pull/10754)) | |||
- Fix some colors of the high contrast theme ([yuzulabo](https://github.com/tootsuite/mastodon/pull/10711)) | |||
- Fix ambivalent active state of poll refresh button in web UI ([MaciekBaron](https://github.com/tootsuite/mastodon/pull/10720)) | |||
- Fix duplicate posting being possible from web UI ([hinaloe](https://github.com/tootsuite/mastodon/pull/10785)) | |||
- Fix "invited by" not showing up in admin UI ([ThibG](https://github.com/tootsuite/mastodon/pull/10791)) | |||
## [2.8.2] - 2019-05-05 | |||
### Added | |||
- Add `SOURCE_TAG` environment variable ([ushitora-anqou](https://github.com/tootsuite/mastodon/pull/10698)) | |||
### Fixed | |||
- Fix cropped hero image on frontpage ([BaptisteGelez](https://github.com/tootsuite/mastodon/pull/10702)) | |||
- Fix blurhash gem not compiling on some operating systems ([Gargron](https://github.com/tootsuite/mastodon/pull/10700)) | |||
- Fix unexpected CSS animations in some browsers ([ThibG](https://github.com/tootsuite/mastodon/pull/10699)) | |||
- Fix closing video modal scrolling timelines to top ([ThibG](https://github.com/tootsuite/mastodon/pull/10695)) | |||
## [2.8.1] - 2019-05-04 | |||
### Added | |||
- Add link to existing domain block when trying to block an already-blocked domain ([ThibG](https://github.com/tootsuite/mastodon/pull/10663)) | |||
- Add button to view context to media modal when opened from account gallery in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/10676)) | |||
- Add ability to create multiple-choice polls in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/10603)) | |||
- Add `GITHUB_REPOSITORY` and `SOURCE_BASE_URL` environment variables ([rosylilly](https://github.com/tootsuite/mastodon/pull/10600)) | |||
- Add `/interact/` paths to `robots.txt` ([ThibG](https://github.com/tootsuite/mastodon/pull/10666)) | |||
- Add `blurhash` to the Attachment entity in the REST API ([Gargron](https://github.com/tootsuite/mastodon/pull/10630)) | |||
### Changed | |||
- Change hidden media to be shown as a blurhash-based colorful gradient instead of a black box in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/10630)) | |||
- Change rejected media to be shown as a blurhash-based gradient instead of a list of filenames in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/10630)) | |||
- Change e-mail whitelist/blacklist to not be checked when invited ([Gargron](https://github.com/tootsuite/mastodon/pull/10683)) | |||
- Change cache header of REST API results to no-cache ([ThibG](https://github.com/tootsuite/mastodon/pull/10655)) | |||
- Change the "mark media as sensitive" button to be more obvious in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/10673), [Gargron](https://github.com/tootsuite/mastodon/pull/10682)) | |||
- Change account gallery in web UI to display 3 columns, open media modal ([Gargron](https://github.com/tootsuite/mastodon/pull/10667), [Gargron](https://github.com/tootsuite/mastodon/pull/10674)) | |||
### Fixed | |||
- Fix LDAP/PAM/SAML/CAS users not being pre-approved ([Gargron](https://github.com/tootsuite/mastodon/pull/10621)) | |||
- Fix accounts created through tootctl not being always pre-approved ([Gargron](https://github.com/tootsuite/mastodon/pull/10684)) | |||
- Fix Sidekiq retrying ActivityPub processing jobs that fail validation ([ThibG](https://github.com/tootsuite/mastodon/pull/10614)) | |||
- Fix toots not being scrolled into view sometimes through keyboard selection ([ThibG](https://github.com/tootsuite/mastodon/pull/10593)) | |||
- Fix expired invite links being usable to bypass approval mode ([ThibG](https://github.com/tootsuite/mastodon/pull/10657)) | |||
- Fix not being able to save e-mail preference for new pending accounts ([Gargron](https://github.com/tootsuite/mastodon/pull/10622)) | |||
- Fix upload progressbar when image resizing is involved ([ThibG](https://github.com/tootsuite/mastodon/pull/10632)) | |||
- Fix block action not automatically cancelling pending follow request ([ThibG](https://github.com/tootsuite/mastodon/pull/10633)) | |||
- Fix stoplight logging to stderr separate from Rails logger ([Gargron](https://github.com/tootsuite/mastodon/pull/10624)) | |||
- Fix sign up button not saying sign up when invite is used ([Gargron](https://github.com/tootsuite/mastodon/pull/10623)) | |||
- Fix health checks in Docker Compose configuration ([fabianonline](https://github.com/tootsuite/mastodon/pull/10553)) | |||
- Fix modal items not being scrollable on touch devices ([kedamaDQ](https://github.com/tootsuite/mastodon/pull/10605)) | |||
- Fix Keybase configuration using wrong domain when a web domain is used ([BenLubar](https://github.com/tootsuite/mastodon/pull/10565)) | |||
- Fix avatar GIFs not being animated on-hover on public profiles ([hyenagirl64](https://github.com/tootsuite/mastodon/pull/10549)) | |||
- Fix OpenGraph parser not understanding some valid property meta tags ([da2x](https://github.com/tootsuite/mastodon/pull/10604)) | |||
- Fix wrong fonts being displayed when Roboto is installed on user's machine ([ThibG](https://github.com/tootsuite/mastodon/pull/10594)) | |||
- Fix confirmation modals being too narrow for a secondary action button ([ThibG](https://github.com/tootsuite/mastodon/pull/10586)) | |||
## [2.8.0] - 2019-04-10 | |||
### Added | |||
@@ -14,13 +14,13 @@ If your contributions are accepted into Mastodon, you can request to be paid thr | |||
## Bug reports | |||
Bug reports and feature suggestions can be submitted to [GitHub Issues](https://github.com/tootsuite/mastodon/issues). Please make sure that you are not submitting duplicates, and that a similar report or request has not already been resolved or rejected in the past using the search function. Please also use descriptive, concise titles. | |||
Bug reports and feature suggestions must use descriptive and concise titles and be submitted to [GitHub Issues](https://github.com/tootsuite/mastodon/issues). Please use the search function to make sure that you are not submitting duplicates, and that a similar report or request has not already been resolved or rejected. | |||
## Translations | |||
You can submit translations via [Weblate](https://weblate.joinmastodon.org/). They are periodically merged into the codebase. | |||
You can submit translations via [Crowdin](https://crowdin.com/project/mastodon). They are periodically merged into the codebase. | |||
[![Mastodon translation statistics by language](https://weblate.joinmastodon.org/widgets/mastodon/-/multi-auto.svg)](https://weblate.joinmastodon.org/) | |||
[![Crowdin](https://d322cqt584bo4o.cloudfront.net/mastodon/localized.svg)](https://crowdin.com/project/mastodon) | |||
## Pull requests | |||
@@ -3,24 +3,32 @@ FROM ubuntu:18.04 as build-dep | |||
# Use bash for the shell | |||
SHELL ["bash", "-c"] | |||
# Install Node | |||
ENV NODE_VER="8.15.0" | |||
RUN echo "Etc/UTC" > /etc/localtime && \ | |||
# Install Node v12 (LTS) | |||
ENV NODE_VER="12.14.0" | |||
RUN ARCH= && \ | |||
dpkgArch="$(dpkg --print-architecture)" && \ | |||
case "${dpkgArch##*-}" in \ | |||
amd64) ARCH='x64';; \ | |||
ppc64el) ARCH='ppc64le';; \ | |||
s390x) ARCH='s390x';; \ | |||
arm64) ARCH='arm64';; \ | |||
armhf) ARCH='armv7l';; \ | |||
i386) ARCH='x86';; \ | |||
*) echo "unsupported architecture"; exit 1 ;; \ | |||
esac && \ | |||
echo "Etc/UTC" > /etc/localtime && \ | |||
apt update && \ | |||
apt -y dist-upgrade && \ | |||
apt -y install wget make gcc g++ python && \ | |||
apt -y install wget python && \ | |||
cd ~ && \ | |||
wget https://nodejs.org/download/release/v$NODE_VER/node-v$NODE_VER.tar.gz && \ | |||
tar xf node-v$NODE_VER.tar.gz && \ | |||
cd node-v$NODE_VER && \ | |||
./configure --prefix=/opt/node && \ | |||
make -j$(nproc) > /dev/null && \ | |||
make install | |||
wget https://nodejs.org/download/release/v$NODE_VER/node-v$NODE_VER-linux-$ARCH.tar.gz && \ | |||
tar xf node-v$NODE_VER-linux-$ARCH.tar.gz && \ | |||
rm node-v$NODE_VER-linux-$ARCH.tar.gz && \ | |||
mv node-v$NODE_VER-linux-$ARCH /opt/node | |||
# Install jemalloc | |||
ENV JE_VER="5.1.0" | |||
ENV JE_VER="5.2.1" | |||
RUN apt update && \ | |||
apt -y install autoconf && \ | |||
apt -y install make autoconf gcc g++ && \ | |||
cd ~ && \ | |||
wget https://github.com/jemalloc/jemalloc/archive/$JE_VER.tar.gz && \ | |||
tar xf $JE_VER.tar.gz && \ | |||
@@ -31,7 +39,7 @@ RUN apt update && \ | |||
make install_bin install_include install_lib | |||
# Install ruby | |||
ENV RUBY_VER="2.6.1" | |||
ENV RUBY_VER="2.6.5" | |||
ENV CPPFLAGS="-I/opt/jemalloc/include" | |||
ENV LDFLAGS="-L/opt/jemalloc/lib/" | |||
RUN apt update && \ | |||
@@ -61,7 +69,9 @@ RUN npm install -g yarn && \ | |||
COPY Gemfile* package.json yarn.lock /opt/mastodon/ | |||
RUN cd /opt/mastodon && \ | |||
bundle install -j$(nproc) --deployment --without development test && \ | |||
bundle config set deployment 'true' && \ | |||
bundle config set without 'development test' && \ | |||
bundle install -j$(nproc) && \ | |||
yarn install --pure-lockfile | |||
FROM ubuntu:18.04 | |||
@@ -80,13 +90,12 @@ ARG GID=991 | |||
RUN apt update && \ | |||
echo "Etc/UTC" > /etc/localtime && \ | |||
ln -s /opt/jemalloc/lib/* /usr/lib/ && \ | |||
apt -y dist-upgrade && \ | |||
apt install -y whois wget && \ | |||
addgroup --gid $GID mastodon && \ | |||
useradd -m -u $UID -g $GID -d /opt/mastodon mastodon && \ | |||
echo "mastodon:`head /dev/urandom | tr -dc A-Za-z0-9 | head -c 24 | mkpasswd -s -m sha-256`" | chpasswd | |||
# Install masto runtime deps | |||
# Install mastodon runtime deps | |||
RUN apt -y --no-install-recommends install \ | |||
libssl1.1 libpq5 imagemagick ffmpeg \ | |||
libicu60 libprotobuf10 libidn11 libyaml-0-2 \ | |||
@@ -95,7 +104,7 @@ RUN apt -y --no-install-recommends install \ | |||
ln -s /opt/mastodon /mastodon && \ | |||
gem install bundler && \ | |||
rm -rf /var/cache && \ | |||
rm -rf /var/lib/apt | |||
rm -rf /var/lib/apt/lists/* | |||
# Add tini | |||
ENV TINI_VERSION="0.18.0" | |||
@@ -104,16 +113,17 @@ ADD https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini /tin | |||
RUN echo "$TINI_SUM tini" | sha256sum -c - | |||
RUN chmod +x /tini | |||
# Copy over masto source, and dependencies from building, and set permissions | |||
# Copy over mastodon source, and dependencies from building, and set permissions | |||
COPY --chown=mastodon:mastodon . /opt/mastodon | |||
COPY --from=build-dep --chown=mastodon:mastodon /opt/mastodon /opt/mastodon | |||
# Run masto services in prod mode | |||
# Run mastodon services in prod mode | |||
ENV RAILS_ENV="production" | |||
ENV NODE_ENV="production" | |||
# Tell rails to serve static files | |||
ENV RAILS_SERVE_STATIC_FILES="true" | |||
ENV BIND="0.0.0.0" | |||
# Set the run user | |||
USER mastodon | |||
@@ -126,3 +136,4 @@ RUN cd ~ && \ | |||
# Set the work dir and the container entry point | |||
WORKDIR /opt/mastodon | |||
ENTRYPOINT ["/tini", "--"] | |||
EXPOSE 3000 4000 |
@@ -1,105 +1,116 @@ | |||
# frozen_string_literal: true | |||
source 'https://rubygems.org' | |||
ruby '>= 2.4.0', '< 2.7.0' | |||
ruby '>= 2.4.0', '< 3.0.0' | |||
gem 'pkg-config', '~> 1.3' | |||
gem 'pkg-config', '~> 1.4' | |||
gem 'puma', '~> 3.12' | |||
gem 'rails', '~> 5.2.3' | |||
gem 'puma', '~> 4.3' | |||
gem 'rails', '~> 5.2.4' | |||
gem 'sprockets', '~> 3.7.2' | |||
gem 'thor', '~> 0.20' | |||
gem 'rack', '~> 2.2.2' | |||
gem 'thwait', '~> 0.1.0' | |||
gem 'e2mmap', '~> 0.1.0' | |||
gem 'hamlit-rails', '~> 0.2' | |||
gem 'pg', '~> 1.1' | |||
gem 'pg', '~> 1.2' | |||
gem 'makara', '~> 0.4' | |||
gem 'pghero', '~> 2.2' | |||
gem 'pghero', '~> 2.4' | |||
gem 'dotenv-rails', '~> 2.7' | |||
gem 'aws-sdk-s3', '~> 1.36', require: false | |||
gem 'aws-sdk-s3', '~> 1.60', require: false | |||
gem 'fog-core', '<= 2.1.0' | |||
gem 'fog-openstack', '~> 0.3', require: false | |||
gem 'paperclip', '~> 6.0' | |||
gem 'paperclip-av-transcoder', '~> 0.6' | |||
gem 'streamio-ffmpeg', '~> 3.0' | |||
gem 'blurhash', '~> 0.1' | |||
gem 'active_model_serializers', '~> 0.10' | |||
gem 'addressable', '~> 2.6' | |||
gem 'addressable', '~> 2.7' | |||
gem 'bootsnap', '~> 1.4', require: false | |||
gem 'browser' | |||
gem 'charlock_holmes', '~> 0.7.6' | |||
gem 'charlock_holmes', '~> 0.7.7' | |||
gem 'iso-639' | |||
gem 'chewy', '~> 5.0' | |||
gem 'cld3', '~> 3.2.3' | |||
gem 'devise', '~> 4.6' | |||
gem 'devise-two-factor', '~> 3.0' | |||
gem 'chewy', '~> 5.1' | |||
gem 'cld3', '~> 3.2.6' | |||
gem 'devise', '~> 4.7' | |||
gem 'devise-two-factor', '~> 3.1' | |||
group :pam_authentication, optional: true do | |||
gem 'devise_pam_authenticatable2', '~> 9.2' | |||
end | |||
gem 'net-ldap', '~> 0.10' | |||
gem 'net-ldap', '~> 0.16' | |||
gem 'omniauth-cas', '~> 1.1' | |||
gem 'omniauth-saml', '~> 1.10' | |||
gem 'omniauth', '~> 1.9' | |||
gem 'doorkeeper', '~> 5.0' | |||
gem 'discard', '~> 1.1' | |||
gem 'doorkeeper', '~> 5.2' | |||
gem 'fast_blank', '~> 1.0' | |||
gem 'fastimage' | |||
gem 'goldfinger', '~> 2.1' | |||
gem 'hiredis', '~> 0.6' | |||
gem 'redis-namespace', '~> 1.5' | |||
gem 'redis-namespace', '~> 1.7' | |||
gem 'health_check', git: 'https://github.com/ianheggie/health_check', ref: '0b799ead604f900ed50685e9b2d469cd2befba5b' | |||
gem 'htmlentities', '~> 4.3' | |||
gem 'http', '~> 3.3' | |||
gem 'http', '~> 4.3' | |||
gem 'http_accept_language', '~> 2.1' | |||
gem 'http_parser.rb', '~> 0.6', git: 'https://github.com/tmm1/http_parser.rb', ref: '54b17ba8c7d8d20a16dfc65d1775241833219cf2' | |||
gem 'httplog', '~> 1.2' | |||
gem 'http_parser.rb', '~> 0.6', git: 'https://github.com/tmm1/http_parser.rb', ref: '54b17ba8c7d8d20a16dfc65d1775241833219cf2', submodules: true | |||
gem 'httplog', '~> 1.4.2' | |||
gem 'idn-ruby', require: 'idn' | |||
gem 'kaminari', '~> 1.1' | |||
gem 'link_header', '~> 0.0' | |||
gem 'mime-types', '~> 3.2', require: 'mime/types/columnar' | |||
gem 'mime-types', '~> 3.3.1', require: 'mime/types/columnar' | |||
gem 'nilsimsa', git: 'https://github.com/witgo/nilsimsa', ref: 'fd184883048b922b176939f851338d0a4971a532' | |||
gem 'nokogiri', '~> 1.10' | |||
gem 'nsa', '~> 0.2' | |||
gem 'oj', '~> 3.7' | |||
gem 'ostatus2', '~> 2.0' | |||
gem 'ox', '~> 2.10' | |||
gem 'oj', '~> 3.10' | |||
gem 'ox', '~> 2.12' | |||
gem 'parslet' | |||
gem 'parallel', '~> 1.19' | |||
gem 'posix-spawn', git: 'https://github.com/rtomayko/posix-spawn', ref: '58465d2e213991f8afb13b984854a49fcdcc980c' | |||
gem 'pundit', '~> 2.0' | |||
gem 'pundit', '~> 2.1' | |||
gem 'premailer-rails' | |||
gem 'rack-attack', '~> 5.4' | |||
gem 'rack-cors', '~> 1.0', require: 'rack/cors' | |||
gem 'rack-attack', '~> 6.2' | |||
gem 'rack-cors', '~> 1.1', require: 'rack/cors' | |||
gem 'rails-i18n', '~> 5.1' | |||
gem 'rails-settings-cached', '~> 0.6' | |||
gem 'redis', '~> 4.1', require: ['redis', 'redis/connection/hiredis'] | |||
gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock' | |||
gem 'rqrcode', '~> 0.10' | |||
gem 'sanitize', '~> 5.0' | |||
gem 'rqrcode', '~> 1.1' | |||
gem 'ruby-progressbar', '~> 1.10' | |||
gem 'sanitize', '~> 5.1' | |||
gem 'sidekiq', '~> 5.2' | |||
gem 'sidekiq-scheduler', '~> 3.0' | |||
gem 'sidekiq-unique-jobs', '~> 6.0' | |||
gem 'sidekiq-bulk', '~>0.2.0' | |||
gem 'simple-navigation', '~> 4.0' | |||
gem 'simple_form', '~> 4.1' | |||
gem 'simple-navigation', '~> 4.1' | |||
gem 'simple_form', '~> 5.0' | |||
gem 'sprockets-rails', '~> 3.2', require: 'sprockets/railtie' | |||
gem 'stoplight', '~> 2.1.3' | |||
gem 'strong_migrations', '~> 0.3' | |||
gem 'tty-command', '~> 0.8', require: false | |||
gem 'tty-prompt', '~> 0.18', require: false | |||
gem 'stoplight', '~> 2.2.0' | |||
gem 'strong_migrations', '~> 0.5' | |||
gem 'tty-command', '~> 0.9', require: false | |||
gem 'tty-prompt', '~> 0.20', require: false | |||
gem 'twitter-text', '~> 1.14' | |||
gem 'tzinfo-data', '~> 1.2019' | |||
gem 'webpacker', '~> 4.0' | |||
gem 'webpacker', '~> 4.2' | |||
gem 'webpush' | |||
gem 'json-ld', '~> 3.0' | |||
gem 'json-ld-preloaded', '~> 3.0' | |||
gem 'rdf-normalize', '~> 0.3' | |||
gem 'json-ld' | |||
gem 'json-ld-preloaded', '~> 3.1' | |||
gem 'rdf-normalize', '~> 0.4' | |||
group :development, :test do | |||
gem 'fabrication', '~> 2.20' | |||
gem 'fuubar', '~> 2.3' | |||
gem 'fabrication', '~> 2.21' | |||
gem 'fuubar', '~> 2.5' | |||
gem 'i18n-tasks', '~> 0.9', require: false | |||
gem 'pry-byebug', '~> 3.7' | |||
gem 'pry-byebug', '~> 3.8' | |||
gem 'pry-rails', '~> 0.3' | |||
gem 'rspec-rails', '~> 3.8' | |||
gem 'rspec-rails', '~> 3.9' | |||
end | |||
group :production, :test do | |||
@@ -107,43 +118,43 @@ group :production, :test do | |||
end | |||
group :test do | |||
gem 'capybara', '~> 3.16' | |||
gem 'capybara', '~> 3.31' | |||
gem 'climate_control', '~> 0.2' | |||
gem 'faker', '~> 1.9' | |||
gem 'microformats', '~> 4.1' | |||
gem 'faker', '~> 2.10' | |||
gem 'microformats', '~> 4.2' | |||
gem 'rails-controller-testing', '~> 1.0' | |||
gem 'rspec-sidekiq', '~> 3.0' | |||
gem 'simplecov', '~> 0.16', require: false | |||
gem 'webmock', '~> 3.5' | |||
gem 'parallel_tests', '~> 2.28' | |||
gem 'simplecov', '~> 0.18', require: false | |||
gem 'webmock', '~> 3.8' | |||
gem 'parallel_tests', '~> 2.30' | |||
end | |||
group :development do | |||
gem 'active_record_query_trace', '~> 1.6' | |||
gem 'annotate', '~> 2.7' | |||
gem 'active_record_query_trace', '~> 1.7' | |||
gem 'annotate', '~> 3.0' | |||
gem 'better_errors', '~> 2.5' | |||
gem 'binding_of_caller', '~> 0.7' | |||
gem 'bullet', '~> 5.9' | |||
gem 'bullet', '~> 6.1' | |||
gem 'letter_opener', '~> 1.7' | |||
gem 'letter_opener_web', '~> 1.3' | |||
gem 'letter_opener_web', '~> 1.4' | |||
gem 'memory_profiler' | |||
gem 'rubocop', '~> 0.67', require: false | |||
gem 'brakeman', '~> 4.5', require: false | |||
gem 'rubocop', '~> 0.79', require: false | |||
gem 'rubocop-rails', '~> 2.4', require: false | |||
gem 'brakeman', '~> 4.7', require: false | |||
gem 'bundler-audit', '~> 0.6', require: false | |||
gem 'scss_lint', '~> 0.57', require: false | |||
gem 'capistrano', '~> 3.11' | |||
gem 'capistrano-rails', '~> 1.4' | |||
gem 'capistrano-rbenv', '~> 2.1' | |||
gem 'capistrano-yarn', '~> 2.0' | |||
gem 'derailed_benchmarks' | |||
gem 'stackprof' | |||
end | |||
group :production do | |||
gem 'lograge', '~> 0.10' | |||
gem 'lograge', '~> 0.11' | |||
gem 'redis-rails', '~> 5.0' | |||
end | |||
gem 'concurrent-ruby', require: false | |||
gem 'connection_pool', require: false |
@@ -1,2 +1,14 @@ | |||
web: bundle exec puma -C config/puma.rb | |||
web: if [ "$RUN_STREAMING" != "true" ]; then BIND=0.0.0.0 bundle exec puma -C config/puma.rb; else BIND=0.0.0.0 node ./streaming; fi | |||
worker: bundle exec sidekiq | |||
# For the streaming API, you need a separate app that shares Postgres and Redis: | |||
# | |||
# heroku create | |||
# heroku buildpacks:add heroku/nodejs | |||
# heroku config:set RUN_STREAMING=true | |||
# heroku addons:attach <main-app>::DATABASE | |||
# heroku addons:attach <main-app>::REDIS | |||
# | |||
# and let the main app use the separate app: | |||
# | |||
# heroku config:set STREAMING_API_BASE_URL=wss://<streaming-app>.herokuapp.com -a <main-app> |
@@ -4,16 +4,16 @@ | |||
[![GitHub release](https://img.shields.io/github/release/tootsuite/mastodon.svg)][releases] | |||
[![Build Status](https://img.shields.io/circleci/project/github/tootsuite/mastodon.svg)][circleci] | |||
[![Code Climate](https://img.shields.io/codeclimate/maintainability/tootsuite/mastodon.svg)][code_climate] | |||
[![Translation status](https://weblate.joinmastodon.org/widgets/mastodon/-/svg-badge.svg)][weblate] | |||
[![Crowdin](https://d322cqt584bo4o.cloudfront.net/mastodon/localized.svg)][crowdin] | |||
[![Docker Pulls](https://img.shields.io/docker/pulls/tootsuite/mastodon.svg)][docker] | |||
[releases]: https://github.com/tootsuite/mastodon/releases | |||
[circleci]: https://circleci.com/gh/tootsuite/mastodon | |||
[code_climate]: https://codeclimate.com/github/tootsuite/mastodon | |||
[weblate]: https://weblate.joinmastodon.org/engage/mastodon/ | |||
[crowdin]: https://crowdin.com/project/mastodon | |||
[docker]: https://hub.docker.com/r/tootsuite/mastodon/ | |||
Mastodon is a **free, open-source social network server** based on ActivityPub. Follow friends and discover new ones. Publish anything you want: links, pictures, text, video. All servers of Mastodon are interoperable as a federated network, i.e. users on one server can seamlessly communicate with users from another one. This includes non-Mastodon software that also implements ActivityPub! | |||
Mastodon is a **free, open-source social network server** based on ActivityPub where users can follow friends and discover new ones. On Mastodon, users can publish anything they want: links, pictures, text, video. All Mastodon servers are interoperable as a federated network (users on one server can seamlessly communicate with users from another one, including non-Mastodon software that implements ActivityPub)! | |||
Click below to **learn more** in a video: | |||
@@ -55,7 +55,7 @@ Private posts, locked accounts, phrase filtering, muting, blocking and all sorts | |||
**OAuth2 and a straightforward REST API** | |||
Mastodon acts as an OAuth2 provider so 3rd party apps can use the REST and Streaming APIs, resulting in a rich app ecosystem with a lot of choice! | |||
Mastodon acts as an OAuth2 provider so 3rd party apps can use the REST and Streaming APIs, resulting in a rich app ecosystem with a lot of choices! | |||
## Deployment | |||
@@ -70,15 +70,15 @@ Mastodon acts as an OAuth2 provider so 3rd party apps can use the REST and Strea | |||
- **PostgreSQL** 9.5+ | |||
- **Redis** | |||
- **Ruby** 2.4+ | |||
- **Node.js** 8+ | |||
- **Node.js** 10.13+ | |||
The repository includes deployment configurations for **Docker and docker-compose**, but also a few specific platforms like **Heroku**, **Scalingo**, and **Nanobox**. The [**stand-alone** installation guide](https://docs.joinmastodon.org/administration/installation/) is available in the documentation. | |||
The repository includes deployment configurations for **Docker and docker-compose**, but also a few specific platforms like **Heroku**, **Scalingo**, and **Nanobox**. The [**stand-alone** installation guide](https://docs.joinmastodon.org/admin/install/) is available in the documentation. | |||
A **Vagrant** configuration is included for development purposes. | |||
## Contributing | |||
Mastodon is **free, open source software** licensed under **AGPLv3**. | |||
Mastodon is **free, open-source software** licensed under **AGPLv3**. | |||
You can open issues for bugs you've found or features you think are missing. You can also submit pull requests to this repository, or submit translations using Weblate. To get started, take a look at [CONTRIBUTING.md](CONTRIBUTING.md). If your contributions are accepted into Mastodon, you can request to be paid through [our OpenCollective](https://opencollective.com/mastodon). | |||
@@ -86,7 +86,7 @@ You can open issues for bugs you've found or features you think are missing. You | |||
## License | |||
Copyright (C) 2016-2019 Eugen Rochko & other Mastodon contributors (see [AUTHORS.md](AUTHORS.md)) | |||
Copyright (C) 2016-2020 Eugen Rochko & other Mastodon contributors (see [AUTHORS.md](AUTHORS.md)) | |||
This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. | |||
@@ -12,7 +12,7 @@ curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - | |||
sudo apt-add-repository 'deb https://dl.yarnpkg.com/debian/ stable main' | |||
# Add repo for NodeJS | |||
curl -sL https://deb.nodesource.com/setup_8.x | sudo bash - | |||
curl -sL https://deb.nodesource.com/setup_10.x | sudo bash - | |||
# Add firewall rule to redirect 80 to PORT and save | |||
sudo iptables -t nat -A PREROUTING -p tcp --dport 80 -j REDIRECT --to-port #{ENV["PORT"]} | |||
@@ -13,15 +13,6 @@ | |||
"description": "The domain that your Mastodon instance will run on (this can be appname.herokuapp.com or a custom domain)", | |||
"required": true | |||
}, | |||
"LOCAL_HTTPS": { | |||
"description": "Will your domain support HTTPS? (Automatic for herokuapp, requires manual configuration for custom domains)", | |||
"value": "false", | |||
"required": true | |||
}, | |||
"PAPERCLIP_SECRET": { | |||
"description": "The secret key for storing media files", | |||
"generator": "secret" | |||
}, | |||
"SECRET_KEY_BASE": { | |||
"description": "The secret key base", | |||
"generator": "secret" | |||
@@ -0,0 +1,43 @@ | |||
# frozen_string_literal: true | |||
class AccountsIndex < Chewy::Index | |||
settings index: { refresh_interval: '5m' }, analysis: { | |||
analyzer: { | |||
content: { | |||
tokenizer: 'whitespace', | |||
filter: %w(lowercase asciifolding cjk_width), | |||
}, | |||
edge_ngram: { | |||
tokenizer: 'edge_ngram', | |||
filter: %w(lowercase asciifolding cjk_width), | |||
}, | |||
}, | |||
tokenizer: { | |||
edge_ngram: { | |||
type: 'edge_ngram', | |||
min_gram: 1, | |||
max_gram: 15, | |||
}, | |||
}, | |||
} | |||
define_type ::Account.searchable.includes(:account_stat), delete_if: ->(account) { account.destroyed? || !account.searchable? } do | |||
root date_detection: false do | |||
field :id, type: 'long' | |||
field :display_name, type: 'text', analyzer: 'content' do | |||
field :edge_ngram, type: 'text', analyzer: 'edge_ngram', search_analyzer: 'content' | |||
end | |||
field :acct, type: 'text', analyzer: 'content', value: ->(account) { [account.username, account.domain].compact.join('@') } do | |||
field :edge_ngram, type: 'text', analyzer: 'edge_ngram', search_analyzer: 'content' | |||
end | |||
field :following_count, type: 'long', value: ->(account) { account.following.local.count } | |||
field :followers_count, type: 'long', value: ->(account) { account.followers.local.count } | |||
field :last_status_at, type: 'date', value: ->(account) { account.last_status_at || account.created_at } | |||
end | |||
end | |||
end |
@@ -31,19 +31,19 @@ class StatusesIndex < Chewy::Index | |||
}, | |||
} | |||
define_type ::Status.unscoped.without_reblogs.includes(:media_attachments) do | |||
define_type ::Status.unscoped.kept.without_reblogs.includes(:media_attachments), delete_if: ->(status) { status.searchable_by.empty? } do | |||
crutch :mentions do |collection| | |||
data = ::Mention.where(status_id: collection.map(&:id)).pluck(:status_id, :account_id) | |||
data = ::Mention.where(status_id: collection.map(&:id)).where(account: Account.local).pluck(:status_id, :account_id) | |||
data.each.with_object({}) { |(id, name), result| (result[id] ||= []).push(name) } | |||
end | |||
crutch :favourites do |collection| | |||
data = ::Favourite.where(status_id: collection.map(&:id)).pluck(:status_id, :account_id) | |||
data = ::Favourite.where(status_id: collection.map(&:id)).where(account: Account.local).pluck(:status_id, :account_id) | |||
data.each.with_object({}) { |(id, name), result| (result[id] ||= []).push(name) } | |||
end | |||
crutch :reblogs do |collection| | |||
data = ::Status.where(reblog_of_id: collection.map(&:id)).pluck(:reblog_of_id, :account_id) | |||
data = ::Status.where(reblog_of_id: collection.map(&:id)).where(account: Account.local).pluck(:reblog_of_id, :account_id) | |||
data.each.with_object({}) { |(id, name), result| (result[id] ||= []).push(name) } | |||
end | |||
@@ -51,7 +51,7 @@ class StatusesIndex < Chewy::Index | |||
field :id, type: 'long' | |||
field :account_id, type: 'long' | |||
field :text, type: 'text', value: ->(status) { [status.spoiler_text, Formatter.instance.plaintext(status)].concat(status.media_attachments.map(&:description)).join("\n\n") } do | |||
field :text, type: 'text', value: ->(status) { [status.spoiler_text, Formatter.instance.plaintext(status)].concat(status.media_attachments.map(&:description)).concat(status.preloadable_poll ? status.preloadable_poll.options : []).join("\n\n") } do | |||
field :stemmed, type: 'text', analyzer: 'content' | |||
end | |||
@@ -0,0 +1,37 @@ | |||
# frozen_string_literal: true | |||
class TagsIndex < Chewy::Index | |||
settings index: { refresh_interval: '15m' }, analysis: { | |||
analyzer: { | |||
content: { | |||
tokenizer: 'keyword', | |||
filter: %w(lowercase asciifolding cjk_width), | |||
}, | |||
edge_ngram: { | |||
tokenizer: 'edge_ngram', | |||
filter: %w(lowercase asciifolding cjk_width), | |||
}, | |||
}, | |||
tokenizer: { | |||
edge_ngram: { | |||
type: 'edge_ngram', | |||
min_gram: 2, | |||
max_gram: 15, | |||
}, | |||
}, | |||
} | |||
define_type ::Tag.listable, delete_if: ->(tag) { tag.destroyed? || !tag.listable? } do | |||
root date_detection: false do | |||
field :name, type: 'text', analyzer: 'content' do | |||
field :edge_ngram, type: 'text', analyzer: 'edge_ngram', search_analyzer: 'content' | |||
end | |||
field :reviewed, type: 'boolean', value: ->(tag) { tag.reviewed? } | |||
field :usage, type: 'long', value: ->(tag) { tag.history.reduce(0) { |total, day| total + day[:accounts].to_i } } | |||
field :last_status_at, type: 'date', value: ->(tag) { tag.last_status_at || tag.created_at } | |||
end | |||
end | |||
end |
@@ -3,18 +3,46 @@ | |||
class AboutController < ApplicationController | |||
layout 'public' | |||
before_action :set_instance_presenter, only: [:show, :more, :terms] | |||
before_action :require_open_federation!, only: [:show, :more] | |||
before_action :set_body_classes, only: :show | |||
before_action :set_instance_presenter | |||
before_action :set_expires_in, only: [:show, :more, :terms] | |||
def show | |||
@hide_navbar = true | |||
end | |||
skip_before_action :require_functional!, only: [:more, :terms] | |||
def show; end | |||
def more; end | |||
def more | |||
flash.now[:notice] = I18n.t('about.instance_actor_flash') if params[:instance_actor] | |||
toc_generator = TOCGenerator.new(@instance_presenter.site_extended_description) | |||
@contents = toc_generator.html | |||
@table_of_contents = toc_generator.toc | |||
@blocks = DomainBlock.with_user_facing_limitations.by_severity if display_blocks? | |||
end | |||
def terms; end | |||
helper_method :display_blocks? | |||
helper_method :display_blocks_rationale? | |||
helper_method :public_fetch_mode? | |||
helper_method :new_user | |||
private | |||
def require_open_federation! | |||
not_found if whitelist_mode? | |||
end | |||
def display_blocks? | |||
Setting.show_domain_blocks == 'all' || (Setting.show_domain_blocks == 'users' && user_signed_in?) | |||
end | |||
def display_blocks_rationale? | |||
Setting.show_domain_blocks_rationale == 'all' || (Setting.show_domain_blocks_rationale == 'users' && user_signed_in?) | |||
end | |||
def new_user | |||
User.new.tap do |user| | |||
user.build_account | |||
@@ -22,9 +50,15 @@ class AboutController < ApplicationController | |||
end | |||
end | |||
helper_method :new_user | |||
def set_instance_presenter | |||
@instance_presenter = InstancePresenter.new | |||
end | |||
def set_body_classes | |||
@hide_navbar = true | |||
end | |||
def set_expires_in | |||
expires_in 0, public: true | |||
end | |||
end |
@@ -4,17 +4,22 @@ class AccountsController < ApplicationController | |||
PAGE_SIZE = 20 | |||
include AccountControllerConcern | |||
include SignatureAuthentication | |||
before_action :set_cache_headers | |||
before_action :set_body_classes | |||
skip_around_action :set_locale, if: -> { [:json, :rss].include?(request.format&.to_sym) } | |||
skip_before_action :require_functional! | |||
def show | |||
respond_to do |format| | |||
format.html do | |||
mark_cacheable! unless user_signed_in? | |||
expires_in 0, public: true unless user_signed_in? | |||
@body_classes = 'with-modals' | |||
@pinned_statuses = [] | |||
@endorsed_accounts = @account.endorsed_accounts.to_a.sample(4) | |||
@featured_hashtags = @account.featured_tags.order(statuses_count: :desc) | |||
if current_account && @account.blocking?(current_account) | |||
@statuses = [] | |||
@@ -24,6 +29,7 @@ class AccountsController < ApplicationController | |||
@pinned_statuses = cache_collection(@account.pinned_statuses, Status) if show_pinned_statuses? | |||
@statuses = filtered_status_page(params) | |||
@statuses = cache_collection(@statuses, Status) | |||
@rss_url = rss_url | |||
unless @statuses.empty? | |||
@older_url = older_url if @statuses.last.id > filtered_statuses.last.id | |||
@@ -31,32 +37,27 @@ class AccountsController < ApplicationController | |||
end | |||
end | |||
format.atom do | |||
mark_cacheable! | |||
@entries = @account.stream_entries.where(hidden: false).with_includes.paginate_by_max_id(PAGE_SIZE, params[:max_id], params[:since_id]) | |||
render xml: OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.feed(@account, @entries.reject { |entry| entry.status.nil? })) | |||
end | |||
format.rss do | |||
mark_cacheable! | |||
expires_in 1.minute, public: true | |||
@statuses = cache_collection(default_statuses.without_reblogs.without_replies.limit(PAGE_SIZE), Status) | |||
render xml: RSS::AccountSerializer.render(@account, @statuses) | |||
@statuses = filtered_statuses.without_reblogs.without_replies.limit(PAGE_SIZE) | |||
@statuses = cache_collection(@statuses, Status) | |||
render xml: RSS::AccountSerializer.render(@account, @statuses, params[:tag]) | |||
end | |||
format.json do | |||
mark_cacheable! | |||
render_cached_json(['activitypub', 'actor', @account], content_type: 'application/activity+json') do | |||
ActiveModelSerializers::SerializableResource.new(@account, serializer: ActivityPub::ActorSerializer, adapter: ActivityPub::Adapter) | |||
end | |||
expires_in 3.minutes, public: !(authorized_fetch_mode? && signed_request_account.present?) | |||
render_with_cache json: @account, content_type: 'application/activity+json', serializer: ActivityPub::ActorSerializer, adapter: ActivityPub::Adapter, fields: restrict_fields_to | |||
end | |||
end | |||
end | |||
private | |||
def set_body_classes | |||
@body_classes = 'with-modals' | |||
end | |||
def show_pinned_statuses? | |||
[replies_requested?, media_requested?, tag_requested?, params[:max_id].present?, params[:min_id].present?].none? | |||
end | |||
@@ -99,6 +100,14 @@ class AccountsController < ApplicationController | |||
params[:username] | |||
end | |||
def rss_url | |||
if tag_requested? | |||
short_account_tag_url(@account, params[:tag], format: 'rss') | |||
else | |||
short_account_url(@account, format: 'rss') | |||
end | |||
end | |||
def older_url | |||
pagination_url(max_id: @statuses.last.id) | |||
end | |||
@@ -120,15 +129,15 @@ class AccountsController < ApplicationController | |||
end | |||
def media_requested? | |||
request.path.ends_with?('/media') | |||
request.path.ends_with?('/media') && !tag_requested? | |||
end | |||
def replies_requested? | |||
request.path.ends_with?('/with_replies') | |||
request.path.ends_with?('/with_replies') && !tag_requested? | |||
end | |||
def tag_requested? | |||
request.path.ends_with?(Addressable::URI.parse("/tagged/#{params[:tag]}").normalize) | |||
request.path.split('.').first.ends_with?(Addressable::URI.parse("/tagged/#{params[:tag]}").normalize) | |||
end | |||
def filtered_status_page(params) | |||
@@ -138,4 +147,12 @@ class AccountsController < ApplicationController | |||
filtered_statuses.paginate_by_max_id(PAGE_SIZE, params[:max_id], params[:since_id]).to_a | |||
end | |||
end | |||
def restrict_fields_to | |||
if signed_request_account.present? || public_fetch_mode? | |||
# Return all fields | |||
else | |||
%i(id type preferred_username inbox public_key endpoints) | |||
end | |||
end | |||
end |
@@ -0,0 +1,11 @@ | |||
# frozen_string_literal: true | |||
class ActivityPub::BaseController < Api::BaseController | |||
skip_before_action :require_authenticated_user! | |||
private | |||
def set_cache_headers | |||
response.headers['Vary'] = 'Signature' if authorized_fetch_mode? | |||
end | |||
end |
@@ -1,32 +1,21 @@ | |||
# frozen_string_literal: true | |||
class ActivityPub::CollectionsController < Api::BaseController | |||
class ActivityPub::CollectionsController < ActivityPub::BaseController | |||
include SignatureVerification | |||
include AccountOwnedConcern | |||
before_action :set_account | |||
before_action :require_signature!, if: :authorized_fetch_mode? | |||
before_action :set_size | |||
before_action :set_statuses | |||
before_action :set_cache_headers | |||
def show | |||
skip_session! | |||
render_cached_json(['activitypub', 'collection', @account, params[:id]], content_type: 'application/activity+json') do | |||
ActiveModelSerializers::SerializableResource.new( | |||
collection_presenter, | |||
serializer: ActivityPub::CollectionSerializer, | |||
adapter: ActivityPub::Adapter, | |||
skip_activities: true | |||
) | |||
end | |||
expires_in 3.minutes, public: public_fetch_mode? | |||
render_with_cache json: collection_presenter, content_type: 'application/activity+json', serializer: ActivityPub::CollectionSerializer, adapter: ActivityPub::Adapter, skip_activities: true | |||
end | |||
private | |||
def set_account | |||
@account = Account.find_local!(params[:account_username]) | |||
end | |||
def set_statuses | |||
@statuses = scope_for_collection | |||
@statuses = cache_collection(@statuses, Status) | |||
@@ -44,9 +33,9 @@ class ActivityPub::CollectionsController < Api::BaseController | |||
def scope_for_collection | |||
case params[:id] | |||
when 'featured' | |||
@account.statuses.permitted_for(@account, signed_request_account).tap do |scope| | |||
scope.merge!(@account.pinned_statuses) | |||
end | |||
return Status.none if @account.blocking?(signed_request_account) | |||
@account.pinned_statuses | |||
else | |||
raise ActiveRecord::RecordNotFound | |||
end | |||
@@ -1,40 +1,45 @@ | |||
# frozen_string_literal: true | |||
class ActivityPub::InboxesController < Api::BaseController | |||
class ActivityPub::InboxesController < ActivityPub::BaseController | |||
include SignatureVerification | |||
include JsonLdHelper | |||
include AccountOwnedConcern | |||
before_action :set_account | |||
before_action :skip_unknown_actor_delete | |||
before_action :require_signature! | |||
skip_before_action :authenticate_user! | |||
def create | |||
if unknown_deleted_account? | |||
head 202 | |||
elsif signed_request_account | |||
upgrade_account | |||
process_payload | |||
head 202 | |||
else | |||
render plain: signature_verification_failure_reason, status: 401 | |||
end | |||
upgrade_account | |||
process_payload | |||
head 202 | |||
end | |||
private | |||
def skip_unknown_actor_delete | |||
head 202 if unknown_deleted_account? | |||
end | |||
def unknown_deleted_account? | |||
json = Oj.load(body, mode: :strict) | |||
json['type'] == 'Delete' && json['actor'].present? && json['actor'] == value_or_id(json['object']) && !Account.where(uri: json['actor']).exists? | |||
json.is_a?(Hash) && json['type'] == 'Delete' && json['actor'].present? && json['actor'] == value_or_id(json['object']) && !Account.where(uri: json['actor']).exists? | |||
rescue Oj::ParseError | |||
false | |||
end | |||
def set_account | |||
@account = Account.find_local!(params[:account_username]) if params[:account_username] | |||
def account_required? | |||
params[:account_username].present? | |||
end | |||
def body | |||
return @body if defined?(@body) | |||
@body = request.body.read.force_encoding('UTF-8') | |||
@body = request.body.read | |||
@body.force_encoding('UTF-8') if @body.present? | |||
request.body.rewind if request.body.respond_to?(:rewind) | |||
@body | |||
end | |||
@@ -44,7 +49,6 @@ class ActivityPub::InboxesController < Api::BaseController | |||
ResolveAccountWorker.perform_async(signed_request_account.acct) | |||
end | |||
Pubsubhubbub::UnsubscribeWorker.perform_async(signed_request_account.id) if signed_request_account.subscribed? | |||
DeliveryFailureTracker.track_inverse_success!(signed_request_account) | |||
end | |||
@@ -1,29 +1,22 @@ | |||
# frozen_string_literal: true | |||
class ActivityPub::OutboxesController < Api::BaseController | |||
class ActivityPub::OutboxesController < ActivityPub::BaseController | |||
LIMIT = 20 | |||
include SignatureVerification | |||
include AccountOwnedConcern | |||
before_action :set_account | |||
before_action :require_signature!, if: :authorized_fetch_mode? | |||
before_action :set_statuses | |||
before_action :set_cache_headers | |||
def show | |||
unless page_requested? | |||
skip_session! | |||
expires_in 1.minute, public: true | |||
end | |||
expires_in(page_requested? ? 0 : 3.minutes, public: public_fetch_mode?) | |||
render json: outbox_presenter, serializer: ActivityPub::OutboxSerializer, adapter: ActivityPub::Adapter, content_type: 'application/activity+json' | |||
end | |||
private | |||
def set_account | |||
@account = Account.find_local!(params[:account_username]) | |||
end | |||
def outbox_presenter | |||
if page_requested? | |||
ActivityPub::CollectionPresenter.new( | |||
@@ -0,0 +1,71 @@ | |||
# frozen_string_literal: true | |||
class ActivityPub::RepliesController < ActivityPub::BaseController | |||
include SignatureAuthentication | |||
include Authorization | |||
include AccountOwnedConcern | |||
DESCENDANTS_LIMIT = 60 | |||
before_action :require_signature!, if: :authorized_fetch_mode? | |||
before_action :set_status | |||
before_action :set_cache_headers | |||
before_action :set_replies | |||
def index | |||
expires_in 0, public: public_fetch_mode? | |||
render json: replies_collection_presenter, serializer: ActivityPub::CollectionSerializer, adapter: ActivityPub::Adapter, content_type: 'application/activity+json', skip_activities: true | |||
end | |||
private | |||
def set_status | |||
@status = @account.statuses.find(params[:status_id]) | |||
authorize @status, :show? | |||
rescue Mastodon::NotPermittedError | |||
raise ActiveRecord::RecordNotFound | |||
end | |||
def set_replies | |||
@replies = page_params[:only_other_accounts] ? Status.where.not(account_id: @account.id) : @account.statuses | |||
@replies = @replies.where(in_reply_to_id: @status.id, visibility: [:public, :unlisted]) | |||
@replies = @replies.paginate_by_min_id(DESCENDANTS_LIMIT, params[:min_id]) | |||
end | |||
def replies_collection_presenter | |||
page = ActivityPub::CollectionPresenter.new( | |||
id: account_status_replies_url(@account, @status, page_params), | |||
type: :unordered, | |||
part_of: account_status_replies_url(@account, @status), | |||
next: next_page, | |||
items: @replies.map { |status| status.local ? status : status.uri } | |||
) | |||
return page if page_requested? | |||
ActivityPub::CollectionPresenter.new( | |||
id: account_status_replies_url(@account, @status), | |||
type: :unordered, | |||
first: page | |||
) | |||
end | |||
def page_requested? | |||
params[:page] == 'true' | |||
end | |||
def next_page | |||
only_other_accounts = !(@replies&.last&.account_id == @account.id && @replies.size == DESCENDANTS_LIMIT) | |||
account_status_replies_url( | |||
@account, | |||
@status, | |||
page: true, | |||
min_id: only_other_accounts && !page_params[:only_other_accounts] ? nil : @replies&.last&.id, | |||
only_other_accounts: only_other_accounts | |||
) | |||
end | |||
def page_params | |||
params_slice(:only_other_accounts, :min_id).merge(page: true) | |||
end | |||
end |
@@ -5,7 +5,7 @@ module Admin | |||
before_action :set_account | |||
def new | |||
@account_action = Admin::AccountAction.new(type: params[:type], report_id: params[:report_id], send_email_notification: true) | |||
@account_action = Admin::AccountAction.new(type: params[:type], report_id: params[:report_id], send_email_notification: true, include_statuses: true) | |||
@warning_presets = AccountWarningPreset.all | |||
end | |||
@@ -30,7 +30,7 @@ module Admin | |||
end | |||
def resource_params | |||
params.require(:admin_account_action).permit(:type, :report_id, :warning_preset_id, :text, :send_email_notification) | |||
params.require(:admin_account_action).permit(:type, :report_id, :warning_preset_id, :text, :send_email_notification, :include_statuses) | |||
end | |||
end | |||
end |
@@ -2,8 +2,8 @@ | |||
module Admin | |||
class AccountsController < BaseController | |||
before_action :set_account, only: [:show, :subscribe, :unsubscribe, :redownload, :remove_avatar, :remove_header, :enable, :unsilence, :unsuspend, :memorialize, :approve, :reject] | |||
before_action :require_remote_account!, only: [:subscribe, :unsubscribe, :redownload] | |||
before_action :set_account, only: [:show, :redownload, :remove_avatar, :remove_header, :enable, :unsilence, :unsuspend, :memorialize, :approve, :reject] | |||
before_action :require_remote_account!, only: [:redownload] | |||
before_action :require_local_account!, only: [:enable, :memorialize, :approve, :reject] | |||
def index | |||
@@ -19,18 +19,6 @@ module Admin | |||
@warnings = @account.targeted_account_warnings.latest.custom | |||
end | |||
def subscribe | |||
authorize @account, :subscribe? | |||
Pubsubhubbub::SubscribeWorker.perform_async(@account.id) | |||
redirect_to admin_account_path(@account.id) | |||
end | |||
def unsubscribe | |||
authorize @account, :unsubscribe? | |||
Pubsubhubbub::UnsubscribeWorker.perform_async(@account.id) | |||
redirect_to admin_account_path(@account.id) | |||
end | |||
def memorialize | |||
authorize @account, :memorialize? | |||
@account.memorialize! | |||
@@ -48,13 +36,13 @@ module Admin | |||
def approve | |||
authorize @account.user, :approve? | |||
@account.user.approve! | |||
redirect_to admin_accounts_path(pending: '1') | |||
redirect_to admin_pending_accounts_path | |||
end | |||
def reject | |||
authorize @account.user, :reject? | |||
SuspendAccountService.new.call(@account, including_user: true, destroy: true, skip_distribution: true) | |||
redirect_to admin_accounts_path(pending: '1') | |||
SuspendAccountService.new.call(@account, reserve_email: false, reserve_username: false) | |||
redirect_to admin_pending_accounts_path | |||
end | |||
def unsilence | |||
@@ -121,20 +109,7 @@ module Admin | |||
end | |||
def filter_params | |||
params.permit( | |||
:local, | |||
:remote, | |||
:by_domain, | |||
:active, | |||
:pending, | |||
:silenced, | |||
:suspended, | |||
:username, | |||
:display_name, | |||
:email, | |||
:ip, | |||
:staff | |||
) | |||
params.slice(*AccountFilter::KEYS).permit(*AccountFilter::KEYS) | |||
end | |||
end | |||
end |
@@ -0,0 +1,88 @@ | |||
# frozen_string_literal: true | |||
class Admin::AnnouncementsController < Admin::BaseController | |||
before_action :set_announcements, only: :index | |||
before_action :set_announcement, except: [:index, :new, :create] | |||
def index | |||
authorize :announcement, :index? | |||
end | |||
def new | |||
authorize :announcement, :create? | |||
@announcement = Announcement.new | |||
end | |||
def create | |||
authorize :announcement, :create? | |||
@announcement = Announcement.new(resource_params) | |||
if @announcement.save | |||
PublishScheduledAnnouncementWorker.perform_async(@announcement.id) if @announcement.published? | |||
log_action :create, @announcement | |||
redirect_to admin_announcements_path, notice: @announcement.published? ? I18n.t('admin.announcements.published_msg') : I18n.t('admin.announcements.scheduled_msg') | |||
else | |||
render :new | |||
end | |||
end | |||
def edit | |||
authorize :announcement, :update? | |||
end | |||
def update | |||
authorize :announcement, :update? | |||
if @announcement.update(resource_params) | |||
PublishScheduledAnnouncementWorker.perform_async(@announcement.id) if @announcement.published? | |||
log_action :update, @announcement | |||
redirect_to admin_announcements_path, notice: I18n.t('admin.announcements.updated_msg') | |||
else | |||
render :edit | |||
end | |||
end | |||
def publish | |||
authorize :announcement, :update? | |||
@announcement.publish! | |||
PublishScheduledAnnouncementWorker.perform_async(@announcement.id) | |||
log_action :update, @announcement | |||
redirect_to admin_announcements_path, notice: I18n.t('admin.announcements.published_msg') | |||
end | |||
def unpublish | |||
authorize :announcement, :update? | |||
@announcement.unpublish! | |||
UnpublishAnnouncementWorker.perform_async(@announcement.id) | |||
log_action :update, @announcement | |||
redirect_to admin_announcements_path, notice: I18n.t('admin.announcements.unpublished_msg') | |||
end | |||
def destroy | |||
authorize :announcement, :destroy? | |||
@announcement.destroy! | |||
UnpublishAnnouncementWorker.perform_async(@announcement.id) if @announcement.published? | |||
log_action :destroy, @announcement | |||
redirect_to admin_announcements_path, notice: I18n.t('admin.announcements.destroyed_msg') | |||
end | |||
private | |||
def set_announcements | |||
@announcements = AnnouncementFilter.new(filter_params).results.page(params[:page]) | |||
end | |||
def set_announcement | |||
@announcement = Announcement.find(params[:id]) | |||
end | |||
def filter_params | |||
params.slice(*AnnouncementFilter::KEYS).permit(*AnnouncementFilter::KEYS) | |||
end | |||
def resource_params | |||
params.require(:announcement).permit(:text, :scheduled_at, :starts_at, :ends_at, :all_day) | |||
end | |||
end |
@@ -2,19 +2,16 @@ | |||
module Admin | |||
class CustomEmojisController < BaseController | |||
before_action :set_custom_emoji, except: [:index, :new, :create] | |||
before_action :set_filter_params | |||
include ObfuscateFilename | |||
obfuscate_filename [:custom_emoji, :image] | |||
def index | |||
authorize :custom_emoji, :index? | |||
@custom_emojis = filtered_custom_emojis.eager_load(:local_counterpart).page(params[:page]) | |||
@form = Form::CustomEmojiBatch.new | |||
end | |||
def new | |||
authorize :custom_emoji, :create? | |||
@custom_emoji = CustomEmoji.new | |||
end | |||
@@ -31,69 +28,17 @@ module Admin | |||
end | |||
end | |||
def update | |||
authorize @custom_emoji, :update? | |||
if @custom_emoji.update(resource_params) | |||
log_action :update, @custom_emoji | |||
flash[:notice] = I18n.t('admin.custom_emojis.updated_msg') | |||
else | |||
flash[:alert] = I18n.t('admin.custom_emojis.update_failed_msg') | |||
end | |||
redirect_to admin_custom_emojis_path(page: params[:page], **@filter_params) | |||
end | |||
def destroy | |||
authorize @custom_emoji, :destroy? | |||
@custom_emoji.destroy! | |||
log_action :destroy, @custom_emoji | |||
flash[:notice] = I18n.t('admin.custom_emojis.destroyed_msg') | |||
redirect_to admin_custom_emojis_path(page: params[:page], **@filter_params) | |||
end | |||
def copy | |||
authorize @custom_emoji, :copy? | |||
emoji = CustomEmoji.find_or_initialize_by(domain: nil, | |||
shortcode: @custom_emoji.shortcode) | |||
emoji.image = @custom_emoji.image | |||
if emoji.save | |||
log_action :create, emoji | |||
flash[:notice] = I18n.t('admin.custom_emojis.copied_msg') | |||
else | |||
flash[:alert] = I18n.t('admin.custom_emojis.copy_failed_msg') | |||
end | |||
redirect_to admin_custom_emojis_path(page: params[:page], **@filter_params) | |||
end | |||
def enable | |||
authorize @custom_emoji, :enable? | |||
@custom_emoji.update!(disabled: false) | |||
log_action :enable, @custom_emoji | |||
flash[:notice] = I18n.t('admin.custom_emojis.enabled_msg') | |||
redirect_to admin_custom_emojis_path(page: params[:page], **@filter_params) | |||
end | |||
def disable | |||
authorize @custom_emoji, :disable? | |||
@custom_emoji.update!(disabled: true) | |||
log_action :disable, @custom_emoji | |||
flash[:notice] = I18n.t('admin.custom_emojis.disabled_msg') | |||
redirect_to admin_custom_emojis_path(page: params[:page], **@filter_params) | |||
def batch | |||
@form = Form::CustomEmojiBatch.new(form_custom_emoji_batch_params.merge(current_account: current_account, action: action_from_button)) | |||
@form.save | |||
rescue ActionController::ParameterMissing | |||
flash[:alert] = I18n.t('admin.accounts.no_account_selected') | |||
ensure | |||
redirect_to admin_custom_emojis_path(filter_params) | |||
end | |||
private | |||
def set_custom_emoji | |||
@custom_emoji = CustomEmoji.find(params[:id]) | |||
end | |||
def set_filter_params | |||
@filter_params = filter_params.to_hash.symbolize_keys | |||
end | |||
def resource_params | |||
params.require(:custom_emoji).permit(:shortcode, :image, :visible_in_picker) | |||
end | |||
@@ -103,12 +48,29 @@ module Admin | |||
end | |||
def filter_params | |||
params.permit( | |||
:local, | |||
:remote, | |||
:by_domain, | |||
:shortcode | |||
) | |||
params.slice(:page, *CustomEmojiFilter::KEYS).permit(:page, *CustomEmojiFilter::KEYS) | |||
end | |||
def action_from_button | |||
if params[:update] | |||
'update' | |||
elsif params[:list] | |||
'list' | |||
elsif params[:unlist] | |||
'unlist' | |||
elsif params[:enable] | |||
'enable' | |||
elsif params[:disable] | |||
'disable' | |||
elsif params[:copy] | |||
'copy' | |||
elsif params[:delete] | |||
'delete' | |||
end | |||
end | |||
def form_custom_emoji_batch_params | |||
params.require(:form_custom_emoji_batch).permit(:action, :category_id, :category_name, custom_emoji_ids: []) | |||
end | |||
end | |||
end |
@@ -5,6 +5,7 @@ module Admin | |||
class DashboardController < BaseController | |||
def index | |||
@users_count = User.count | |||
@pending_users_count = User.pending.count | |||
@registrations_week = Redis.current.get("activity:accounts:local:#{current_week}") || 0 | |||
@logins_week = Redis.current.pfcount("activity:logins:#{current_week}") | |||
@interactions_week = Redis.current.get("activity:interactions:#{current_week}") || 0 | |||
@@ -19,7 +20,7 @@ module Admin | |||
@redis_version = redis_info['redis_version'] | |||
@reports_count = Report.unresolved.count | |||
@queue_backlog = Sidekiq::Stats.new.enqueued | |||
@recent_users = User.confirmed.recent.includes(:account).limit(4) | |||
@recent_users = User.confirmed.recent.includes(:account).limit(8) | |||
@database_size = ActiveRecord::Base.connection.execute('SELECT pg_database_size(current_database())').first['pg_database_size'] | |||
@redis_size = redis_info['used_memory'] | |||
@ldap_enabled = ENV['LDAP_ENABLED'] == 'true' | |||
@@ -27,9 +28,14 @@ module Admin | |||
@saml_enabled = ENV['SAML_ENABLED'] == 'true' | |||
@pam_enabled = ENV['PAM_ENABLED'] == 'true' | |||
@hidden_service = ENV['ALLOW_ACCESS_TO_HIDDEN_SERVICE'] == 'true' | |||
@trending_hashtags = TrendingTags.get(7) | |||
@trending_hashtags = TrendingTags.get(10, filtered: false) | |||
@pending_tags_count = Tag.pending_review.count | |||
@authorized_fetch = authorized_fetch_mode? | |||
@whitelist_enabled = whitelist_mode? | |||
@profile_directory = Setting.profile_directory | |||
@timeline_preview = Setting.timeline_preview | |||
@spam_check_enabled = Setting.spam_check_enabled | |||
@trends_enabled = Setting.trends | |||
end | |||
private | |||
@@ -39,7 +45,13 @@ module Admin | |||
end | |||
def redis_info | |||
@redis_info ||= Redis.current.info | |||
@redis_info ||= begin | |||
if Redis.current.is_a?(Redis::Namespace) | |||
Redis.current.redis.info | |||
else | |||
Redis.current.info | |||
end | |||
end | |||
end | |||
end | |||
end |
@@ -0,0 +1,40 @@ | |||
# frozen_string_literal: true | |||
class Admin::DomainAllowsController < Admin::BaseController | |||
before_action :set_domain_allow, only: [:destroy] | |||
def new | |||
authorize :domain_allow, :create? | |||
@domain_allow = DomainAllow.new(domain: params[:_domain]) | |||
end | |||
def create | |||
authorize :domain_allow, :create? | |||
@domain_allow = DomainAllow.new(resource_params) | |||
if @domain_allow.save | |||
log_action :create, @domain_allow | |||
redirect_to admin_instances_path, notice: I18n.t('admin.domain_allows.created_msg') | |||
else | |||
render :new | |||
end | |||
end | |||
def destroy | |||
authorize @domain_allow, :destroy? | |||
UnallowDomainService.new.call(@domain_allow) | |||
redirect_to admin_instances_path, notice: I18n.t('admin.domain_allows.destroyed_msg') | |||
end | |||
private | |||
def set_domain_allow | |||
@domain_allow = DomainAllow.find(params[:id]) | |||
end | |||
def resource_params | |||
params.require(:domain_allow).permit(:domain) | |||
end | |||
end |
@@ -2,24 +2,56 @@ | |||
module Admin | |||
class DomainBlocksController < BaseController | |||
before_action :set_domain_block, only: [:show, :destroy] | |||
before_action :set_domain_block, only: [:show, :destroy, :edit, :update] | |||
def new | |||
authorize :domain_block, :create? | |||
@domain_block = DomainBlock.new(domain: params[:_domain]) | |||
end | |||
def edit | |||
authorize :domain_block, :create? | |||
end | |||
def create | |||
authorize :domain_block, :create? | |||
@domain_block = DomainBlock.new(resource_params) | |||
existing_domain_block = resource_params[:domain].present? ? DomainBlock.rule_for(resource_params[:domain]) : nil | |||
if existing_domain_block.present? && !@domain_block.stricter_than?(existing_domain_block) | |||
@domain_block.save | |||
flash.now[:alert] = I18n.t('admin.domain_blocks.existing_domain_block_html', name: existing_domain_block.domain, unblock_url: admin_domain_block_path(existing_domain_block)).html_safe # rubocop:disable Rails/OutputSafety | |||
@domain_block.errors[:domain].clear | |||
render :new | |||
else | |||
if existing_domain_block.present? | |||
@domain_block = existing_domain_block | |||
@domain_block.update(resource_params) | |||
end | |||
if @domain_block.save | |||
DomainBlockWorker.perform_async(@domain_block.id) | |||
log_action :create, @domain_block | |||
redirect_to admin_instances_path(limited: '1'), notice: I18n.t('admin.domain_blocks.created_msg') | |||
else | |||
render :new | |||
end | |||
end | |||
end | |||
def update | |||
authorize :domain_block, :create? | |||
@domain_block.update(update_params) | |||
severity_changed = @domain_block.severity_changed? | |||
if @domain_block.save | |||
DomainBlockWorker.perform_async(@domain_block.id) | |||
DomainBlockWorker.perform_async(@domain_block.id, severity_changed) | |||
log_action :create, @domain_block | |||
redirect_to admin_instances_path(limited: '1'), notice: I18n.t('admin.domain_blocks.created_msg') | |||
else | |||
render :new | |||
render :edit | |||
end | |||
end | |||
@@ -29,7 +61,7 @@ module Admin | |||
def destroy | |||
authorize @domain_block, :destroy? | |||
UnblockDomainService.new.call(@domain_block, retroactive_unblock?) | |||
UnblockDomainService.new.call(@domain_block) | |||
log_action :destroy, @domain_block | |||
redirect_to admin_instances_path(limited: '1'), notice: I18n.t('admin.domain_blocks.destroyed_msg') | |||
end | |||
@@ -40,12 +72,12 @@ module Admin | |||
@domain_block = DomainBlock.find(params[:id]) | |||
end | |||
def resource_params | |||
params.require(:domain_block).permit(:domain, :severity, :reject_media, :reject_reports, :retroactive) | |||
def update_params | |||
params.require(:domain_block).permit(:severity, :reject_media, :reject_reports, :private_comment, :public_comment) | |||
end | |||
def retroactive_unblock? | |||
ActiveRecord::Type.lookup(:boolean).cast(resource_params[:retroactive]) | |||
def resource_params | |||
params.require(:domain_block).permit(:domain, :severity, :reject_media, :reject_reports, :private_comment, :public_comment) | |||
end | |||
end | |||
end |
@@ -1,18 +0,0 @@ | |||
# frozen_string_literal: true | |||
module Admin | |||
class FollowersController < BaseController | |||
before_action :set_account | |||
PER_PAGE = 40 | |||
def index | |||
authorize :account, :index? | |||
@followers = @account.followers.local.recent.page(params[:page]).per(PER_PAGE) | |||
end | |||
def set_account | |||
@account = Account.find(params[:account_id]) | |||
end | |||
end | |||
end |
@@ -2,6 +2,10 @@ | |||
module Admin | |||
class InstancesController < BaseController | |||
before_action :set_domain_block, only: :show | |||
before_action :set_domain_allow, only: :show | |||
before_action :set_instance, only: :show | |||
def index | |||
authorize :instance, :index? | |||
@@ -11,20 +15,40 @@ module Admin | |||
def show | |||
authorize :instance, :show? | |||
@instance = Instance.new(Account.by_domain_accounts.find_by(domain: params[:id]) || DomainBlock.find_by!(domain: params[:id])) | |||
@following_count = Follow.where(account: Account.where(domain: params[:id])).count | |||
@followers_count = Follow.where(target_account: Account.where(domain: params[:id])).count | |||
@reports_count = Report.where(target_account: Account.where(domain: params[:id])).count | |||
@blocks_count = Block.where(target_account: Account.where(domain: params[:id])).count | |||
@available = DeliveryFailureTracker.available?(Account.select(:shared_inbox_url).where(domain: params[:id]).first&.shared_inbox_url) | |||
@media_storage = MediaAttachment.where(account: Account.where(domain: params[:id])).sum(:file_file_size) | |||
@domain_block = DomainBlock.find_by(domain: params[:id]) | |||
@private_comment = @domain_block&.private_comment | |||
@public_comment = @domain_block&.public_comment | |||
end | |||
private | |||
def set_domain_block | |||
@domain_block = DomainBlock.rule_for(params[:id]) | |||
end | |||
def set_domain_allow | |||
@domain_allow = DomainAllow.rule_for(params[:id]) | |||
end | |||
def set_instance | |||
resource = Account.by_domain_accounts.find_by(domain: params[:id]) | |||
resource ||= @domain_block | |||
resource ||= @domain_allow | |||
if resource | |||
@instance = Instance.new(resource) | |||
else | |||
not_found | |||
end | |||
end | |||
def filtered_instances | |||
InstanceFilter.new(filter_params).results | |||
InstanceFilter.new(whitelist_mode? ? { allowed: true } : filter_params).results | |||
end | |||
def paginated_instances | |||
@@ -38,7 +62,7 @@ module Admin | |||
end | |||
def filter_params | |||
params.permit(:limited, :by_domain) | |||
params.slice(*InstanceFilter::KEYS).permit(*InstanceFilter::KEYS) | |||
end | |||
end | |||
end |
@@ -47,7 +47,7 @@ module Admin | |||
end | |||
def filter_params | |||
params.permit(:available, :expired) | |||
params.slice(*InviteFilter::KEYS).permit(*InviteFilter::KEYS) | |||
end | |||
end | |||
end |
@@ -0,0 +1,25 @@ | |||
# frozen_string_literal: true | |||
module Admin | |||
class RelationshipsController < BaseController | |||
before_action :set_account | |||
PER_PAGE = 40 | |||
def index | |||
authorize :account, :index? | |||
@accounts = RelationshipFilter.new(@account, filter_params).results.page(params[:page]).per(PER_PAGE) | |||
end | |||
private | |||
def set_account | |||
@account = Account.find(params[:account_id]) | |||
end | |||
def filter_params | |||
params.slice(*RelationshipFilter::KEYS).permit(*RelationshipFilter::KEYS) | |||
end | |||
end | |||
end |
@@ -3,6 +3,7 @@ | |||
module Admin | |||
class RelaysController < BaseController | |||
before_action :set_relay, except: [:index, :new, :create] | |||
before_action :require_signatures_enabled!, only: [:new, :create, :enable] | |||
def index | |||
authorize :relay, :update? | |||
@@ -11,7 +12,7 @@ module Admin | |||
def new | |||
authorize :relay, :update? | |||
@relay = Relay.new(inbox_url: Relay::PRESET_RELAY) | |||
@relay = Relay.new | |||
end | |||
def create | |||
@@ -54,5 +55,9 @@ module Admin | |||
def resource_params | |||
params.require(:relay).permit(:inbox_url) | |||
end | |||
def require_signatures_enabled! | |||
redirect_to admin_relays_path, alert: I18n.t('admin.relays.signatures_not_enabled') if authorized_fetch_mode? | |||
end | |||
end | |||
end |
@@ -5,10 +5,10 @@ module Admin | |||
before_action :set_report_note, only: [:destroy] | |||
def create | |||
authorize ReportNote, :create? | |||
authorize :report_note, :create? | |||
@report_note = current_account.report_notes.new(resource_params) | |||
@report = @report_note.report | |||
@report = @report_note.report | |||
if @report_note.save | |||
if params[:create_and_resolve] | |||
@@ -26,9 +26,8 @@ module Admin | |||
redirect_to admin_report_path(@report), notice: I18n.t('admin.report_notes.created_msg') | |||
else | |||
@report_notes = @report.notes.latest | |||
@report_history = @report.history | |||
@form = Form::StatusBatch.new | |||
@report_notes = (@report.notes.latest + @report.history + @report.target_account.targeted_account_warnings.latest.custom).sort_by(&:created_at) | |||
@form = Form::StatusBatch.new | |||
render template: 'admin/reports/show' | |||
end | |||
@@ -52,11 +52,7 @@ module Admin | |||
end | |||
def filter_params | |||
params.permit( | |||
:account_id, | |||
:resolved, | |||
:target_account_id | |||
) | |||
params.slice(*ReportFilter::KEYS).permit(*ReportFilter::KEYS) | |||
end | |||
def set_report | |||
@@ -2,43 +2,102 @@ | |||
module Admin | |||
class TagsController < BaseController | |||
before_action :set_tags, only: :index | |||
before_action :set_tag, except: :index | |||
before_action :set_filter_params | |||
before_action :set_tag, except: [:index, :batch, :approve_all, :reject_all] | |||
before_action :set_usage_by_domain, except: [:index, :batch, :approve_all, :reject_all] | |||
before_action :set_counters, except: [:index, :batch, :approve_all, :reject_all] | |||
def index | |||
authorize :tag, :index? | |||
@tags = filtered_tags.page(params[:page]) | |||
@form = Form::TagBatch.new | |||
end | |||
def hide | |||
authorize @tag, :hide? | |||
@tag.account_tag_stat.update!(hidden: true) | |||
redirect_to admin_tags_path(@filter_params) | |||
def batch | |||
@form = Form::TagBatch.new(form_tag_batch_params.merge(current_account: current_account, action: action_from_button)) | |||
@form.save | |||
rescue ActionController::ParameterMissing | |||
flash[:alert] = I18n.t('admin.accounts.no_account_selected') | |||
ensure | |||
redirect_to admin_tags_path(filter_params) | |||
end | |||
def unhide | |||
authorize @tag, :unhide? | |||
@tag.account_tag_stat.update!(hidden: false) | |||
redirect_to admin_tags_path(@filter_params) | |||
def approve_all | |||
Form::TagBatch.new(current_account: current_account, tag_ids: Tag.pending_review.pluck(:id), action: 'approve').save | |||
redirect_to admin_tags_path(filter_params) | |||
end | |||
private | |||
def reject_all | |||
Form::TagBatch.new(current_account: current_account, tag_ids: Tag.pending_review.pluck(:id), action: 'reject').save | |||
redirect_to admin_tags_path(filter_params) | |||
end | |||
def show | |||
authorize @tag, :show? | |||
end | |||
def update | |||
authorize @tag, :update? | |||
def set_tags | |||
@tags = Tag.discoverable | |||
@tags.merge!(Tag.hidden) if filter_params[:hidden] | |||
if @tag.update(tag_params.merge(reviewed_at: Time.now.utc)) | |||
redirect_to admin_tag_path(@tag.id), notice: I18n.t('admin.tags.updated_msg') | |||
else | |||
render :show | |||
end | |||
end | |||
private | |||
def set_tag | |||
@tag = Tag.find(params[:id]) | |||
end | |||
def set_filter_params | |||
@filter_params = filter_params.to_hash.symbolize_keys | |||
def set_usage_by_domain | |||
@usage_by_domain = @tag.statuses | |||
.with_public_visibility | |||
.excluding_silenced_accounts | |||
.where(Status.arel_table[:id].gteq(Mastodon::Snowflake.id_at(Time.now.utc.beginning_of_day))) | |||
.joins(:account) | |||
.group('accounts.domain') | |||
.reorder('statuses_count desc') | |||
.pluck('accounts.domain, count(*) AS statuses_count') | |||
end | |||
def set_counters | |||
@accounts_today = @tag.history.first[:accounts] | |||
@accounts_week = Redis.current.pfcount(*current_week_days.map { |day| "activity:tags:#{@tag.id}:#{day}:accounts" }) | |||
end | |||
def filtered_tags | |||
TagFilter.new(filter_params).results | |||
end | |||
def filter_params | |||
params.permit(:hidden) | |||
params.slice(:page, *TagFilter::KEYS).permit(:page, *TagFilter::KEYS) | |||
end | |||
def tag_params | |||
params.require(:tag).permit(:name, :trendable, :usable, :listable) | |||
end | |||
def current_week_days | |||
now = Time.now.utc.beginning_of_day.to_date | |||
(Date.commercial(now.cwyear, now.cweek)..now).map do |date| | |||
date.to_time(:utc).beginning_of_day.to_i | |||
end | |||
end | |||
def form_tag_batch_params | |||
params.require(:form_tag_batch).permit(:action, tag_ids: []) | |||
end | |||
def action_from_button | |||
if params[:approve] | |||
'approve' | |||
elsif params[:reject] | |||
'reject' | |||
end | |||
end | |||
end | |||
end |
@@ -8,6 +8,7 @@ module Admin | |||
authorize @user, :disable_2fa? | |||
@user.disable_two_factor! | |||
log_action :disable_2fa, @user | |||
UserMailer.two_factor_disabled(@user).deliver_later! | |||
redirect_to admin_accounts_path | |||
end | |||
@@ -7,14 +7,23 @@ class Api::BaseController < ApplicationController | |||
include RateLimitHeaders | |||
skip_before_action :store_current_location | |||
skip_before_action :check_user_permissions | |||
skip_before_action :require_functional! | |||
before_action :require_authenticated_user!, if: :disallow_unauthenticated_api_access? | |||
before_action :set_cache_headers | |||
protect_from_forgery with: :null_session | |||
skip_around_action :set_locale | |||
rescue_from ActiveRecord::RecordInvalid, Mastodon::ValidationError do |e| | |||
render json: { error: e.to_s }, status: 422 | |||
end | |||
rescue_from ActiveRecord::RecordNotUnique do | |||
render json: { error: 'Duplicate record' }, status: 422 | |||
end | |||
rescue_from ActiveRecord::RecordNotFound do | |||
render json: { error: 'Record not found' }, status: 404 | |||
end | |||
@@ -31,6 +40,14 @@ class Api::BaseController < ApplicationController | |||
render json: { error: 'This action is not allowed' }, status: 403 | |||
end | |||
rescue_from Mastodon::RaceConditionError do | |||
render json: { error: 'There was a temporary problem serving your request, please try again' }, status: 503 | |||
end | |||
rescue_from ActionController::ParameterMissing do |e| | |||
render json: { error: e.to_s }, status: 400 | |||
end | |||
def doorkeeper_unauthorized_render_options(error: nil) | |||
{ json: { error: (error.try(:description) || 'Not authorized') } } | |||
end | |||
@@ -67,6 +84,10 @@ class Api::BaseController < ApplicationController | |||
nil | |||
end | |||
def require_authenticated_user! | |||
render json: { error: 'This method requires an authenticated user' }, status: 401 unless current_user | |||
end | |||
def require_user! | |||
if !current_user | |||
render json: { error: 'This method requires an authenticated user' }, status: 422 | |||
@@ -88,4 +109,12 @@ class Api::BaseController < ApplicationController | |||
def authorize_if_got_token!(*scopes) | |||
doorkeeper_authorize!(*scopes) if doorkeeper_token | |||
end | |||
def set_cache_headers | |||
response.headers['Cache-Control'] = 'no-cache, no-store, max-age=0, must-revalidate' | |||
end | |||
def disallow_unauthenticated_api_access? | |||
authorized_fetch_mode? | |||
end | |||
end |
@@ -1,15 +1,25 @@ | |||
# frozen_string_literal: true | |||
class Api::OEmbedController < Api::BaseController | |||
respond_to :json | |||
skip_before_action :require_authenticated_user! | |||
before_action :set_status | |||
before_action :require_public_status! | |||
def show | |||
@status = status_finder.status | |||
render json: @status, serializer: OEmbedSerializer, width: maxwidth_or_default, height: maxheight_or_default | |||
end | |||
private | |||
def set_status | |||
@status = status_finder.status | |||
end | |||
def require_public_status! | |||
not_found if @status.hidden? | |||
end | |||
def status_finder | |||
StatusFinder.new(params[:url]) | |||
end | |||
@@ -1,10 +1,11 @@ | |||
# frozen_string_literal: true | |||
class Api::ProofsController < Api::BaseController | |||
before_action :set_account | |||
include AccountOwnedConcern | |||
skip_before_action :require_authenticated_user! | |||
before_action :set_provider | |||
before_action :check_account_approval | |||
before_action :check_account_suspension | |||
def index | |||
render json: @account, serializer: @provider.serializer_class | |||
@@ -16,15 +17,7 @@ class Api::ProofsController < Api::BaseController | |||
@provider = ProofProvider.find(params[:provider]) || raise(ActiveRecord::RecordNotFound) | |||
end | |||
def set_account | |||
@account = Account.find_local!(params[:username]) | |||
end | |||
def check_account_approval | |||
not_found if @account.user_pending? | |||
end | |||
def check_account_suspension | |||
gone if @account.suspended? | |||
def username_param | |||
params[:username] | |||
end | |||
end |
@@ -1,73 +0,0 @@ | |||
# frozen_string_literal: true | |||
class Api::PushController < Api::BaseController | |||
include SignatureVerification | |||
def update | |||
response, status = process_push_request | |||
render plain: response, status: status | |||
end | |||
private | |||
def process_push_request | |||
case hub_mode | |||
when 'subscribe' | |||
Pubsubhubbub::SubscribeService.new.call(account_from_topic, hub_callback, hub_secret, hub_lease_seconds, verified_domain) | |||
when 'unsubscribe' | |||
Pubsubhubbub::UnsubscribeService.new.call(account_from_topic, hub_callback) | |||
else | |||
["Unknown mode: #{hub_mode}", 422] | |||
end | |||
end | |||
def hub_mode | |||
params['hub.mode'] | |||
end | |||
def hub_topic | |||
params['hub.topic'] | |||
end | |||
def hub_callback | |||
params['hub.callback'] | |||
end | |||
def hub_lease_seconds | |||
params['hub.lease_seconds'] | |||
end | |||
def hub_secret | |||
params['hub.secret'] | |||
end | |||
def account_from_topic | |||
if hub_topic.present? && local_domain? && account_feed_path? | |||
Account.find_local(hub_topic_params[:username]) | |||
end | |||
end | |||
def hub_topic_params | |||
@_hub_topic_params ||= Rails.application.routes.recognize_path(hub_topic_uri.path) | |||
end | |||
def hub_topic_uri | |||
@_hub_topic_uri ||= Addressable::URI.parse(hub_topic).normalize | |||
end | |||
def local_domain? | |||
TagManager.instance.web_domain?(hub_topic_domain) | |||
end | |||
def verified_domain | |||
return signed_request_account.domain if signed_request_account | |||
end | |||
def hub_topic_domain | |||
hub_topic_uri.host + (hub_topic_uri.port ? ":#{hub_topic_uri.port}" : '') | |||
end | |||
def account_feed_path? | |||
hub_topic_params[:controller] == 'accounts' && hub_topic_params[:action] == 'show' && hub_topic_params[:format] == 'atom' | |||
end | |||
end |
@@ -1,37 +0,0 @@ | |||
# frozen_string_literal: true | |||
class Api::SalmonController < Api::BaseController | |||
include SignatureVerification | |||
before_action :set_account | |||
respond_to :txt | |||
def update | |||
if verify_payload? | |||
process_salmon | |||
head 202 | |||
elsif payload.present? | |||
render plain: signature_verification_failure_reason, status: 401 | |||
else | |||
head 400 | |||
end | |||
end | |||
private | |||
def set_account | |||
@account = Account.find(params[:id]) | |||
end | |||
def payload | |||
@_payload ||= request.body.read | |||
end | |||
def verify_payload? | |||
payload.present? && VerifySalmonService.new.call(payload) | |||
end | |||
def process_salmon | |||
SalmonWorker.perform_async(@account.id, payload.force_encoding('UTF-8')) | |||
end | |||
end |
@@ -1,51 +0,0 @@ | |||
# frozen_string_literal: true | |||
class Api::SubscriptionsController < Api::BaseController | |||
before_action :set_account | |||
respond_to :txt | |||
def show | |||
if subscription.valid?(params['hub.topic']) | |||
@account.update(subscription_expires_at: future_expires) | |||
render plain: encoded_challenge, status: 200 | |||
else | |||
head 404 | |||
end | |||
end | |||
def update | |||
if subscription.verify(body, request.headers['HTTP_X_HUB_SIGNATURE']) | |||
ProcessingWorker.perform_async(@account.id, body.force_encoding('UTF-8')) | |||
end | |||
head 200 | |||
end | |||
private | |||
def subscription | |||
@_subscription ||= @account.subscription( | |||
api_subscription_url(@account.id) | |||
) | |||
end | |||
def body | |||
@_body ||= request.body.read | |||
end | |||
def encoded_challenge | |||
HTMLEntities.new.encode(params['hub.challenge']) | |||
end | |||
def future_expires | |||
Time.now.utc + lease_seconds_or_default | |||
end | |||
def lease_seconds_or_default | |||
(params['hub.lease_seconds'] || 1.day).to_i.seconds | |||
end | |||
def set_account | |||
@account = Account.find(params[:id]) | |||
end | |||
end |
@@ -25,7 +25,7 @@ class Api::V1::Accounts::CredentialsController < Api::BaseController | |||
end | |||
def user_settings_params | |||
return nil unless params.key?(:source) | |||
return nil if params[:source].blank? | |||
source_params = params.require(:source) | |||
@@ -21,11 +21,13 @@ class Api::V1::Accounts::FollowerAccountsController < Api::BaseController | |||
def load_accounts | |||
return [] if hide_results? | |||
default_accounts.merge(paginated_follows).to_a | |||
scope = default_accounts | |||
scope = scope.where.not(id: current_account.excluded_from_timeline_account_ids) unless current_account.nil? | |||
scope.merge(paginated_follows).to_a | |||
end | |||
def hide_results? | |||
(@account.user_hides_network? && current_account.id != @account.id) || (current_account && @account.blocking?(current_account)) | |||
(@account.user_hides_network? && current_account&.id != @account.id) || (current_account && @account.blocking?(current_account)) | |||
end | |||
def default_accounts | |||
@@ -21,11 +21,13 @@ class Api::V1::Accounts::FollowingAccountsController < Api::BaseController | |||
def load_accounts | |||
return [] if hide_results? | |||
default_accounts.merge(paginated_follows).to_a | |||
scope = default_accounts | |||
scope = scope.where.not(id: current_account.excluded_from_timeline_account_ids) unless current_account.nil? | |||
scope.merge(paginated_follows).to_a | |||
end | |||
def hide_results? | |||
(@account.user_hides_network? && current_account.id != @account.id) || (current_account && @account.blocking?(current_account)) | |||
(@account.user_hides_network? && current_account&.id != @account.id) || (current_account && @account.blocking?(current_account)) | |||
end | |||
def default_accounts | |||
@@ -3,7 +3,8 @@ | |||
class Api::V1::Accounts::StatusesController < Api::BaseController | |||
before_action -> { authorize_if_got_token! :read, :'read:statuses' } | |||
before_action :set_account | |||
after_action :insert_pagination_headers | |||
after_action :insert_pagination_headers, unless: -> { truthy_param?(:pinned) } | |||
respond_to :json | |||
@@ -28,14 +29,13 @@ class Api::V1::Accounts::StatusesController < Api::BaseController | |||
def account_statuses | |||
statuses = truthy_param?(:pinned) ? pinned_scope : permitted_account_statuses | |||
statuses = statuses.paginate_by_id(limit_param(DEFAULT_STATUSES_LIMIT), params_slice(:max_id, :since_id, :min_id)) | |||
statuses.merge!(only_media_scope) if truthy_param?(:only_media) | |||
statuses.merge!(no_replies_scope) if truthy_param?(:exclude_replies) | |||
statuses.merge!(no_reblogs_scope) if truthy_param?(:exclude_reblogs) | |||
statuses.merge!(hashtag_scope) if params[:tagged].present? | |||
statuses | |||
statuses.paginate_by_id(limit_param(DEFAULT_STATUSES_LIMIT), params_slice(:max_id, :since_id, :min_id)) | |||
end | |||
def permitted_account_statuses | |||
@@ -57,6 +57,8 @@ class Api::V1::Accounts::StatusesController < Api::BaseController | |||
end | |||
def pinned_scope | |||
return Status.none if @account.blocking?(current_account) | |||
@account.pinned_statuses | |||
end | |||
@@ -12,6 +12,8 @@ class Api::V1::AccountsController < Api::BaseController | |||
before_action :check_account_suspension, only: [:show] | |||
before_action :check_enabled_registrations, only: [:create] | |||
skip_before_action :require_authenticated_user!, only: :create | |||
respond_to :json | |||
def show | |||
@@ -31,7 +33,7 @@ class Api::V1::AccountsController < Api::BaseController | |||
def follow | |||
FollowService.new.call(current_user.account, @account, reblogs: truthy_param?(:reblogs)) | |||
options = @account.locked? ? {} : { following_map: { @account.id => { reblogs: truthy_param?(:reblogs) } }, requested_map: { @account.id => false } } | |||
options = @account.locked? || current_user.account.silenced? ? {} : { following_map: { @account.id => { reblogs: truthy_param?(:reblogs) } }, requested_map: { @account.id => false } } | |||
render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships(options) | |||
end | |||
@@ -76,7 +78,7 @@ class Api::V1::AccountsController < Api::BaseController | |||
end | |||
def account_params | |||
params.permit(:username, :email, :password, :agreement, :locale) | |||
params.permit(:username, :email, :password, :agreement, :locale, :reason) | |||
end | |||
def check_enabled_registrations | |||
@@ -0,0 +1,32 @@ | |||
# frozen_string_literal: true | |||
class Api::V1::Admin::AccountActionsController < Api::BaseController | |||
before_action -> { doorkeeper_authorize! :'admin:write', :'admin:write:accounts' } | |||
before_action :require_staff! | |||
before_action :set_account | |||
def create | |||
account_action = Admin::AccountAction.new(resource_params) | |||
account_action.target_account = @account | |||
account_action.current_account = current_account | |||
account_action.save! | |||
render_empty | |||
end | |||
private | |||
def set_account | |||
@account = Account.find(params[:account_id]) | |||
end | |||
def resource_params | |||
params.permit( | |||
:type, | |||
:report_id, | |||
:warning_preset_id, | |||
:text, | |||
:send_email_notification | |||
) | |||
end | |||
end |
@@ -0,0 +1,128 @@ | |||
# frozen_string_literal: true | |||
class Api::V1::Admin::AccountsController < Api::BaseController | |||
include Authorization | |||
include AccountableConcern | |||
LIMIT = 100 | |||
before_action -> { doorkeeper_authorize! :'admin:read', :'admin:read:accounts' }, only: [:index, :show] | |||
before_action -> { doorkeeper_authorize! :'admin:write', :'admin:write:accounts' }, except: [:index, :show] | |||
before_action :require_staff! | |||
before_action :set_accounts, only: :index | |||
before_action :set_account, except: :index | |||
before_action :require_local_account!, only: [:enable, :approve, :reject] | |||
after_action :insert_pagination_headers, only: :index | |||
FILTER_PARAMS = %i( | |||
local | |||
remote | |||
by_domain | |||
active | |||
pending | |||
disabled | |||
silenced | |||
suspended | |||
username | |||
display_name | |||
ip | |||
staff | |||
).freeze | |||
PAGINATION_PARAMS = (%i(limit) + FILTER_PARAMS).freeze | |||
def index | |||
authorize :account, :index? | |||
render json: @accounts, each_serializer: REST::Admin::AccountSerializer | |||
end | |||
def show | |||
authorize @account, :show? | |||
render json: @account, serializer: REST::Admin::AccountSerializer | |||
end | |||
def enable | |||
authorize @account.user, :enable? | |||
@account.user.enable! | |||
log_action :enable, @account.user | |||
render json: @account, serializer: REST::Admin::AccountSerializer | |||
end | |||
def approve | |||
authorize @account.user, :approve? | |||
@account.user.approve! | |||
render json: @account, serializer: REST::Admin::AccountSerializer | |||
end | |||
def reject | |||
authorize @account.user, :reject? | |||
SuspendAccountService.new.call(@account, reserve_email: false, reserve_username: false) | |||
render json: @account, serializer: REST::Admin::AccountSerializer | |||
end | |||
def unsilence | |||
authorize @account, :unsilence? | |||
@account.unsilence! | |||
log_action :unsilence, @account | |||
render json: @account, serializer: REST::Admin::AccountSerializer | |||
end | |||
def unsuspend | |||
authorize @account, :unsuspend? | |||
@account.unsuspend! | |||
log_action :unsuspend, @account | |||
render json: @account, serializer: REST::Admin::AccountSerializer | |||
end | |||
private | |||
def set_accounts | |||
@accounts = filtered_accounts.order(id: :desc).includes(user: [:invite_request, :invite]).paginate_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id)) | |||
end | |||
def set_account | |||
@account = Account.find(params[:id]) | |||
end | |||
def filtered_accounts | |||
AccountFilter.new(filter_params).results | |||
end | |||
def filter_params | |||
params.permit(*FILTER_PARAMS) | |||
end | |||
def insert_pagination_headers | |||
set_pagination_headers(next_path, prev_path) | |||
end | |||
def next_path | |||
api_v1_admin_accounts_url(pagination_params(max_id: pagination_max_id)) if records_continue? | |||
end | |||
def prev_path | |||
api_v1_admin_accounts_url(pagination_params(min_id: pagination_since_id)) unless @accounts.empty? | |||
end | |||
def pagination_max_id | |||
@accounts.last.id | |||
end | |||
def pagination_since_id | |||
@accounts.first.id | |||
end | |||
def records_continue? | |||
@accounts.size == limit_param(LIMIT) | |||
end | |||
def pagination_params(core_params) | |||
params.slice(*PAGINATION_PARAMS).permit(*PAGINATION_PARAMS).merge(core_params) | |||
end | |||
def require_local_account! | |||
forbidden unless @account.local? && @account.user.present? | |||
end | |||
end |
@@ -0,0 +1,108 @@ | |||
# frozen_string_literal: true | |||
class Api::V1::Admin::ReportsController < Api::BaseController | |||
include Authorization | |||
include AccountableConcern | |||
LIMIT = 100 | |||
before_action -> { doorkeeper_authorize! :'admin:read', :'admin:read:reports' }, only: [:index, :show] | |||
before_action -> { doorkeeper_authorize! :'admin:write', :'admin:write:reports' }, except: [:index, :show] | |||
before_action :require_staff! | |||
before_action :set_reports, only: :index | |||
before_action :set_report, except: :index | |||
after_action :insert_pagination_headers, only: :index | |||
FILTER_PARAMS = %i( | |||
resolved | |||
account_id | |||
target_account_id | |||
).freeze | |||
PAGINATION_PARAMS = (%i(limit) + FILTER_PARAMS).freeze | |||
def index | |||
authorize :report, :index? | |||
render json: @reports, each_serializer: REST::Admin::ReportSerializer | |||
end | |||
def show | |||
authorize @report, :show? | |||
render json: @report, serializer: REST::Admin::ReportSerializer | |||
end | |||
def assign_to_self | |||
authorize @report, :update? | |||
@report.update!(assigned_account_id: current_account.id) | |||
log_action :assigned_to_self, @report | |||
render json: @report, serializer: REST::Admin::ReportSerializer | |||
end | |||
def unassign | |||
authorize @report, :update? | |||
@report.update!(assigned_account_id: nil) | |||
log_action :unassigned, @report | |||
render json: @report, serializer: REST::Admin::ReportSerializer | |||
end | |||
def reopen | |||
authorize @report, :update? | |||
@report.unresolve! | |||
log_action :reopen, @report | |||
render json: @report, serializer: REST::Admin::ReportSerializer | |||
end | |||
def resolve | |||
authorize @report, :update? | |||
@report.resolve!(current_account) | |||
log_action :resolve, @report | |||
render json: @report, serializer: REST::Admin::ReportSerializer | |||
end | |||
private | |||
def set_reports | |||
@reports = filtered_reports.order(id: :desc).with_accounts.paginate_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id)) | |||
end | |||
def set_report | |||
@report = Report.find(params[:id]) | |||
end | |||
def filtered_reports | |||
ReportFilter.new(filter_params).results | |||
end | |||
def filter_params | |||
params.permit(*FILTER_PARAMS) | |||
end | |||
def insert_pagination_headers | |||
set_pagination_headers(next_path, prev_path) | |||
end | |||
def next_path | |||
api_v1_admin_reports_url(pagination_params(max_id: pagination_max_id)) if records_continue? | |||
end | |||
def prev_path | |||
api_v1_admin_reports_url(pagination_params(min_id: pagination_since_id)) unless @reports.empty? | |||
end | |||
def pagination_max_id | |||
@reports.last.id | |||
end | |||
def pagination_since_id | |||
@reports.first.id | |||
end | |||
def records_continue? | |||
@reports.size == limit_param(LIMIT) | |||
end | |||
def pagination_params(core_params) | |||
params.slice(*PAGINATION_PARAMS).permit(*PAGINATION_PARAMS).merge(core_params) | |||
end | |||
end |
@@ -0,0 +1,29 @@ | |||
# frozen_string_literal: true | |||
class Api::V1::Announcements::ReactionsController < Api::BaseController | |||
before_action -> { doorkeeper_authorize! :write, :'write:favourites' } | |||
before_action :require_user! | |||
before_action :set_announcement | |||
before_action :set_reaction, except: :update | |||
def update | |||
@announcement.announcement_reactions.create!(account: current_account, name: params[:id]) | |||
render_empty | |||
end | |||
def destroy | |||
@reaction.destroy! | |||
render_empty | |||
end | |||
private | |||
def set_reaction | |||
@reaction = @announcement.announcement_reactions.where(account: current_account).find_by!(name: params[:id]) | |||
end | |||
def set_announcement | |||
@announcement = Announcement.published.find(params[:announcement_id]) | |||
end | |||
end |
@@ -0,0 +1,29 @@ | |||
# frozen_string_literal: true | |||
class Api::V1::AnnouncementsController < Api::BaseController | |||
before_action -> { doorkeeper_authorize! :write, :'write:accounts' }, only: :dismiss | |||
before_action :require_user! | |||
before_action :set_announcements, only: :index | |||
before_action :set_announcement, except: :index | |||
def index | |||
render json: @announcements, each_serializer: REST::AnnouncementSerializer | |||
end | |||
def dismiss | |||
AnnouncementMute.find_or_create_by!(account: current_account, announcement: @announcement) | |||
render_empty | |||
end | |||
private | |||
def set_announcements | |||
@announcements = begin | |||
Announcement.published.chronological | |||
end | |||
end | |||
def set_announcement | |||
@announcement = Announcement.published.find(params[:id]) | |||
end | |||
end |
@@ -1,6 +1,8 @@ | |||
# frozen_string_literal: true | |||
class Api::V1::AppsController < Api::BaseController | |||
skip_before_action :require_authenticated_user! | |||
def create | |||
@app = Doorkeeper::Application.create!(application_options) | |||
render json: @app, serializer: REST::ApplicationSerializer | |||
@@ -0,0 +1,66 @@ | |||
# frozen_string_literal: true | |||
class Api::V1::BookmarksController < Api::BaseController | |||
before_action -> { doorkeeper_authorize! :read, :'read:bookmarks' } | |||
before_action :require_user! | |||
after_action :insert_pagination_headers | |||
respond_to :json | |||
def index | |||
@statuses = load_statuses | |||
render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id) | |||
end | |||
private | |||
def load_statuses | |||
cached_bookmarks | |||
end | |||
def cached_bookmarks | |||
cache_collection( | |||
Status.reorder(nil).joins(:bookmarks).merge(results), | |||
Status | |||
) | |||
end | |||
def results | |||
@_results ||= account_bookmarks.paginate_by_id( | |||
limit_param(DEFAULT_STATUSES_LIMIT), | |||
params_slice(:max_id, :since_id, :min_id) | |||
) | |||
end | |||
def account_bookmarks | |||
current_account.bookmarks | |||
end | |||
def insert_pagination_headers | |||
set_pagination_headers(next_path, prev_path) | |||
end | |||
def next_path | |||
api_v1_bookmarks_url pagination_params(max_id: pagination_max_id) if records_continue? | |||
end | |||
def prev_path | |||
api_v1_bookmarks_url pagination_params(min_id: pagination_since_id) unless results.empty? | |||
end | |||
def pagination_max_id | |||
results.last.id | |||
end | |||
def pagination_since_id | |||
results.first.id | |||
end | |||
def records_continue? | |||
results.size == limit_param(DEFAULT_STATUSES_LIMIT) | |||
end | |||
def pagination_params(core_params) | |||
params.slice(:limit).permit(:limit).merge(core_params) | |||
end | |||
end |
@@ -3,9 +3,10 @@ | |||
class Api::V1::CustomEmojisController < Api::BaseController | |||
respond_to :json | |||
skip_before_action :set_cache_headers | |||
def index | |||
render_cached_json('api:v1:custom_emojis', expires_in: 1.minute) do | |||
ActiveModelSerializers::SerializableResource.new(CustomEmoji.local.where(disabled: false), each_serializer: REST::CustomEmojiSerializer) | |||
end | |||
expires_in 3.minutes, public: true | |||
render_with_cache(each_serializer: REST::CustomEmojiSerializer) { CustomEmoji.listed.includes(:category) } | |||
end | |||
end |
@@ -0,0 +1,30 @@ | |||
# frozen_string_literal: true | |||
class Api::V1::DirectoriesController < Api::BaseController | |||
before_action :require_enabled! | |||
before_action :set_accounts | |||
def show | |||
render json: @accounts, each_serializer: REST::AccountSerializer | |||
end | |||
private | |||
def require_enabled! | |||
return not_found unless Setting.profile_directory | |||
end | |||
def set_accounts | |||
@accounts = accounts_scope.offset(params[:offset]).limit(limit_param(DEFAULT_ACCOUNTS_LIMIT)) | |||
end | |||
def accounts_scope | |||
Account.discoverable.tap do |scope| | |||
scope.merge!(Account.local) if truthy_param?(:local) | |||
scope.merge!(Account.by_recent_status) if params[:order].blank? || params[:order] == 'active' | |||
scope.merge!(Account.order(id: :desc)) if params[:order] == 'new' | |||
scope.merge!(Account.not_excluded_by_account(current_account)) if current_account | |||
scope.merge!(Account.not_domain_blocked_by_account(current_account)) if current_account && !truthy_param?(:local) | |||
end | |||
end | |||
end |
@@ -0,0 +1,20 @@ | |||
# frozen_string_literal: true | |||
class Api::V1::FeaturedTags::SuggestionsController < Api::BaseController | |||
before_action -> { doorkeeper_authorize! :read, :'read:accounts' }, only: :index | |||
before_action :require_user! | |||
before_action :set_most_used_tags, only: :index | |||
respond_to :json | |||
def index | |||
render json: @most_used_tags, each_serializer: REST::TagSerializer | |||
end | |||
private | |||
def set_most_used_tags | |||
@most_used_tags = Tag.most_used(current_account).where.not(id: current_account.featured_tags).limit(10) | |||
end | |||
end |
@@ -0,0 +1,40 @@ | |||
# frozen_string_literal: true | |||
class Api::V1::FeaturedTagsController < Api::BaseController | |||
before_action -> { doorkeeper_authorize! :read, :'read:accounts' }, only: :index | |||
before_action -> { doorkeeper_authorize! :write, :'write:accounts' }, except: :index | |||
before_action :require_user! | |||
before_action :set_featured_tags, only: :index | |||
before_action :set_featured_tag, except: [:index, :create] | |||
def index | |||
render json: @featured_tags, each_serializer: REST::FeaturedTagSerializer | |||
end | |||
def create | |||
@featured_tag = current_account.featured_tags.new(featured_tag_params) | |||
@featured_tag.reset_data | |||
@featured_tag.save! | |||
render json: @featured_tag, serializer: REST::FeaturedTagSerializer | |||
end | |||
def destroy | |||
@featured_tag.destroy! | |||
render_empty | |||
end | |||
private | |||
def set_featured_tag | |||
@featured_tag = current_account.featured_tags.find(params[:id]) | |||
end | |||
def set_featured_tags | |||
@featured_tags = current_account.featured_tags.order(statuses_count: :desc) | |||
end | |||
def featured_tag_params | |||
params.permit(:name) | |||
end | |||
end |
@@ -14,12 +14,12 @@ class Api::V1::FollowRequestsController < Api::BaseController | |||
def authorize | |||
AuthorizeFollowService.new.call(account, current_account) | |||
NotifyService.new.call(current_account, Follow.find_by(account: account, target_account: current_account)) | |||
render_empty | |||
render json: account, serializer: REST::RelationshipSerializer, relationships: relationships | |||
end | |||
def reject | |||
RejectFollowService.new.call(account, current_account) | |||
render_empty | |||
render json: account, serializer: REST::RelationshipSerializer, relationships: relationships | |||
end | |||
private | |||
@@ -28,6 +28,10 @@ class Api::V1::FollowRequestsController < Api::BaseController | |||
Account.find(params[:id]) | |||
end | |||
def relationships(**options) | |||
AccountRelationshipsPresenter.new([params[:id]], current_user.account_id, options) | |||
end | |||
def load_accounts | |||
default_accounts.merge(paginated_follow_requests).to_a | |||
end | |||
@@ -1,31 +0,0 @@ | |||
# frozen_string_literal: true | |||
class Api::V1::FollowsController < Api::BaseController | |||
before_action -> { doorkeeper_authorize! :follow, :'write:follows' } | |||
before_action :require_user! | |||
respond_to :json | |||
def create | |||
raise ActiveRecord::RecordNotFound if follow_params[:uri].blank? | |||
@account = FollowService.new.call(current_user.account, target_uri).try(:target_account) | |||
if @account.nil? | |||
username, domain = target_uri.split('@') | |||
@account = Account.find_remote!(username, domain) | |||
end | |||
render json: @account, serializer: REST::AccountSerializer | |||
end | |||
private | |||
def target_uri | |||
follow_params[:uri].strip.gsub(/\A@/, '') | |||
end | |||
def follow_params | |||
params.permit(:uri) | |||
end | |||
end |
@@ -3,10 +3,14 @@ | |||
class Api::V1::Instances::ActivityController < Api::BaseController | |||
before_action :require_enabled_api! | |||
skip_before_action :set_cache_headers | |||
skip_before_action :require_authenticated_user!, unless: :whitelist_mode? | |||
respond_to :json | |||
def show | |||
render_cached_json('api:v1:instances:activity:show', expires_in: 1.day) { activity } | |||
expires_in 1.day, public: true | |||
render_with_cache json: :activity, expires_in: 1.day | |||
end | |||
private | |||
@@ -31,6 +35,6 @@ class Api::V1::Instances::ActivityController < Api::BaseController | |||
end | |||
def require_enabled_api! | |||
head 404 unless Setting.activity_api_enabled | |||
head 404 unless Setting.activity_api_enabled && !whitelist_mode? | |||
end | |||
end |
@@ -3,15 +3,19 @@ | |||
class Api::V1::Instances::PeersController < Api::BaseController | |||
before_action :require_enabled_api! | |||
skip_before_action :set_cache_headers | |||
skip_before_action :require_authenticated_user!, unless: :whitelist_mode? | |||
respond_to :json | |||
def index | |||
render_cached_json('api:v1:instances:peers:index', expires_in: 1.day) { Account.remote.domains } | |||
expires_in 1.day, public: true | |||
render_with_cache(expires_in: 1.day) { Account.remote.domains } | |||
end | |||
private | |||
def require_enabled_api! | |||
head 404 unless Setting.peers_api_enabled | |||
head 404 unless Setting.peers_api_enabled && !whitelist_mode? | |||
end | |||
end |
@@ -3,9 +3,11 @@ | |||
class Api::V1::InstancesController < Api::BaseController | |||
respond_to :json | |||
skip_before_action :set_cache_headers | |||
skip_before_action :require_authenticated_user!, unless: :whitelist_mode? | |||
def show | |||
render_cached_json('api:v1:instances', expires_in: 5.minutes) do | |||
ActiveModelSerializers::SerializableResource.new({}, serializer: REST::InstanceSerializer) | |||
end | |||
expires_in 3.minutes, public: true | |||
render_with_cache json: {}, serializer: REST::InstanceSerializer, root: 'instance' | |||
end | |||
end |
@@ -0,0 +1,44 @@ | |||
# frozen_string_literal: true | |||
class Api::V1::MarkersController < Api::BaseController | |||
before_action -> { doorkeeper_authorize! :read, :'read:statuses' }, only: [:index] | |||
before_action -> { doorkeeper_authorize! :write, :'write:statuses' }, except: [:index] | |||
before_action :require_user! | |||
def index | |||
@markers = current_user.markers.where(timeline: Array(params[:timeline])).each_with_object({}) { |marker, h| h[marker.timeline] = marker } | |||
render json: serialize_map(@markers) | |||
end | |||
def create | |||
Marker.transaction do | |||
@markers = {} | |||
resource_params.each_pair do |timeline, timeline_params| | |||
@markers[timeline] = current_user.markers.find_or_initialize_by(timeline: timeline) | |||
@markers[timeline].update!(timeline_params) | |||
end | |||
end | |||
render json: serialize_map(@markers) | |||
rescue ActiveRecord::StaleObjectError | |||
render json: { error: 'Conflict during update, please try again' }, status: 409 | |||
end | |||
private | |||
def serialize_map(map) | |||
serialized = {} | |||
map.each_pair do |key, value| | |||
serialized[key] = ActiveModelSerializers::SerializableResource.new(value, serializer: REST::MarkerSerializer).as_json | |||
end | |||
Oj.dump(serialized) | |||
end | |||
def resource_params | |||
params.slice(*Marker::TIMELINES).permit(*Marker::TIMELINES.map { |timeline| { timeline.to_sym => [:last_read_id] } }) | |||
end | |||
end |
@@ -4,9 +4,6 @@ class Api::V1::MediaController < Api::BaseController | |||
before_action -> { doorkeeper_authorize! :write, :'write:media' } | |||
before_action :require_user! | |||
include ObfuscateFilename | |||
obfuscate_filename :file | |||
respond_to :json | |||
def create | |||
@@ -44,7 +44,7 @@ class Api::V1::NotificationsController < Api::BaseController | |||
end | |||
def browserable_account_notifications | |||
current_account.notifications.browserable(exclude_types) | |||
current_account.notifications.browserable(exclude_types, from_account) | |||
end | |||
def target_statuses_from_notifications | |||
@@ -81,6 +81,10 @@ class Api::V1::NotificationsController < Api::BaseController | |||
val | |||
end | |||
def from_account | |||
params[:account_id] | |||
end | |||
def pagination_params(core_params) | |||
params.slice(:limit, :exclude_types).permit(:limit, exclude_types: []).merge(core_params) | |||
end | |||
@@ -1,13 +1,28 @@ | |||
# frozen_string_literal: true | |||
class Api::V1::PollsController < Api::BaseController | |||
include Authorization | |||
before_action -> { authorize_if_got_token! :read, :'read:statuses' }, only: :show | |||
before_action :set_poll | |||
before_action :refresh_poll | |||
respond_to :json | |||
def show | |||
render json: @poll, serializer: REST::PollSerializer, include_results: true | |||
end | |||
private | |||
def set_poll | |||
@poll = Poll.attached.find(params[:id]) | |||
authorize @poll.status, :show? | |||
rescue Mastodon::NotPermittedError | |||
raise ActiveRecord::RecordNotFound | |||
end | |||
def refresh_poll | |||
ActivityPub::FetchRemotePollService.new.call(@poll, current_account) if user_signed_in? && @poll.possibly_stale? | |||
render json: @poll, serializer: REST::PollSerializer, include_results: true | |||
end | |||
end |
@@ -51,6 +51,6 @@ class Api::V1::Push::SubscriptionsController < Api::BaseController | |||
def data_params | |||
return {} if params[:data].blank? | |||
params.require(:data).permit(alerts: [:follow, :favourite, :reblog, :mention]) | |||
params.require(:data).permit(alerts: [:follow, :follow_request, :favourite, :reblog, :mention, :poll]) | |||
end | |||
end |
@@ -21,7 +21,7 @@ class Api::V1::ReportsController < Api::BaseController | |||
private | |||
def reported_status_ids | |||
reported_account.statuses.find(status_ids).pluck(:id) | |||
reported_account.statuses.with_discarded.find(status_ids).pluck(:id) | |||
end | |||
def status_ids | |||
@@ -1,32 +0,0 @@ | |||
# frozen_string_literal: true | |||
class Api::V1::SearchController < Api::BaseController | |||
include Authorization | |||
RESULTS_LIMIT = 20 | |||
before_action -> { doorkeeper_authorize! :read, :'read:search' } | |||
before_action :require_user! | |||
respond_to :json | |||
def index | |||
@search = Search.new(search_results) | |||
render json: @search, serializer: REST::SearchSerializer | |||
end | |||
private | |||
def search_results | |||
SearchService.new.call( | |||
params[:q], | |||
current_account, | |||
limit_param(RESULTS_LIMIT), | |||
search_params.merge(resolve: truthy_param?(:resolve)) | |||
) | |||
end | |||
def search_params | |||
params.permit(:type, :offset, :min_id, :max_id, :account_id) | |||
end | |||
end |
@@ -0,0 +1,32 @@ | |||
# frozen_string_literal: true | |||
class Api::V1::Statuses::BookmarksController < Api::BaseController | |||
include Authorization | |||
before_action -> { doorkeeper_authorize! :write, :'write:bookmarks' } | |||
before_action :require_user! | |||
before_action :set_status | |||
respond_to :json | |||
def create | |||
current_account.bookmarks.find_or_create_by!(account: current_account, status: @status) | |||
render json: @status, serializer: REST::StatusSerializer | |||
end | |||
def destroy | |||
bookmark = current_account.bookmarks.find_by(status: @status) | |||
bookmark&.destroy! | |||
render json: @status, serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new([@status], current_account.id, bookmarks_map: { @status.id => false }) | |||
end | |||
private | |||
def set_status | |||
@status = Status.find(params[:status_id]) | |||
authorize @status, :show? | |||
rescue Mastodon::NotPermittedError | |||
not_found | |||
end | |||
end |
@@ -17,7 +17,9 @@ class Api::V1::Statuses::FavouritedByAccountsController < Api::BaseController | |||
private | |||
def load_accounts | |||
default_accounts.merge(paginated_favourites).to_a | |||
scope = default_accounts | |||
scope = scope.where.not(id: current_account.excluded_from_timeline_account_ids) unless current_account.nil? | |||
scope.merge(paginated_favourites).to_a | |||
end | |||
def default_accounts | |||
@@ -67,8 +69,7 @@ class Api::V1::Statuses::FavouritedByAccountsController < Api::BaseController | |||
@status = Status.find(params[:status_id]) | |||
authorize @status, :show? | |||
rescue Mastodon::NotPermittedError | |||
# Reraise in order to get a 404 instead of a 403 error code | |||
raise ActiveRecord::RecordNotFound | |||
not_found | |||
end | |||
def pagination_params(core_params) | |||
@@ -5,34 +5,26 @@ class Api::V1::Statuses::FavouritesController < Api::BaseController | |||
before_action -> { doorkeeper_authorize! :write, :'write:favourites' } | |||
before_action :require_user! | |||
before_action :set_status | |||
respond_to :json | |||
def create | |||
@status = favourited_status | |||
FavouriteService.new.call(current_account, @status) | |||
render json: @status, serializer: REST::StatusSerializer | |||
end | |||
def destroy | |||
@status = requested_status | |||
@favourites_map = { @status.id => false } | |||
UnfavouriteWorker.perform_async(current_user.account_id, @status.id) | |||
render json: @status, serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new([@status], current_user&.account_id, favourites_map: @favourites_map) | |||
UnfavouriteWorker.perform_async(current_account.id, @status.id) | |||
render json: @status, serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new([@status], current_account.id, favourites_map: { @status.id => false }) | |||
end | |||
private | |||
def favourited_status | |||
service_result.status.reload | |||
end | |||
def service_result | |||
FavouriteService.new.call(current_user.account, requested_status) | |||
end | |||
def requested_status | |||
Status.find(params[:status_id]) | |||
def set_status | |||
@status = Status.find(params[:status_id]) | |||
authorize @status, :show? | |||
rescue Mastodon::NotPermittedError | |||
not_found | |||
end | |||
end |
@@ -17,7 +17,9 @@ class Api::V1::Statuses::RebloggedByAccountsController < Api::BaseController | |||
private | |||
def load_accounts | |||
default_accounts.merge(paginated_statuses).to_a | |||
scope = default_accounts | |||
scope = scope.where.not(id: current_account.excluded_from_timeline_account_ids) unless current_account.nil? | |||
scope.merge(paginated_statuses).to_a | |||
end | |||
def default_accounts | |||
@@ -64,8 +66,7 @@ class Api::V1::Statuses::RebloggedByAccountsController < Api::BaseController | |||
@status = Status.find(params[:status_id]) | |||
authorize @status, :show? | |||
rescue Mastodon::NotPermittedError | |||
# Reraise in order to get a 404 instead of a 403 error code | |||
raise ActiveRecord::RecordNotFound | |||
not_found | |||
end | |||
def pagination_params(core_params) | |||
@@ -5,32 +5,34 @@ class Api::V1::Statuses::ReblogsController < Api::BaseController | |||
before_action -> { doorkeeper_authorize! :write, :'write:statuses' } | |||
before_action :require_user! | |||
before_action :set_reblog | |||
respond_to :json | |||
def create | |||
@status = ReblogService.new.call(current_user.account, status_for_reblog, reblog_params) | |||
@status = ReblogService.new.call(current_account, @reblog, reblog_params) | |||
render json: @status, serializer: REST::StatusSerializer | |||
end | |||
def destroy | |||
@status = status_for_destroy.reblog | |||
@reblogs_map = { @status.id => false } | |||
@status = current_account.statuses.find_by(reblog_of_id: @reblog.id) | |||
authorize status_for_destroy, :unreblog? | |||
RemovalWorker.perform_async(status_for_destroy.id) | |||
if @status | |||
authorize @status, :unreblog? | |||
@status.discard | |||
RemovalWorker.perform_async(@status.id) | |||
end | |||
render json: @status, serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new([@status], current_user&.account_id, reblogs_map: @reblogs_map) | |||
render json: @reblog, serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new([@status], current_account.id, reblogs_map: { @reblog.id => false }) | |||
end | |||
private | |||
def status_for_reblog | |||
Status.find params[:status_id] | |||
end | |||
def status_for_destroy | |||
current_user.account.statuses.where(reblog_of_id: params[:status_id]).first! | |||
def set_reblog | |||
@reblog = Status.find(params[:status_id]) | |||
authorize @reblog, :show? | |||
rescue Mastodon::NotPermittedError | |||
not_found | |||
end | |||
def reblog_params | |||
@@ -5,8 +5,8 @@ class Api::V1::StatusesController < Api::BaseController | |||
before_action -> { authorize_if_got_token! :read, :'read:statuses' }, except: [:create, :destroy] | |||
before_action -> { doorkeeper_authorize! :write, :'write:statuses' }, only: [:create, :destroy] | |||
before_action :require_user!, except: [:show, :context, :card] | |||
before_action :set_status, only: [:show, :context, :card] | |||
before_action :require_user!, except: [:show, :context] | |||
before_action :set_status, only: [:show, :context] | |||
respond_to :json | |||
@@ -33,16 +33,6 @@ class Api::V1::StatusesController < Api::BaseController | |||
render json: @context, serializer: REST::ContextSerializer, relationships: StatusRelationshipsPresenter.new(statuses, current_user&.account_id) | |||
end | |||
def card | |||
@card = @status.preview_cards.first | |||
if @card.nil? | |||
render_empty | |||
else | |||
render json: @card, serializer: REST::PreviewCardSerializer | |||
end | |||
end | |||
def create | |||
@status = PostStatusService.new.call(current_user.account, | |||
text: status_params[:status], | |||
@@ -63,9 +53,10 @@ class Api::V1::StatusesController < Api::BaseController | |||
@status = Status.where(account_id: current_user.account).find(params[:id]) | |||
authorize @status, :destroy? | |||
RemovalWorker.perform_async(@status.id) | |||
@status.discard | |||
RemovalWorker.perform_async(@status.id, redraft: true) | |||
render_empty | |||
render json: @status, serializer: REST::StatusSerializer, source_requested: true | |||
end | |||
private | |||
@@ -5,11 +5,17 @@ class Api::V1::StreamingController < Api::BaseController | |||
def index | |||
if Rails.configuration.x.streaming_api_base_url != request.host | |||
uri = URI.parse(request.url) | |||
uri.host = URI.parse(Rails.configuration.x.streaming_api_base_url).host | |||
redirect_to uri.to_s, status: 301 | |||
redirect_to streaming_api_url, status: 301 | |||
else | |||
raise ActiveRecord::RecordNotFound | |||
not_found | |||
end | |||
end | |||
private | |||
def streaming_api_url | |||
Addressable::URI.parse(request.url).tap do |uri| | |||
uri.host = Addressable::URI.parse(Rails.configuration.x.streaming_api_base_url).host | |||
end.to_s | |||
end | |||
end |
@@ -1,63 +0,0 @@ | |||
# frozen_string_literal: true | |||
class Api::V1::Timelines::DirectController < Api::BaseController | |||
before_action -> { doorkeeper_authorize! :read, :'read:statuses' }, only: [:show] | |||
before_action :require_user!, only: [:show] | |||
after_action :insert_pagination_headers, unless: -> { @statuses.empty? } | |||
respond_to :json | |||
def show | |||
@statuses = load_statuses | |||
render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id) | |||
end | |||
private | |||
def load_statuses | |||
cached_direct_statuses | |||
end | |||
def cached_direct_statuses | |||
cache_collection direct_statuses, Status | |||
end | |||
def direct_statuses | |||
direct_timeline_statuses | |||
end | |||
def direct_timeline_statuses | |||
# this query requires built in pagination. | |||
Status.as_direct_timeline( | |||
current_account, | |||
limit_param(DEFAULT_STATUSES_LIMIT), | |||
params[:max_id], | |||
params[:since_id], | |||
true # returns array of cache_ids object | |||
) | |||
end | |||
def insert_pagination_headers | |||
set_pagination_headers(next_path, prev_path) | |||
end | |||
def pagination_params(core_params) | |||
params.permit(:local, :limit).merge(core_params) | |||
end | |||
def next_path | |||
api_v1_timelines_direct_url pagination_params(max_id: pagination_max_id) | |||
end | |||
def prev_path | |||
api_v1_timelines_direct_url pagination_params(since_id: pagination_since_id) | |||
end | |||
def pagination_max_id | |||
@statuses.last.id | |||
end | |||
def pagination_since_id | |||
@statuses.first.id | |||
end | |||
end |
@@ -13,7 +13,7 @@ class Api::V1::Timelines::HomeController < Api::BaseController | |||
render json: @statuses, | |||
each_serializer: REST::StatusSerializer, | |||
relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id), | |||
status: regeneration_in_progress? ? 206 : 200 | |||
status: account_home_feed.regenerating? ? 206 : 200 | |||
end | |||
private | |||
@@ -62,8 +62,4 @@ class Api::V1::Timelines::HomeController < Api::BaseController | |||
def pagination_since_id | |||
@statuses.first.id | |||
end | |||
def regeneration_in_progress? | |||
Redis.current.exists("account:#{current_account.id}:regeneration") | |||
end | |||
end |
@@ -1,6 +1,7 @@ | |||
# frozen_string_literal: true | |||
class Api::V1::Timelines::PublicController < Api::BaseController | |||
before_action :require_user!, only: [:show], if: :require_auth? | |||
after_action :insert_pagination_headers, unless: -> { @statuses.empty? } | |||
respond_to :json | |||
@@ -12,6 +13,10 @@ class Api::V1::Timelines::PublicController < Api::BaseController | |||
private | |||
def require_auth? | |||
!Setting.timeline_preview | |||
end | |||
def load_statuses | |||
cached_public_statuses | |||
end | |||
@@ -0,0 +1,17 @@ | |||
# frozen_string_literal: true | |||
class Api::V1::TrendsController < Api::BaseController | |||
before_action :set_tags | |||
respond_to :json | |||
def index | |||
render json: @tags, each_serializer: REST::TagSerializer | |||
end | |||
private | |||
def set_tags | |||
@tags = TrendingTags.get(limit_param(10)) | |||
end | |||
end |
@@ -1,8 +1,32 @@ | |||
# frozen_string_literal: true | |||
class Api::V2::SearchController < Api::V1::SearchController | |||
class Api::V2::SearchController < Api::BaseController | |||
include Authorization | |||
RESULTS_LIMIT = 20 | |||
before_action -> { doorkeeper_authorize! :read, :'read:search' } | |||
before_action :require_user! | |||
respond_to :json | |||
def index | |||
@search = Search.new(search_results) | |||
render json: @search, serializer: REST::V2::SearchSerializer | |||
render json: @search, serializer: REST::SearchSerializer | |||
end | |||
private | |||
def search_results | |||
SearchService.new.call( | |||
params[:q], | |||
current_account, | |||
limit_param(RESULTS_LIMIT), | |||
search_params.merge(resolve: truthy_param?(:resolve), exclude_unreviewed: truthy_param?(:exclude_unreviewed)) | |||
) | |||
end | |||
def search_params | |||
params.permit(:type, :offset, :min_id, :max_id, :account_id) | |||
end | |||
end |
@@ -7,15 +7,21 @@ class Api::Web::EmbedsController < Api::Web::BaseController | |||
def create | |||
status = StatusFinder.new(params[:url]).status | |||
return not_found if status.hidden? | |||
render json: status, serializer: OEmbedSerializer, width: 400 | |||
rescue ActiveRecord::RecordNotFound | |||
oembed = FetchOEmbedService.new.call(params[:url]) | |||
oembed[:html] = Formatter.instance.sanitize(oembed[:html], Sanitize::Config::MASTODON_OEMBED) if oembed[:html].present? | |||
if oembed | |||
render json: oembed | |||
else | |||
render json: {}, status: :not_found | |||
return not_found if oembed.nil? | |||
begin | |||
oembed[:html] = Formatter.instance.sanitize(oembed[:html], Sanitize::Config::MASTODON_OEMBED) | |||
rescue ArgumentError | |||
return not_found | |||
end | |||
render json: oembed | |||
end | |||
end |