diff --git a/.annotaterb.yml b/.annotaterb.yml deleted file mode 100644 index df8e92b247..0000000000 --- a/.annotaterb.yml +++ /dev/null @@ -1,59 +0,0 @@ ---- -:position: before -:position_in_additional_file_patterns: before -:position_in_class: before -:position_in_factory: before -:position_in_fixture: before -:position_in_routes: before -:position_in_serializer: before -:position_in_test: before -:classified_sort: true -:exclude_controllers: true -:exclude_factories: true -:exclude_fixtures: true -:exclude_helpers: true -:exclude_scaffolds: true -:exclude_serializers: true -:exclude_sti_subclasses: true -:exclude_tests: true -:force: false -:format_markdown: false -:format_rdoc: false -:format_yard: false -:frozen: false -:ignore_model_sub_dir: false -:ignore_unknown_models: false -:include_version: false -:show_complete_foreign_keys: false -:show_foreign_keys: false -:show_indexes: false -:simple_indexes: false -:sort: false -:timestamp: false -:trace: false -:with_comment: true -:with_column_comments: true -:with_table_comments: true -:active_admin: false -:command: -:debug: false -:hide_default_column_types: '' -:hide_limit_column_types: 'integer,boolean' -:ignore_columns: -:ignore_routes: -:models: true -:routes: false -:skip_on_db_migrate: false -:target_action: :do_annotations -:wrapper: -:wrapper_close: -:wrapper_open: -:classes_default_to_s: [] -:additional_file_patterns: [] -:model_dir: - - app/models -:require: [] -:root_dir: - - '' - -:show_check_constraints: false diff --git a/.browserslistrc b/.browserslistrc index 0135379d6e..0376af4bcc 100644 --- a/.browserslistrc +++ b/.browserslistrc @@ -1,6 +1,9 @@ +[production] defaults > 0.2% -firefox >= 78 ios >= 15.6 not dead not OperaMini all + +[development] +supports es6-module diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 3aa0bbf7da..c6dcc4d46a 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -11,8 +11,5 @@ RUN apt-get update && \ export DEBIAN_FRONTEND=noninteractive && \ apt-get -y install --no-install-recommends libicu-dev libidn11-dev ffmpeg imagemagick libvips42 libpam-dev -# Disable download prompt for Corepack -ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0 - # Move welcome message to where VS Code expects it COPY .devcontainer/welcome-message.txt /usr/local/etc/vscode-dev-containers/first-run-notice.txt diff --git a/.devcontainer/compose.yaml b/.devcontainer/compose.yaml index 5da1ec3a24..1e2e1ba7de 100644 --- a/.devcontainer/compose.yaml +++ b/.devcontainer/compose.yaml @@ -10,7 +10,6 @@ services: RAILS_ENV: development NODE_ENV: development BIND: 0.0.0.0 - BOOTSNAP_CACHE_DIR: /tmp REDIS_HOST: redis REDIS_PORT: '6379' DB_HOST: db @@ -21,13 +20,12 @@ services: ES_HOST: es ES_PORT: '9200' LIBRE_TRANSLATE_ENDPOINT: http://libretranslate:5000 - LOCAL_DOMAIN: ${LOCAL_DOMAIN:-localhost:3000} # Overrides default command so things don't shut down after the process ends. command: sleep infinity ports: - - '3000:3000' - - '3035:3035' - - '4000:4000' + - '127.0.0.1:3000:3000' + - '127.0.0.1:3035:3035' + - '127.0.0.1:4000:4000' networks: - external_network - internal_network @@ -71,7 +69,7 @@ services: hard: -1 libretranslate: - image: libretranslate/libretranslate:v1.6.2 + image: libretranslate/libretranslate:v1.5.7 restart: unless-stopped volumes: - lt-data:/home/libretranslate/.local diff --git a/.dockerignore b/.dockerignore index 9d990ab9ce..41da718049 100644 --- a/.dockerignore +++ b/.dockerignore @@ -20,9 +20,3 @@ postgres14 redis elasticsearch chart -.yarn/ -!.yarn/patches -!.yarn/plugins -!.yarn/releases -!.yarn/sdks -!.yarn/versions diff --git a/.env.production.sample b/.env.production.sample index a311ad5f8d..0bf01bdc36 100644 --- a/.env.production.sample +++ b/.env.production.sample @@ -1,5 +1,5 @@ # This is a sample configuration file. You can generate your configuration -# with the `bundle exec rails mastodon:setup` interactive setup wizard, but to customize +# with the `rake mastodon:setup` interactive setup wizard, but to customize # your setup even further, you'll need to edit it manually. This sample does # not demonstrate all available configuration options. Please look at # https://docs.joinmastodon.org/admin/config/ for the full documentation. @@ -40,25 +40,14 @@ ES_PASS=password # Secrets # ------- -# Make sure to use `bundle exec rails secret` to generate secrets +# Make sure to use `rake secret` to generate secrets # ------- SECRET_KEY_BASE= OTP_SECRET= -# Encryption secrets -# ------------------ -# Must be available (and set to same values) for all server processes -# These are private/secret values, do not share outside hosting environment -# Use `bin/rails db:encryption:init` to generate fresh secrets -# Do NOT change these secrets once in use, as this would cause data loss and other issues -# ------------------ -# ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY= -# ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT= -# ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY= - # Web Push # -------- -# Generate with `bundle exec rails mastodon:webpush:generate_vapid_key` +# Generate with `rake mastodon:webpush:generate_vapid_key` # -------- VAPID_PRIVATE_KEY= VAPID_PUBLIC_KEY= @@ -79,9 +68,6 @@ AWS_ACCESS_KEY_ID= AWS_SECRET_ACCESS_KEY= S3_ALIAS_HOST=files.example.com -# Optional list of hosts that are allowed to serve media for your instance -# EXTRA_MEDIA_HOSTS=https://data.example1.com,https://data.example2.com - # IP and session retention # ----------------------- # Make sure to modify the scheduling of ip_cleanup_scheduler in config/sidekiq.yml @@ -89,27 +75,3 @@ S3_ALIAS_HOST=files.example.com # ----------------------- IP_RETENTION_PERIOD=31556952 SESSION_RETENTION_PERIOD=31556952 - -# Fetch All Replies Behavior -# -------------------------- -# When a user expands a post (DetailedStatus view), fetch all of its replies -# (default: false) -FETCH_REPLIES_ENABLED=false - -# Period to wait between fetching replies (in minutes) -FETCH_REPLIES_COOLDOWN_MINUTES=15 - -# Period to wait after a post is first created before fetching its replies (in minutes) -FETCH_REPLIES_INITIAL_WAIT_MINUTES=5 - -# Max number of replies to fetch - total, recursively through a whole reply tree -FETCH_REPLIES_MAX_GLOBAL=1000 - -# Max number of replies to fetch - for a single post -FETCH_REPLIES_MAX_SINGLE=500 - -# Max number of replies Collection pages to fetch - total -FETCH_REPLIES_MAX_PAGES=500 - -# Maximum allowed character count -MAX_CHARS=5555 diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 0000000000..d4930e1f52 --- /dev/null +++ b/.eslintignore @@ -0,0 +1,13 @@ +/build/** +/coverage/** +/db/** +/lib/** +/log/** +/node_modules/** +/nonobox/** +/public/** +!/public/embed.js +/spec/** +/tmp/** +/vendor/** +!.eslintrc.js diff --git a/.eslintrc.js b/.eslintrc.js new file mode 100644 index 0000000000..d118262826 --- /dev/null +++ b/.eslintrc.js @@ -0,0 +1,368 @@ +// @ts-check +const { defineConfig } = require('eslint-define-config'); + +module.exports = defineConfig({ + root: true, + + extends: [ + 'eslint:recommended', + 'plugin:react/recommended', + 'plugin:react-hooks/recommended', + 'plugin:jsx-a11y/recommended', + 'plugin:import/recommended', + 'plugin:promise/recommended', + 'plugin:jsdoc/recommended', + ], + + env: { + browser: true, + node: true, + es6: true, + }, + + parser: '@typescript-eslint/parser', + + plugins: [ + 'react', + 'jsx-a11y', + 'import', + 'promise', + '@typescript-eslint', + 'formatjs', + ], + + parserOptions: { + sourceType: 'module', + ecmaFeatures: { + jsx: true, + }, + ecmaVersion: 2021, + requireConfigFile: false, + babelOptions: { + configFile: false, + presets: ['@babel/react', '@babel/env'], + }, + }, + + settings: { + react: { + version: 'detect', + }, + 'import/ignore': [ + 'node_modules', + '\\.(css|scss|json)$', + ], + 'import/resolver': { + typescript: {}, + }, + }, + + rules: { + 'consistent-return': 'error', + 'dot-notation': 'error', + eqeqeq: ['error', 'always', { 'null': 'ignore' }], + 'indent': ['error', 2], + 'jsx-quotes': ['error', 'prefer-single'], + 'semi': ['error', 'always'], + 'no-case-declarations': 'off', + 'no-catch-shadow': 'error', + 'no-console': [ + 'warn', + { + allow: [ + 'error', + 'warn', + ], + }, + ], + 'no-empty': ['error', { "allowEmptyCatch": true }], + 'no-restricted-properties': [ + 'error', + { property: 'substring', message: 'Use .slice instead of .substring.' }, + { property: 'substr', message: 'Use .slice instead of .substr.' }, + ], + 'no-restricted-syntax': [ + 'error', + { + // eslint-disable-next-line no-restricted-syntax + selector: 'Literal[value=/•/], JSXText[value=/•/]', + // eslint-disable-next-line no-restricted-syntax + message: "Use '·' (middle dot) instead of '•' (bullet)", + }, + ], + 'no-unused-expressions': 'error', + 'no-unused-vars': 'off', + '@typescript-eslint/no-unused-vars': [ + 'error', + { + vars: 'all', + args: 'after-used', + destructuredArrayIgnorePattern: '^_', + ignoreRestSiblings: true, + }, + ], + 'valid-typeof': 'error', + + 'react/jsx-filename-extension': ['error', { extensions: ['.jsx', 'tsx'] }], + 'react/jsx-boolean-value': 'error', + 'react/display-name': 'off', + 'react/jsx-fragments': ['error', 'syntax'], + 'react/jsx-equals-spacing': 'error', + 'react/jsx-no-bind': 'error', + 'react/jsx-no-useless-fragment': 'error', + 'react/jsx-no-target-blank': 'off', + 'react/jsx-tag-spacing': 'error', + 'react/jsx-uses-react': 'off', // not needed with new JSX transform + 'react/jsx-wrap-multilines': 'error', + 'react/react-in-jsx-scope': 'off', // not needed with new JSX transform + 'react/self-closing-comp': 'error', + + // recommended values found in https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/blob/v6.8.0/src/index.js#L46 + 'jsx-a11y/click-events-have-key-events': 'off', + 'jsx-a11y/label-has-associated-control': 'off', + 'jsx-a11y/media-has-caption': 'off', + 'jsx-a11y/no-autofocus': 'off', + // recommended rule is: + // 'jsx-a11y/no-interactive-element-to-noninteractive-role': [ + // 'error', + // { + // tr: ['none', 'presentation'], + // canvas: ['img'], + // }, + // ], + 'jsx-a11y/no-interactive-element-to-noninteractive-role': 'off', + // recommended rule is: + // 'jsx-a11y/no-noninteractive-tabindex': [ + // 'error', + // { + // tags: [], + // roles: ['tabpanel'], + // allowExpressionValues: true, + // }, + // ], + 'jsx-a11y/no-noninteractive-tabindex': 'off', + // recommended is full 'error' + 'jsx-a11y/no-static-element-interactions': [ + 'warn', + { + handlers: [ + 'onClick', + ], + }, + ], + + // See https://github.com/import-js/eslint-plugin-import/blob/v2.29.1/config/recommended.js + 'import/extensions': [ + 'error', + 'always', + { + js: 'never', + jsx: 'never', + mjs: 'never', + ts: 'never', + tsx: 'never', + }, + ], + 'import/first': 'error', + 'import/newline-after-import': 'error', + 'import/no-anonymous-default-export': 'error', + 'import/no-extraneous-dependencies': [ + 'error', + { + devDependencies: [ + '.eslintrc.js', + 'config/webpack/**', + 'app/javascript/mastodon/performance.js', + 'app/javascript/mastodon/test_setup.js', + 'app/javascript/**/__tests__/**', + ], + }, + ], + 'import/no-amd': 'error', + 'import/no-commonjs': 'error', + 'import/no-import-module-exports': 'error', + 'import/no-relative-packages': 'error', + 'import/no-self-import': 'error', + 'import/no-useless-path-segments': 'error', + 'import/no-webpack-loader-syntax': 'error', + + 'import/order': [ + 'error', + { + alphabetize: { order: 'asc' }, + 'newlines-between': 'always', + groups: [ + 'builtin', + 'external', + 'internal', + 'parent', + ['index', 'sibling'], + 'object', + ], + pathGroups: [ + // React core packages + { + pattern: '{react,react-dom,react-dom/client,prop-types}', + group: 'builtin', + position: 'after', + }, + // I18n + { + pattern: '{react-intl,intl-messageformat}', + group: 'builtin', + position: 'after', + }, + // Common React utilities + { + pattern: '{classnames,react-helmet,react-router,react-router-dom}', + group: 'external', + position: 'before', + }, + // Immutable / Redux / data store + { + pattern: '{immutable,@reduxjs/toolkit,react-redux,react-immutable-proptypes,react-immutable-pure-component}', + group: 'external', + position: 'before', + }, + // Internal packages + { + pattern: '{mastodon/**}', + group: 'internal', + position: 'after', + }, + ], + pathGroupsExcludedImportTypes: [], + }, + ], + + 'promise/always-return': 'off', + 'promise/catch-or-return': [ + 'error', + { + allowFinally: true, + }, + ], + 'promise/no-callback-in-promise': 'off', + 'promise/no-nesting': 'off', + 'promise/no-promise-in-callback': 'off', + + 'formatjs/blocklist-elements': 'error', + 'formatjs/enforce-default-message': ['error', 'literal'], + 'formatjs/enforce-description': 'off', // description values not currently used + 'formatjs/enforce-id': 'off', // Explicit IDs are used in the project + 'formatjs/enforce-placeholders': 'off', // Issues in short_number.jsx + 'formatjs/enforce-plural-rules': 'error', + 'formatjs/no-camel-case': 'off', // disabledAccount is only non-conforming + 'formatjs/no-complex-selectors': 'error', + 'formatjs/no-emoji': 'error', + 'formatjs/no-id': 'off', // IDs are used for translation keys + 'formatjs/no-invalid-icu': 'error', + 'formatjs/no-literal-string-in-jsx': 'off', // Should be looked at, but mainly flagging punctuation outside of strings + 'formatjs/no-multiple-whitespaces': 'error', + 'formatjs/no-offset': 'error', + 'formatjs/no-useless-message': 'error', + 'formatjs/prefer-formatted-message': 'error', + 'formatjs/prefer-pound-in-plural': 'error', + + 'jsdoc/check-types': 'off', + 'jsdoc/no-undefined-types': 'off', + 'jsdoc/require-jsdoc': 'off', + 'jsdoc/require-param-description': 'off', + 'jsdoc/require-property-description': 'off', + 'jsdoc/require-returns-description': 'off', + 'jsdoc/require-returns': 'off', + }, + + overrides: [ + { + files: [ + '.eslintrc.js', + '*.config.js', + '.*rc.js', + 'ide-helper.js', + 'config/webpack/**/*', + 'config/formatjs-formatter.js', + ], + + env: { + commonjs: true, + }, + + parserOptions: { + sourceType: 'script', + }, + + rules: { + 'import/no-commonjs': 'off', + }, + }, + { + files: [ + '**/*.ts', + '**/*.tsx', + ], + + extends: [ + 'eslint:recommended', + 'plugin:@typescript-eslint/strict-type-checked', + 'plugin:@typescript-eslint/stylistic-type-checked', + 'plugin:react/recommended', + 'plugin:react-hooks/recommended', + 'plugin:jsx-a11y/recommended', + 'plugin:import/recommended', + 'plugin:import/typescript', + 'plugin:promise/recommended', + 'plugin:jsdoc/recommended-typescript', + ], + + parserOptions: { + project: true, + tsconfigRootDir: __dirname, + }, + + rules: { + // Disable formatting rules that have been enabled in the base config + 'indent': 'off', + + // This is not needed as we use noImplicitReturns, which handles this in addition to understanding types + 'consistent-return': 'off', + + 'import/consistent-type-specifier-style': ['error', 'prefer-top-level'], + + '@typescript-eslint/consistent-type-definitions': ['warn', 'interface'], + '@typescript-eslint/consistent-type-exports': 'error', + '@typescript-eslint/consistent-type-imports': 'error', + "@typescript-eslint/prefer-nullish-coalescing": ['error', { ignorePrimitives: { boolean: true } }], + "@typescript-eslint/no-restricted-imports": [ + "warn", + { + "name": "react-redux", + "importNames": ["useSelector", "useDispatch"], + "message": "Use typed hooks `useAppDispatch` and `useAppSelector` instead." + } + ], + "@typescript-eslint/restrict-template-expressions": ['warn', { allowNumber: true }], + 'jsdoc/require-jsdoc': 'off', + + // Those rules set stricter rules for TS files + // to enforce better practices when converting from JS + 'import/no-default-export': 'warn', + 'react/prefer-stateless-function': 'warn', + 'react/function-component-definition': ['error', { namedComponents: 'arrow-function' }], + 'react/jsx-uses-react': 'off', // not needed with new JSX transform + 'react/react-in-jsx-scope': 'off', // not needed with new JSX transform + 'react/prop-types': 'off', + }, + }, + { + files: [ + '**/__tests__/*.js', + '**/__tests__/*.jsx', + ], + + env: { + jest: true, + }, + } + ], +}); diff --git a/.github/ISSUE_TEMPLATE/3.troubleshooting.yml b/.github/ISSUE_TEMPLATE/3.troubleshooting.yml deleted file mode 100644 index fa9bfc7c80..0000000000 --- a/.github/ISSUE_TEMPLATE/3.troubleshooting.yml +++ /dev/null @@ -1,74 +0,0 @@ -name: Deployment troubleshooting -description: | - You are a server administrator and you are encountering a technical issue during installation, upgrade or operations of Mastodon. -labels: ['status/to triage'] -type: 'Troubleshooting' -body: - - type: markdown - attributes: - value: | - Make sure that you are submitting a new bug that was not previously reported or already fixed. - - Please use a concise and distinct title for the issue. - - type: textarea - attributes: - label: Steps to reproduce the problem - description: What were you trying to do? - value: | - 1. - 2. - 3. - ... - validations: - required: true - - type: input - attributes: - label: Expected behaviour - description: What should have happened? - validations: - required: true - - type: input - attributes: - label: Actual behaviour - description: What happened? - validations: - required: true - - type: textarea - attributes: - label: Detailed description - validations: - required: false - - type: input - attributes: - label: Mastodon instance - description: The address of the Mastodon instance where you experienced the issue - placeholder: mastodon.social - validations: - required: true - - type: input - attributes: - label: Mastodon version - description: | - This is displayed at the bottom of the About page, eg. `v4.4.0-alpha.1` - placeholder: v4.3.0 - validations: - required: false - - type: textarea - attributes: - label: Environment - description: | - Details about your environment, like how Mastodon is deployed, if containers are used, version numbers, etc. - value: | - Please at least include those informations: - - Operating system: (eg. Ubuntu 22.04) - - Ruby version: (from `ruby --version`, eg. v3.4.1) - - Node.js version: (from `node --version`, eg. v20.18.0) - validations: - required: false - - type: textarea - attributes: - label: Technical details - description: | - Any additional technical details you may have, like logs or error traces - validations: - required: false diff --git a/.github/codecov.yml b/.github/codecov.yml index 21af6d0d45..701ba3af8f 100644 --- a/.github/codecov.yml +++ b/.github/codecov.yml @@ -9,5 +9,3 @@ coverage: default: # GitHub status check is not blocking informational: true -github_checks: - annotations: false diff --git a/.github/renovate.json5 b/.github/renovate.json5 index e638b9c548..2cf7bec8ee 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -7,7 +7,6 @@ ':prConcurrentLimitNone', // Remove limit for open PRs at any time. ':prHourlyLimit2', // Rate limit PR creation to a maximum of two per hour. ], - rebaseWhen: 'conflicted', minimumReleaseAge: '3', // Wait 3 days after the package has been published before upgrading it // packageRules order is important, they are applied from top to bottom and are merged, // meaning the most important ones must be at the bottom, for example grouping rules @@ -15,8 +14,6 @@ // to `null` after any other rule set it to something. dependencyDashboardHeader: 'This issue lists Renovate updates and detected dependencies. Read the [Dependency Dashboard](https://docs.renovatebot.com/key-concepts/dashboard/) docs to learn more. Before approving any upgrade: read the description and comments in the [`renovate.json5` file](https://github.com/mastodon/mastodon/blob/main/.github/renovate.json5).', postUpdateOptions: ['yarnDedupeHighest'], - // The types are now included in recent versions,we ignore them here until we upgrade and remove the dependency - ignoreDeps: ['@types/emoji-mart'], packageRules: [ { // Require Dependency Dashboard Approval for major version bumps of these node packages @@ -90,7 +87,6 @@ }, { // Update devDependencies every week, with one grouped PR - matchManagers: ['npm'], matchDepTypes: 'devDependencies', matchUpdateTypes: ['patch', 'minor'], groupName: 'devDependencies (non-major)', @@ -99,13 +95,8 @@ { // Group all eslint-related packages with `eslint` in the same PR matchManagers: ['npm'], - matchPackageNames: [ - 'eslint', - 'eslint-*', - 'typescript-eslint', - '@eslint/*', - 'globals', - ], + matchPackageNames: ['eslint'], + matchPackagePrefixes: ['eslint-', '@typescript-eslint/'], matchUpdateTypes: ['patch', 'minor'], groupName: 'eslint (non-major)', }, @@ -121,8 +112,7 @@ }, { // Update @types/* packages every week, with one grouped PR - matchManagers: ['npm'], - matchPackageNames: '@types/*', + matchPackagePrefixes: '@types/', matchUpdateTypes: ['patch', 'minor'], groupName: 'DefinitelyTyped types (non-major)', extends: ['schedule:weekly'], @@ -139,21 +129,23 @@ { // Group all RuboCop packages with `rubocop` in the same PR matchManagers: ['bundler'], - matchPackageNames: ['rubocop', 'rubocop-*'], + matchPackageNames: ['rubocop'], + matchPackagePrefixes: ['rubocop-'], matchUpdateTypes: ['patch', 'minor'], groupName: 'RuboCop (non-major)', }, { // Group all RSpec packages with `rspec` in the same PR matchManagers: ['bundler'], - matchPackageNames: ['rspec', 'rspec-*'], + matchPackageNames: ['rspec'], + matchPackagePrefixes: ['rspec-'], matchUpdateTypes: ['patch', 'minor'], groupName: 'RSpec (non-major)', }, { // Group all opentelemetry-ruby packages in the same PR matchManagers: ['bundler'], - matchPackageNames: ['opentelemetry-*'], + matchPackagePrefixes: ['opentelemetry-'], matchUpdateTypes: ['patch', 'minor'], groupName: 'opentelemetry-ruby (non-major)', }, diff --git a/.github/workflows/build-security.yml b/.github/workflows/build-security.yml index d3cb4e5e0a..1e2455d3d9 100644 --- a/.github/workflows/build-security.yml +++ b/.github/workflows/build-security.yml @@ -24,6 +24,8 @@ jobs: uses: ./.github/workflows/build-container-image.yml with: file_to_build: Dockerfile + platforms: linux/amd64,linux/arm64 + use_native_arm64_builder: true cache: false push_to_images: | tootsuite/mastodon @@ -44,6 +46,8 @@ jobs: uses: ./.github/workflows/build-container-image.yml with: file_to_build: streaming/Dockerfile + platforms: linux/amd64,linux/arm64 + use_native_arm64_builder: true cache: false push_to_images: | tootsuite/mastodon-streaming diff --git a/.github/workflows/bundler-audit.yml b/.github/workflows/bundler-audit.yml index c96e4429af..e3e2da0c78 100644 --- a/.github/workflows/bundler-audit.yml +++ b/.github/workflows/bundler-audit.yml @@ -1,13 +1,8 @@ name: Bundler Audit on: - merge_group: push: - branches: - - 'main' - - 'kb*' - - 'upstream-*' - - 'releases/*' - - 'stable-*' + branches-ignore: + - 'dependabot/**' paths: - 'Gemfile*' - '.ruby-version' @@ -39,4 +34,4 @@ jobs: bundler-cache: true - name: Run bundler-audit - run: bin/bundler-audit check --update + run: bundle exec bundler-audit check --update diff --git a/.github/workflows/check-i18n.yml b/.github/workflows/check-i18n.yml index 63529e4f16..ceb385933b 100644 --- a/.github/workflows/check-i18n.yml +++ b/.github/workflows/check-i18n.yml @@ -2,19 +2,9 @@ name: Check i18n on: push: - branches: - - 'main' - - 'kb*' - - 'upstream-*' - - 'releases/*' - - 'stable-*' + branches: [main] pull_request: - branches: - - 'main' - - 'kb*' - - 'upstream-*' - - 'releases/*' - - 'stable-*' + branches: [main] env: RAILS_ENV: test @@ -24,7 +14,7 @@ permissions: jobs: check-i18n: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 @@ -41,18 +31,18 @@ jobs: git diff --exit-code - name: Check locale file normalization - run: bin/i18n-tasks check-normalized + run: bundle exec i18n-tasks check-normalized - name: Check for unused strings - run: bin/i18n-tasks unused + run: bundle exec i18n-tasks unused - name: Check for missing strings in English YML run: | - bin/i18n-tasks add-missing -l en + bundle exec i18n-tasks add-missing -l en git diff --exit-code - name: Check for wrong string interpolations - run: bin/i18n-tasks check-consistent-interpolations + run: bundle exec i18n-tasks check-consistent-interpolations - name: Check that all required locale files exist - run: bin/rake repo:check_locales_files + run: bundle exec rake repo:check_locales_files diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 827629d8e6..6fb93b7fef 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -1,21 +1,11 @@ name: 'CodeQL' on: - merge_group: push: - branches: - - 'main' - - 'kb*' - - 'upstream-*' - - 'releases/*' - - 'stable-*' + branches: ['main'] pull_request: - branches: - - 'main' - - 'kb*' - - 'upstream-*' - - 'releases/*' - - 'stable-*' + # The branches below must be a subset of the branches above + branches: ['main'] schedule: - cron: '22 6 * * 1' diff --git a/.github/workflows/crowdin-download-stable.yml b/.github/workflows/crowdin-download-stable.yml deleted file mode 100644 index 6d9a058629..0000000000 --- a/.github/workflows/crowdin-download-stable.yml +++ /dev/null @@ -1,69 +0,0 @@ -name: Crowdin / Download translations (stable branches) -on: - workflow_dispatch: - -permissions: - contents: write - pull-requests: write - -jobs: - download-translations-stable: - runs-on: ubuntu-latest - if: github.repository == 'mastodon/mastodon' - - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Increase Git http.postBuffer - # This is needed due to a bug in Ubuntu's cURL version? - # See https://github.com/orgs/community/discussions/55820 - run: | - git config --global http.version HTTP/1.1 - git config --global http.postBuffer 157286400 - - # Download the translation files from Crowdin - - name: crowdin action - uses: crowdin/github-action@v2 - with: - upload_sources: false - upload_translations: false - download_translations: true - crowdin_branch_name: ${{ github.base_ref || github.ref_name }} - push_translations: false - create_pull_request: false - env: - CROWDIN_PROJECT_ID: ${{ vars.CROWDIN_PROJECT_ID }} - CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }} - - # As the files are extracted from a Docker container, they belong to root:root - # We need to fix this before the next steps - - name: Fix file permissions - run: sudo chown -R runner:docker . - - # This is needed to run the normalize step - - name: Set up Ruby environment - uses: ./.github/actions/setup-ruby - - - name: Run i18n normalize task - run: bin/i18n-tasks normalize - - # Create or update the pull request - - name: Create Pull Request - uses: peter-evans/create-pull-request@v7.0.6 - with: - commit-message: 'New Crowdin translations' - title: 'New Crowdin Translations for ${{ github.base_ref || github.ref_name }} (automated)' - author: 'GitHub Actions ' - body: | - New Crowdin translations, automated with GitHub Actions - - See `.github/workflows/crowdin-download.yml` - - This PR will be updated every day with new translations. - - Due to a limitation in GitHub Actions, checks are not running on this PR without manual action. - If you want to run the checks, then close and re-open it. - branch: i18n/crowdin/translations-${{ github.base_ref || github.ref_name }} - base: ${{ github.base_ref || github.ref_name }} - labels: i18n diff --git a/.github/workflows/format-check.yml b/.github/workflows/format-check.yml index a190ece7df..2d483b5022 100644 --- a/.github/workflows/format-check.yml +++ b/.github/workflows/format-check.yml @@ -1,13 +1,6 @@ name: Check formatting on: - merge_group: push: - branches: - - 'main' - - 'kb*' - - 'upstream-*' - - 'releases/*' - - 'stable-*' pull_request: jobs: diff --git a/.github/workflows/lint-css.yml b/.github/workflows/lint-css.yml index ffab4880e1..d3b8035cd8 100644 --- a/.github/workflows/lint-css.yml +++ b/.github/workflows/lint-css.yml @@ -1,13 +1,9 @@ name: CSS Linting on: - merge_group: push: - branches: - - 'main' - - 'kb*' - - 'upstream-*' - - 'releases/*' - - 'stable-*' + branches-ignore: + - 'dependabot/**' + - 'renovate/**' paths: - 'package.json' - 'yarn.lock' @@ -43,4 +39,4 @@ jobs: uses: ./.github/actions/setup-javascript - name: Stylelint - run: yarn lint:css --custom-formatter @csstools/stylelint-formatter-github + run: yarn lint:css -f github diff --git a/.github/workflows/lint-haml.yml b/.github/workflows/lint-haml.yml index c596261eb0..ca4b0c80bf 100644 --- a/.github/workflows/lint-haml.yml +++ b/.github/workflows/lint-haml.yml @@ -1,13 +1,9 @@ name: Haml Linting on: - merge_group: push: - branches: - - 'main' - - 'kb*' - - 'upstream-*' - - 'releases/*' - - 'stable-*' + branches-ignore: + - 'dependabot/**' + - 'renovate/**' paths: - '.github/workflows/haml-lint-problem-matcher.json' - '.github/workflows/lint-haml.yml' @@ -46,4 +42,4 @@ jobs: - name: Run haml-lint run: | echo "::add-matcher::.github/workflows/haml-lint-problem-matcher.json" - bin/haml-lint --reporter github + bundle exec haml-lint --reporter github diff --git a/.github/workflows/lint-js.yml b/.github/workflows/lint-js.yml index 13468e7799..1c1ecc2b22 100644 --- a/.github/workflows/lint-js.yml +++ b/.github/workflows/lint-js.yml @@ -1,20 +1,16 @@ name: JavaScript Linting on: - merge_group: push: - branches: - - 'main' - - 'kb*' - - 'upstream-*' - - 'releases/*' - - 'stable-*' + branches-ignore: + - 'dependabot/**' + - 'renovate/**' paths: - 'package.json' - 'yarn.lock' - 'tsconfig.json' - '.nvmrc' - '.prettier*' - - 'eslint.config.mjs' + - '.eslint*' - '**/*.js' - '**/*.jsx' - '**/*.ts' @@ -28,7 +24,7 @@ on: - 'tsconfig.json' - '.nvmrc' - '.prettier*' - - 'eslint.config.mjs' + - '.eslint*' - '**/*.js' - '**/*.jsx' - '**/*.ts' @@ -47,7 +43,7 @@ jobs: uses: ./.github/actions/setup-javascript - name: ESLint - run: yarn workspaces foreach --all --parallel run lint:js --max-warnings 0 + run: yarn lint:js --max-warnings 0 - name: Typecheck run: yarn typecheck diff --git a/.github/workflows/lint-ruby.yml b/.github/workflows/lint-ruby.yml index 5bb67b108c..b3a89c3caf 100644 --- a/.github/workflows/lint-ruby.yml +++ b/.github/workflows/lint-ruby.yml @@ -1,18 +1,13 @@ name: Ruby Linting on: - merge_group: push: - branches: - - 'main' - - 'kb*' - - 'upstream-*' - - 'releases/*' - - 'stable-*' + branches-ignore: + - 'dependabot/**' + - 'renovate/**' paths: - 'Gemfile*' - '.rubocop*.yml' - '.ruby-version' - - 'bin/rubocop' - 'config/brakeman.ignore' - '**/*.rb' - '**/*.rake' @@ -23,7 +18,6 @@ on: - 'Gemfile*' - '.rubocop*.yml' - '.ruby-version' - - 'bin/rubocop' - 'config/brakeman.ignore' - '**/*.rb' - '**/*.rake' diff --git a/.github/workflows/rebase-needed.yml b/.github/workflows/rebase-needed.yml index f0fc8b0db7..8784397a8f 100644 --- a/.github/workflows/rebase-needed.yml +++ b/.github/workflows/rebase-needed.yml @@ -10,7 +10,6 @@ permissions: jobs: label-rebase-needed: runs-on: ubuntu-latest - if: github.repository == 'mastodon/mastodon' concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/test-js.yml b/.github/workflows/test-js.yml index f962f5c36f..481afdba30 100644 --- a/.github/workflows/test-js.yml +++ b/.github/workflows/test-js.yml @@ -1,13 +1,9 @@ name: JavaScript Testing on: - merge_group: push: - branches: - - 'main' - - 'kb*' - - 'upstream-*' - - 'releases/*' - - 'stable-*' + branches-ignore: + - 'dependabot/**' + - 'renovate/**' paths: - 'package.json' - 'yarn.lock' diff --git a/.github/workflows/test-migrations.yml b/.github/workflows/test-migrations.yml index c4a716e8f9..3eaf2c2d74 100644 --- a/.github/workflows/test-migrations.yml +++ b/.github/workflows/test-migrations.yml @@ -1,33 +1,29 @@ name: Historical data migration test on: - merge_group: push: - branches: - - 'main' - - 'kb*' - - 'upstream-*' - - 'releases/*' - - 'stable-*' - paths: - - 'Gemfile*' - - '.ruby-version' - - '**/*.rb' - - '.github/workflows/test-migrations.yml' - - 'lib/tasks/tests.rake' - - 'lib/tasks/db.rake' - + branches-ignore: + - 'dependabot/**' + - 'renovate/**' pull_request: - paths: - - 'Gemfile*' - - '.ruby-version' - - '**/*.rb' - - '.github/workflows/test-migrations.yml' - - 'lib/tasks/tests.rake' jobs: + pre_job: + runs-on: ubuntu-latest + + outputs: + should_skip: ${{ steps.skip_check.outputs.should_skip }} + + steps: + - id: skip_check + uses: fkirc/skip-duplicate-actions@v5 + with: + paths: '["Gemfile*", ".ruby-version", "**/*.rb", ".github/workflows/test-migrations.yml", "lib/tasks/tests.rake"]' + test: runs-on: ubuntu-latest + needs: pre_job + if: needs.pre_job.outputs.should_skip != 'true' strategy: fail-fast: false @@ -36,8 +32,6 @@ jobs: postgres: - 14-alpine - 15-alpine - - 16-alpine - - 17-alpine services: postgres: @@ -67,6 +61,7 @@ jobs: DB_HOST: localhost DB_USER: postgres DB_PASS: postgres + DISABLE_SIMPLECOV: true RAILS_ENV: test BUNDLE_CLEAN: true BUNDLE_FROZEN: true @@ -80,18 +75,6 @@ jobs: - name: Set up Ruby environment uses: ./.github/actions/setup-ruby - - name: Ensure no errors with `db:prepare` - run: | - bin/rails db:drop - bin/rails db:prepare - bin/rails db:migrate - - - name: Ensure no errors with `db:prepare` and SKIP_POST_DEPLOYMENT_MIGRATIONS - run: | - bin/rails db:drop - SKIP_POST_DEPLOYMENT_MIGRATIONS=true bin/rails db:prepare - bin/rails db:migrate - - name: Test "one step migration" flow run: | bin/rails db:drop @@ -105,11 +88,6 @@ jobs: bin/rails db:drop bin/rails db:create SKIP_POST_DEPLOYMENT_MIGRATIONS=true bin/rails tests:migrations:prepare_database - - # Migrate up to v4.2.0 breakpoint - bin/rails db:migrate VERSION=20230907150100 - - # Migrate the rest SKIP_POST_DEPLOYMENT_MIGRATIONS=true bin/rails db:migrate bin/rails db:migrate bin/rails tests:migrations:check_database diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml index fd4c666059..f2ff188188 100644 --- a/.github/workflows/test-ruby.yml +++ b/.github/workflows/test-ruby.yml @@ -1,14 +1,10 @@ name: Ruby Testing on: - merge_group: push: - branches: - - 'main' - - 'kb*' - - 'upstream-*' - - 'releases/*' - - 'stable-*' + branches-ignore: + - 'dependabot/**' + - 'renovate/**' pull_request: env: @@ -45,24 +41,11 @@ jobs: with: onlyProduction: 'true' - - name: Cache assets from compilation - uses: actions/cache@v4 - with: - path: | - public/assets - public/packs - public/packs-test - tmp/cache/webpacker - key: ${{ matrix.mode }}-assets-${{ github.head_ref || github.ref_name }}-${{ github.sha }} - restore-keys: | - ${{ matrix.mode }}-assets-${{ github.head_ref || github.ref_name }}-${{ github.sha }} - ${{ matrix.mode }}-assets-${{ github.head_ref || github.ref_name }} - ${{ matrix.mode }}-assets-main - ${{ matrix.mode }}-assets - - name: Precompile assets + # Previously had set this, but it's not supported + # export NODE_OPTIONS=--openssl-legacy-provider run: |- - bin/rails assets:precompile + ./bin/rails assets:precompile - name: Archive asset artifacts run: | @@ -110,7 +93,7 @@ jobs: DB_HOST: localhost DB_USER: postgres DB_PASS: postgres - COVERAGE: ${{ matrix.ruby-version == '.ruby-version' }} + DISABLE_SIMPLECOV: ${{ matrix.ruby-version != '.ruby-version' }} RAILS_ENV: test ALLOW_NOPAM: true PAM_ENABLED: true @@ -128,8 +111,8 @@ jobs: fail-fast: false matrix: ruby-version: + - '3.1' - '3.2' - - '3.3' - '.ruby-version' steps: - uses: actions/checkout@v4 @@ -147,31 +130,18 @@ jobs: uses: ./.github/actions/setup-ruby with: ruby-version: ${{ matrix.ruby-version}} - additional-system-dependencies: ffmpeg imagemagick libpam-dev + additional-system-dependencies: ffmpeg libpam-dev - name: Load database schema run: | bin/rails db:setup bin/flatware fan bin/rails db:test:prepare - - name: Cache RSpec persistence file - uses: actions/cache@v4 - with: - path: | - tmp/rspec/examples.txt - key: rspec-persistence-${{ github.head_ref || github.ref_name }}-${{ github.sha }} - restore-keys: | - rspec-persistence-${{ github.head_ref || github.ref_name }}-${{ github.sha }}-${{ matrix.ruby-version }} - rspec-persistence-${{ github.head_ref || github.ref_name }}-${{ github.sha }} - rspec-persistence-${{ github.head_ref || github.ref_name }} - rspec-persistence-main - rspec-persistence - - run: bin/flatware rspec -r ./spec/flatware_helper.rb - name: Upload coverage reports to Codecov if: matrix.ruby-version == '.ruby-version' - uses: codecov/codecov-action@v5 + uses: codecov/codecov-action@v4 with: files: coverage/lcov/*.lcov env: @@ -179,7 +149,7 @@ jobs: test-libvips: name: Libvips tests - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 needs: - build @@ -212,7 +182,7 @@ jobs: DB_HOST: localhost DB_USER: postgres DB_PASS: postgres - COVERAGE: ${{ matrix.ruby-version == '.ruby-version' }} + DISABLE_SIMPLECOV: ${{ matrix.ruby-version != '.ruby-version' }} RAILS_ENV: test ALLOW_NOPAM: true PAM_ENABLED: true @@ -230,8 +200,8 @@ jobs: fail-fast: false matrix: ruby-version: + - '3.1' - '3.2' - - '3.3' - '.ruby-version' steps: - uses: actions/checkout@v4 @@ -249,16 +219,16 @@ jobs: uses: ./.github/actions/setup-ruby with: ruby-version: ${{ matrix.ruby-version}} - additional-system-dependencies: ffmpeg libpam-dev + additional-system-dependencies: ffmpeg libpam-dev libyaml-dev - name: Load database schema run: './bin/rails db:create db:schema:load db:seed' - - run: bin/rspec --tag attachment_processing + - run: bin/rspec --tag paperclip_processing - name: Upload coverage reports to Codecov if: matrix.ruby-version == '.ruby-version' - uses: codecov/codecov-action@v5 + uses: codecov/codecov-action@v4 with: files: coverage/lcov/mastodon.lcov env: @@ -299,6 +269,7 @@ jobs: DB_HOST: localhost DB_USER: postgres DB_PASS: postgres + DISABLE_SIMPLECOV: true RAILS_ENV: test BUNDLE_WITH: test ES_ENABLED: false @@ -309,8 +280,8 @@ jobs: fail-fast: false matrix: ruby-version: + - '3.1' - '3.2' - - '3.3' - '.ruby-version' steps: @@ -329,7 +300,7 @@ jobs: uses: ./.github/actions/setup-ruby with: ruby-version: ${{ matrix.ruby-version}} - additional-system-dependencies: ffmpeg imagemagick + additional-system-dependencies: ffmpeg - name: Set up Javascript environment uses: ./.github/actions/setup-javascript @@ -415,6 +386,7 @@ jobs: DB_HOST: localhost DB_USER: postgres DB_PASS: postgres + DISABLE_SIMPLECOV: true RAILS_ENV: test BUNDLE_WITH: test ES_ENABLED: true @@ -425,8 +397,8 @@ jobs: fail-fast: false matrix: ruby-version: + - '3.1' - '3.2' - - '3.3' - '.ruby-version' search-image: - docker.elastic.co/elasticsearch/elasticsearch:7.17.13 @@ -448,7 +420,7 @@ jobs: uses: ./.github/actions/setup-ruby with: ruby-version: ${{ matrix.ruby-version}} - additional-system-dependencies: ffmpeg imagemagick + additional-system-dependencies: ffmpeg - name: Set up Javascript environment uses: ./.github/actions/setup-javascript diff --git a/.gitignore b/.gitignore index 7d60baebf8..4106e3f7f8 100644 --- a/.gitignore +++ b/.gitignore @@ -74,6 +74,3 @@ docker-compose.override.yml # Ignore dotenv .local files .env*.local - -# Ignore local-only rspec configuration -.rspec-local diff --git a/.nvmrc b/.nvmrc index 744ca17ec0..cecb936289 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -22.14 +20.15 diff --git a/.prettierignore b/.prettierignore index 80b4c0159e..6b2f0c1889 100644 --- a/.prettierignore +++ b/.prettierignore @@ -63,7 +63,6 @@ docker-compose.override.yml # Ignore emoji map file /app/javascript/mastodon/features/emoji/emoji_map.json -/app/javascript/mastodon/features/emoji/emoji_sheet.json # Ignore locale files /app/javascript/mastodon/locales/*.json diff --git a/.prettierrc.js b/.prettierrc.js index 65ec869c33..af39b253f6 100644 --- a/.prettierrc.js +++ b/.prettierrc.js @@ -1,4 +1,4 @@ module.exports = { singleQuote: true, jsxSingleQuote: true -}; +} diff --git a/.profile b/.profile new file mode 100644 index 0000000000..f4826ea303 --- /dev/null +++ b/.profile @@ -0,0 +1 @@ +LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/app/.apt/lib/x86_64-linux-gnu:/app/.apt/usr/lib/x86_64-linux-gnu/mesa:/app/.apt/usr/lib/x86_64-linux-gnu/pulseaudio:/app/.apt/usr/lib/x86_64-linux-gnu/openblas-pthread diff --git a/.rspec b/.rspec index 83e16f8044..9a8e706d09 100644 --- a/.rspec +++ b/.rspec @@ -1,2 +1,3 @@ --color --require spec_helper +--format Fuubar diff --git a/.rubocop.yml b/.rubocop.yml index 1bbba515af..5bfa331d27 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -8,7 +8,7 @@ AllCops: - lib/mastodon/migration_helpers.rb ExtraDetails: true NewCops: enable - TargetRubyVersion: 3.2 # Oldest supported ruby version + TargetRubyVersion: 3.1 # Oldest supported ruby version inherit_from: - .rubocop/layout.yml @@ -18,7 +18,6 @@ inherit_from: - .rubocop/rspec_rails.yml - .rubocop/rspec.yml - .rubocop/style.yml - - .rubocop/i18n.yml - .rubocop/custom.yml - .rubocop_todo.yml - .rubocop/strict.yml @@ -27,10 +26,10 @@ inherit_mode: merge: - Exclude -plugins: - - rubocop-capybara - - rubocop-i18n - - rubocop-performance +require: - rubocop-rails - rubocop-rspec - rubocop-rspec_rails + - rubocop-performance + - rubocop-capybara + - ./lib/linter/rubocop_middle_dot diff --git a/.rubocop/i18n.yml b/.rubocop/i18n.yml deleted file mode 100644 index de395d3a79..0000000000 --- a/.rubocop/i18n.yml +++ /dev/null @@ -1,12 +0,0 @@ -I18n/RailsI18n: - Enabled: true - Exclude: - - 'config/**/*' - - 'db/**/*' - - 'lib/**/*' - - 'spec/**/*' -I18n/GetText: - Enabled: false - -I18n/RailsI18n/DecorateStringFormattingUsingInterpolation: - Enabled: false diff --git a/.rubocop/rails.yml b/.rubocop/rails.yml index bbd172e656..ae31c1f266 100644 --- a/.rubocop/rails.yml +++ b/.rubocop/rails.yml @@ -2,9 +2,6 @@ Rails/BulkChangeTable: Enabled: false # Conflicts with strong_migrations features -Rails/Delegate: - Enabled: false - Rails/FilePath: EnforcedStyle: arguments diff --git a/.rubocop/strict.yml b/.rubocop/strict.yml index c2655a1470..2222c6d8b9 100644 --- a/.rubocop/strict.yml +++ b/.rubocop/strict.yml @@ -7,13 +7,8 @@ RSpec/Focus: # Require full spec run on CI Exclude: [] Rails/Output: # Remove any `puts` debugging - inherit_mode: - merge: - - Include Enabled: true Exclude: [] - Include: - - spec/**/*.rb Rails/FindEach: # Using `each` could impact performance, use `find_each` Enabled: true diff --git a/.rubocop/style.yml b/.rubocop/style.yml index f59340d452..03e35a70ac 100644 --- a/.rubocop/style.yml +++ b/.rubocop/style.yml @@ -1,7 +1,4 @@ --- -Style/ArrayIntersect: - Enabled: false - Style/ClassAndModuleChildren: Enabled: false @@ -22,13 +19,6 @@ Style/HashSyntax: EnforcedShorthandSyntax: either EnforcedStyle: ruby19_no_mixed_keys -Style/IfUnlessModifier: - Exclude: - - '**/*.haml' - -Style/KeywordArgumentsMerging: - Enabled: false - Style/NumericLiterals: AllowedPatterns: - \d{4}_\d{2}_\d{2}_\d{6} @@ -47,9 +37,6 @@ Style/RedundantFetchBlock: Style/RescueStandardError: EnforcedStyle: implicit -Style/SafeNavigationChainLength: - Enabled: false - Style/SymbolArray: Enabled: false @@ -58,6 +45,3 @@ Style/TrailingCommaInArrayLiteral: Style/TrailingCommaInHashLiteral: EnforcedStyleForMultiline: comma - -Style/WordArray: - MinSize: 3 # Override default of 2 diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 13fb25d333..40330af583 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,6 +1,6 @@ # This configuration was generated by # `rubocop --auto-gen-config --auto-gen-only-exclude --no-offense-counts --no-auto-gen-timestamp` -# using RuboCop version 1.75.2. +# using RuboCop version 1.64.1. # The point is for the user to remove these configuration records # one by one as the offenses are removed from the code base. # Note that changes in the inspected code, or installation of new @@ -8,13 +8,13 @@ Lint/NonLocalExitFromIterator: Exclude: - - 'app/helpers/json_ld_helper.rb' + - 'app/helpers/jsonld_helper.rb' # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes. Metrics/AbcSize: Max: 82 -# Configuration parameters: CountBlocks, CountModifierForms, Max. +# Configuration parameters: CountBlocks, Max. Metrics/BlockNesting: Exclude: - 'lib/tasks/mastodon.rake' @@ -39,17 +39,21 @@ Rails/OutputSafety: # Configuration parameters: AllowedVars. Style/FetchEnvVar: Exclude: + - 'app/lib/redis_configuration.rb' + - 'app/lib/translation_service.rb' - 'config/environments/production.rb' - 'config/initializers/2_limited_federation_mode.rb' - 'config/initializers/3_omniauth.rb' + - 'config/initializers/blacklists.rb' - 'config/initializers/cache_buster.rb' - 'config/initializers/devise.rb' - 'config/initializers/paperclip.rb' - 'config/initializers/vapid.rb' + - 'lib/mastodon/redis_config.rb' - 'lib/tasks/repo.rake' # This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: EnforcedStyle, MaxUnannotatedPlaceholdersAllowed, Mode, AllowedMethods, AllowedPatterns. +# Configuration parameters: EnforcedStyle, MaxUnannotatedPlaceholdersAllowed, AllowedMethods, AllowedPatterns. # SupportedStyles: annotated, template, unannotated # AllowedMethods: redirect Style/FormatStringToken: @@ -62,10 +66,31 @@ Style/FormatStringToken: Style/GuardClause: Enabled: false +# This cop supports unsafe autocorrection (--autocorrect-all). +Style/HashTransformValues: + Exclude: + - 'app/serializers/rest/web_push_subscription_serializer.rb' + - 'app/services/import_service.rb' + +# This cop supports unsafe autocorrection (--autocorrect-all). +Style/MapToHash: + Exclude: + - 'app/models/status.rb' + +# This cop supports unsafe autocorrection (--autocorrect-all). +# Configuration parameters: EnforcedStyle. +# SupportedStyles: literals, strict +Style/MutableConstant: + Exclude: + - 'app/models/tag.rb' + - 'app/services/delete_account_service.rb' + - 'lib/mastodon/migration_warning.rb' + # Configuration parameters: AllowedMethods. # AllowedMethods: respond_to_missing? Style/OptionalBooleanParameter: Exclude: + - 'app/helpers/jsonld_helper.rb' - 'app/lib/admin/system_check/message.rb' - 'app/lib/request.rb' - 'app/lib/webfinger.rb' @@ -73,6 +98,7 @@ Style/OptionalBooleanParameter: - 'app/services/fetch_resource_service.rb' - 'app/workers/domain_block_worker.rb' - 'app/workers/unfollow_follow_worker.rb' + - 'lib/mastodon/redis_config.rb' # This cop supports unsafe autocorrection (--autocorrect-all). # Configuration parameters: EnforcedStyle. @@ -86,3 +112,10 @@ Style/RedundantConstantBase: Exclude: - 'config/environments/production.rb' - 'config/initializers/sidekiq.rb' + +# This cop supports safe autocorrection (--autocorrect). +# Configuration parameters: WordRegex. +# SupportedStyles: percent, brackets +Style/WordArray: + EnforcedStyle: percent + MinSize: 3 diff --git a/.ruby-version b/.ruby-version index 6cb9d3dd0d..619b537668 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.4.3 +3.3.3 diff --git a/Aptfile b/Aptfile index 06c91d4c7b..5e033f1365 100644 --- a/Aptfile +++ b/Aptfile @@ -1,5 +1,5 @@ -libidn12 -# for idn-ruby on heroku-24 stack - -# use https://github.com/heroku/heroku-buildpack-activestorage-preview -# in place for ffmpeg and its dependent packages to reduce slag size +ffmpeg +libopenblas0-pthread +libpq-dev +libxdamage1 +libxfixes3 diff --git a/CHANGELOG.md b/CHANGELOG.md index 4dd4783597..d47c9bc168 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,546 +2,7 @@ All notable changes to this project will be documented in this file. -## [4.3.7] - 2025-04-02 - -### Add - -- Add delay to profile updates to debounce them (#34137 by @ClearlyClaire) -- Add support for paginating partial collections in `SynchronizeFollowersService` (#34272 and #34277 by @ClearlyClaire) - -### Changed - -- Change account suspensions to be federated to recently-followed accounts as well (#34294 by @ClearlyClaire) -- Change `AccountReachFinder` to consider statuses based on suspension date (#32805 and #34291 by @ClearlyClaire and @mjankowski) -- Change user archive signed URL TTL from 10 seconds to 1 hour (#34254 by @ClearlyClaire) - -### Fixed - -- Fix static version of animated PNG emojis not being properly extracted (#34337 by @ClearlyClaire) -- Fix filters not applying in detailed view, favourites and bookmarks (#34259 and #34260 by @ClearlyClaire) -- Fix handling of malformed/unusual HTML (#34201 by @ClearlyClaire) -- Fix `CacheBuster` being queued for missing media attachments (#34253 by @ClearlyClaire) -- Fix incorrect URL being used when cache busting (#34189 by @ClearlyClaire) -- Fix streaming server refusing unix socket path in `DATABASE_URL` (#34091 by @ClearlyClaire) -- Fix “x” hotkey not working on boosted filtered posts (#33758 by @ClearlyClaire) - -## [4.3.6] - 2025-03-13 - -### Security - -- Update dependency `omniauth-saml` -- Update dependency `rack` - -### Fixed - -- Fix Stoplight errors when using `REDIS_NAMESPACE` (#34126 by @ClearlyClaire) - -## [4.3.5] - 2025-03-10 - -### Changed - -- Change hashtag suggestion to prefer personal history capitalization (#34070 by @ClearlyClaire) - -### Fixed - -- Fix processing errors for some HEIF images from iOS 18 (#34086 by @renchap) -- Fix streaming server not filtering unknown-language posts from public timelines (#33774 by @ClearlyClaire) -- Fix preview cards under Content Warnings not being shown in detailed statuses (#34068 by @ClearlyClaire) -- Fix username and display name being hidden on narrow screens in moderation interface (#33064 by @ClearlyClaire) - -## [4.3.4] - 2025-02-27 - -### Security - -- Update dependencies -- Change HTML sanitization to remove unusable and unused `embed` tag (#34021 by @ClearlyClaire, [GHSA-mq2m-hr29-8gqf](https://github.com/mastodon/mastodon/security/advisories/GHSA-mq2m-hr29-8gqf)) -- Fix rate-limit on sign-up email verification ([GHSA-v39f-c9jj-8w7h](https://github.com/mastodon/mastodon/security/advisories/GHSA-v39f-c9jj-8w7h)) -- Fix improper disclosure of domain blocks to unverified users ([GHSA-94h4-fj37-c825](https://github.com/mastodon/mastodon/security/advisories/GHSA-94h4-fj37-c825)) - -### Changed - -- Change preview cards to be shown when Content Warnings are expanded (#33827 by @ClearlyClaire) -- Change warnings against changing encryption secrets to be even more noticeable (#33631 by @ClearlyClaire) -- Change `mastodon:setup` to prevent overwriting already-configured servers (#33603, #33616, and #33684 by @ClearlyClaire and @mjankowski) -- Change notifications from moderators to not be filtered (#32974 and #33654 by @ClearlyClaire and @mjankowski) - -### Fixed - -- Fix `GET /api/v2/notifications/:id` and `POST /api/v2/notifications/:id/dismiss` for ungrouped notifications (#33990 by @ClearlyClaire) -- Fix issue with some versions of libvips on some systems (#33853 by @kleisauke) -- Fix handling of duplicate mentions in incoming status `Update` (#33911 by @ClearlyClaire) -- Fix inefficiencies in timeline generation (#33839 and #33842 by @ClearlyClaire) -- Fix emoji rewrite adding unnecessary curft to the DOM for most emoji (#33818 by @ClearlyClaire) -- Fix `tootctl feeds build` not building list timelines (#33783 by @ClearlyClaire) -- Fix flaky test in `/api/v2/notifications` tests (#33773 by @ClearlyClaire) -- Fix incorrect signature after HTTP redirect (#33757 and #33769 by @ClearlyClaire) -- Fix polls not being validated on edition (#33755 by @ClearlyClaire) -- Fix media preview height in compose form when 3 or more images are attached (#33571 by @ClearlyClaire) -- Fix preview card sizing in “Author attribution” in profile settings (#33482 by @ClearlyClaire) -- Fix processing of incoming notifications for unfilterable types (#33429 by @ClearlyClaire) -- Fix featured tags for remote accounts not being kept up to date (#33372, #33406, and #33425 by @ClearlyClaire and @mjankowski) -- Fix notification polling showing a loading bar in web UI (#32960 by @Gargron) -- Fix accounts table long display name (#29316 by @WebCoder49) -- Fix exclusive lists interfering with notifications (#28162 by @ShadowJonathan) - -## [4.3.3] - 2025-01-16 - -### Security - -- Fix insufficient validation of account URIs ([GHSA-5wxh-3p65-r4g6](https://github.com/mastodon/mastodon/security/advisories/GHSA-5wxh-3p65-r4g6)) -- Update dependencies - -### Fixed - -- Fix `libyaml` missing from `Dockerfile` build stage (#33591 by @vmstan) -- Fix incorrect notification settings migration for non-followers (#33348 by @ClearlyClaire) -- Fix down clause for notification policy v2 migrations (#33340 by @jesseplusplus) -- Fix error decrementing status count when `FeaturedTags#last_status_at` is `nil` (#33320 by @ClearlyClaire) -- Fix last paginated notification group only including data on a single notification (#33271 by @ClearlyClaire) -- Fix processing of mentions for post edits with an existing corresponding silent mention (#33227 by @ClearlyClaire) -- Fix deletion of unconfirmed users with Webauthn set (#33186 by @ClearlyClaire) -- Fix empty authors preview card serialization (#33151, #33466 by @mjankowski and @ClearlyClaire) - -## [4.3.2] - 2024-12-03 - -### Added - -- Add `tootctl feeds vacuum` (#33065 by @ClearlyClaire) -- Add error message when user tries to follow their own account (#31910 by @lenikadali) -- Add client_secret_expires_at to OAuth Applications (#30317 by @ThisIsMissEm) - -### Changed - -- Change design of Content Warnings and filters (#32543 by @ClearlyClaire) - -### Fixed - -- Fix processing incoming post edits with mentions to unresolvable accounts (#33129 by @ClearlyClaire) -- Fix error when including multiple instances of `embed.js` (#33107 by @YKWeyer) -- Fix inactive users' timelines being backfilled on follow and unsuspend (#33094 by @ClearlyClaire) -- Fix direct inbox delivery pushing posts into inactive followers' timelines (#33067 by @ClearlyClaire) -- Fix `TagFollow` records not being correctly handled in account operations (#33063 by @ClearlyClaire) -- Fix pushing hashtag-followed posts to feeds of inactive users (#33018 by @Gargron) -- Fix duplicate notifications in notification groups when using slow mode (#33014 by @ClearlyClaire) -- Fix posts made in the future being allowed to trend (#32996 by @ClearlyClaire) -- Fix uploading higher-than-wide GIF profile picture with libvips enabled (#32911 by @ClearlyClaire) -- Fix domain attribution field having autocorrect and autocapitalize enabled (#32903 by @ClearlyClaire) -- Fix titles being escaped twice (#32889 by @ClearlyClaire) -- Fix list creation limit check (#32869 by @ClearlyClaire) -- Fix error in `tootctl email_domain_blocks` when supplying `--with-dns-records` (#32863 by @mjankowski) -- Fix `min_id` and `max_id` causing error in search API (#32857 by @Gargron) -- Fix inefficiencies when processing removal of posts that use featured tags (#32787 by @ClearlyClaire) -- Fix alt-text pop-in not using the translated description (#32766 by @ClearlyClaire) -- Fix preview cards with long titles erroneously causing layout changes (#32678 by @ClearlyClaire) -- Fix embed modal layout on mobile (#32641 by @DismalShadowX) -- Fix and improve batch attachment deletion handling when using OpenStack Swift (#32637 by @hugogameiro) -- Fix blocks not being applied on link timeline (#32625 by @tribela) -- Fix follow counters being incorrectly changed (#32622 by @oneiros) -- Fix 'unknown' media attachment type rendering (#32613 and #32713 by @ThisIsMissEm and @renatolond) -- Fix tl language native name (#32606 by @seav) - -### Security - -- Update dependencies - -## [4.3.1] - 2024-10-21 - -### Added - -- Add more explicit explanations about author attribution and `fediverse:creator` (#32383 by @ClearlyClaire) -- Add ability to group follow notifications in WebUI, can be disabled in the column settings (#32520 by @renchap) -- Add back a 6 hours mute duration option (#32522 by @renchap) -- Add note about not changing ActiveRecord encryption secrets once they are set (#32413, #32476, #32512, and #32537 by @ClearlyClaire and @mjankowski) - -### Changed - -- Change translation feature to translate to selected regional variant (e.g. pt-BR) if available (#32428 by @c960657) - -### Removed - -- Remove ability to get embed code for remote posts (#32578 by @ClearlyClaire)\ - Getting the embed code is only reliable for local posts.\ - It never worked for non-Mastodon servers, and stopped working correctly with the changes made in 4.3.0.\ - We have therefore decided to remove the menu entry while we investigate solutions. - -### Fixed - -- Fix follow recommendation moderation page default language when using regional variant (#32580 by @ClearlyClaire) -- Fix column-settings spacing in local timeline in advanced view (#32567 by @lindwurm) -- Fix broken i18n in text welcome mailer tags area (#32571 by @mjankowski) -- Fix missing or incorrect cache-control headers for Streaming server (#32551 by @ThisIsMissEm) -- Fix only the first paragraph being displayed in some notifications (#32348 by @ClearlyClaire) -- Fix reblog icons on account media view (#32506 by @tribela) -- Fix Content-Security-Policy not allowing OpenStack SWIFT object storage URI (#32439 by @kenkiku1021) -- Fix back arrow pointing to the incorrect direction in RTL languages (#32485 by @renchap) -- Fix streaming server using `REDIS_USERNAME` instead of `REDIS_USER` (#32493 by @ThisIsMissEm) -- Fix follow recommendation carrousel scrolling on RTL layouts (#32462 and #32505 by @ClearlyClaire) -- Fix follow recommendation suppressions not applying immediately (#32392 by @ClearlyClaire) -- Fix language of push notifications (#32415 by @ClearlyClaire) -- Fix mute duration not being shown in list of muted accounts in web UI (#32388 by @ClearlyClaire) -- Fix “Mark every notification as read” not updating the read marker if scrolled down (#32385 by @ClearlyClaire) -- Fix “Mention” appearing for otherwise filtered posts (#32356 by @ClearlyClaire) -- Fix notification requests from suspended accounts still being listed (#32354 by @ClearlyClaire) -- Fix list edition modal styling (#32358 and #32367 by @ClearlyClaire and @vmstan) -- Fix 4 columns barely not fitting on 1920px screen (#32361 by @ClearlyClaire) -- Fix icon alignment in applications list (#32293 by @mjankowski) - -## [4.3.0] - 2024-10-08 - -The following changelog entries focus on changes visible to users, administrators, client developers or federated software developers, but there has also been a lot of code modernization, refactoring, and tooling work, in particular by @mjankowski. - -### Security - -- **Add confirmation interstitial instead of silently redirecting logged-out visitors to remote resources** (#27792, #28902, and #30651 by @ClearlyClaire and @Gargron)\ - This fixes a longstanding open redirect in Mastodon, at the cost of added friction when local links to remote resources are shared. -- Fix ReDoS vulnerability on some Ruby versions ([GHSA-jpxp-r43f-rhvx](https://github.com/mastodon/mastodon/security/advisories/GHSA-jpxp-r43f-rhvx)) -- Change `form-action` Content-Security-Policy directive to be more restrictive (#26897 and #32241 by @ClearlyClaire) -- Update dependencies - -### Added - -- **Add server-side notification grouping** (#29889, #30576, #30685, #30688, #30707, #30776, #30779, #30781, #30440, #31062, #31098, #31076, #31111, #31123, #31223, #31214, #31224, #31299, #31325, #31347, #31304, #31326, #31384, #31403, #31433, #31509, #31486, #31513, #31592, #31594, #31638, #31746, #31652, #31709, #31725, #31745, #31613, #31657, #31840, #31610, #31929, #32089, #32085, #32243, #32179 and #32254 by @ClearlyClaire, @Gargron, @mgmn, and @renchap)\ - Group notifications of the same type for the same target, so that your notifications no longer get cluttered by boost and favorite notifications as soon as a couple of your posts get traction.\ - This is done server-side so that clients can efficiently get relevant groups without having to go through numerous pages of individual notifications.\ - As part of this, the visual design of the entire notifications feature has been revamped.\ - This feature is intended to eventually replace the existing notifications column, but for this first beta, users will have to enable it in the “Experimental features” section of the notifications column settings.\ - The API is not final yet, but it consists of: - - a new `group_key` attribute to `Notification` entities - - `GET /api/v2/notifications`: https://docs.joinmastodon.org/methods/grouped_notifications/#get-grouped - - `GET /api/v2/notifications/:group_key`: https://docs.joinmastodon.org/methods/grouped_notifications/#get-notification-group - - `GET /api/v2/notifications/:group_key/accounts`: https://docs.joinmastodon.org/methods/grouped_notifications/#get-group-accounts - - `POST /api/v2/notifications/:group_key/dismiss`: https://docs.joinmastodon.org/methods/grouped_notifications/#dismiss-group - - `GET /api/v2/notifications/:unread_count`: https://docs.joinmastodon.org/methods/grouped_notifications/#unread-group-count -- **Add notification policies, filtered notifications and notification requests** (#29366, #29529, #29433, #29565, #29567, #29572, #29575, #29588, #29646, #29652, #29658, #29666, #29693, #29699, #29737, #29706, #29570, #29752, #29810, #29826, #30114, #30251, #30559, #29868, #31008, #31011, #30996, #31149, #31220, #31222, #31225, #31242, #31262, #31250, #31273, #31310, #31316, #31322, #31329, #31324, #31331, #31343, #31342, #31309, #31358, #31378, #31406, #31256, #31456, #31419, #31457, #31508, #31540, #31541, #31723, #32062 and #32281 by @ClearlyClaire, @Gargron, @TheEssem, @mgmn, @oneiros, and @renchap)\ - The old “Block notifications from non-followers”, “Block notifications from people you don't follow” and “Block direct messages from people you don't follow” notification settings have been replaced by a new set of settings found directly in the notification column.\ - You can now separately filter or drop notifications from people you don't follow, people who don't follow you, accounts created within the past 30 days, as well as unsolicited private mentions, and accounts limited by the moderation.\ - Instead of being outright dropped, notifications that you chose to filter are put in a separate “Filtered notifications” box that you can review separately without it clogging your main notifications.\ - This adds the following REST API endpoints: - - - `GET /api/v2/notifications/policy`: https://docs.joinmastodon.org/methods/notifications/#get-policy - - `PATCH /api/v2/notifications/policy`: https://docs.joinmastodon.org/methods/notifications/#update-the-filtering-policy-for-notifications - - `GET /api/v1/notifications/requests`: https://docs.joinmastodon.org/methods/notifications/#get-requests - - `GET /api/v1/notifications/requests/:id`: https://docs.joinmastodon.org/methods/notifications/#get-one-request - - `POST /api/v1/notifications/requests/:id/accept`: https://docs.joinmastodon.org/methods/notifications/#accept-request - - `POST /api/v1/notifications/requests/:id/dismiss`: https://docs.joinmastodon.org/methods/notifications/#dismiss-request - - `POST /api/v1/notifications/requests/accept`: https://docs.joinmastodon.org/methods/notifications/#accept-multiple-requests - - `POST /api/v1/notifications/requests/dismiss`: https://docs.joinmastodon.org/methods/notifications/#dismiss-multiple-requests - - `GET /api/v1/notifications/requests/merged`: https://docs.joinmastodon.org/methods/notifications/#requests-merged - - In addition, accepting one or more notification requests generates a new streaming event: - - - `notifications_merged`: an event of this type indicates accepted notification requests have finished merging, and the notifications list should be refreshed - -- **Add notifications of severed relationships** (#27511, #29665, #29668, #29670, #29700, #29714, #29712, and #29731 by @ClearlyClaire and @Gargron)\ - Notify local users when they lose relationships as a result of a local moderator blocking a remote account or server, allowing the affected user to retrieve the list of broken relationships.\ - Note that this does not notify remote users.\ - This adds the `severed_relationships` notification type to the REST API and streaming, with a new [`event` attribute](https://docs.joinmastodon.org/entities/Notification/#relationship_severance_event). -- **Add hover cards in web UI** (#30754, #30864, #30850, #30879, #30928, #30949, #30948, #30931, and #31300 by @ClearlyClaire, @Gargron, and @renchap)\ - Hovering over an avatar or username will now display a hover card with the first two lines of the user's description and their first two profile fields.\ - This can be disabled in the “Animations and accessibility” section of the preferences. -- **Add "system" theme setting (light/dark theme depending on user system preference)** (#29748, #29553, #29795, #29918, #30839, and #30861 by @nshki, @ErikUden, @mjankowski, @renchap, and @vmstan)\ - Add a “system” theme that automatically switch between default dark and light themes depending on the user's system preferences.\ - Also changes the default server theme to this new “system” theme so that automatic theme selection happens even when logged out. -- **Add timeline of public posts about a trending link** (#30381 and #30840 by @Gargron)\ - You can now see public posts mentioning currently-trending articles from people who have opted into discovery features.\ - This adds a new REST API endpoint: https://docs.joinmastodon.org/methods/timelines/#link -- **Add author highlight for news articles whose authors are on the fediverse** (#30398, #30670, #30521, #30846, #31819, #31900 and #32188 by @Gargron, @mjankowski and @oneiros)\ - This adds a mechanism to [highlight the author of news articles](https://blog.joinmastodon.org/2024/07/highlighting-journalism-on-mastodon/) shared on Mastodon.\ - Articles hosted outside the fediverse can indicate a fediverse author with a meta tag: - ```html - - ``` - On the API side, this is represented by a new `authors` attribute to the `PreviewCard` entity: https://docs.joinmastodon.org/entities/PreviewCard/#authors \ - Users can allow arbitrary domains to use `fediverse:creator` to credit them by visiting `/settings/verification`.\ - This is federated as a new `attributionDomains` property in the `http://joinmastodon.org/ns` namespace, containing an array of domain names: https://docs.joinmastodon.org/spec/activitypub/#properties-used-1 -- **Add in-app notifications for moderation actions and warnings** (#30065, #30082, and #30081 by @ClearlyClaire)\ - In addition to email notifications, also notify users of moderation actions or warnings against them directly within the app, so they are less likely to miss important communication from their moderators.\ - This adds the `moderation_warning` notification type to the REST API and streaming, with a new [`moderation_warning` attribute](https://docs.joinmastodon.org/entities/Notification/#moderation_warning). -- **Add domain information to profiles in web UI** (#29602 by @Gargron)\ - Clicking the domain of a user in their profile will now open a tooltip with a short explanation about servers and federation. -- **Add support for Redis sentinel** (#31694, #31623, #31744, #31767, and #31768 by @ThisIsMissEm and @oneiros)\ - See https://docs.joinmastodon.org/admin/scaling/#redis-sentinel -- **Add ability to reorder uploaded media before posting in web UI** (#28456 and #32093 by @Gargron) -- Add “A Mastodon update is available.” message on admin dashboard for non-bugfix updates (#32106 by @ClearlyClaire) -- Add ability to view alt text by clicking the ALT badge in web UI (#32058 by @Gargron) -- Add preview of followers removed in domain block modal in web UI (#32032 and #32105 by @ClearlyClaire and @Gargron) -- Add reblogs and favourites counts to statuses in ActivityPub (#32007 by @Gargron) -- Add moderation interface for searching hashtags (#30880 by @ThisIsMissEm) -- Add ability for admins to configure instance favicon and logo (#30040, #30208, #30259, #30375, #30734, #31016, and #30205 by @ClearlyClaire, @FawazFarid, @JasonPunyon, @mgmn, and @renchap)\ - This is also exposed through the REST API: https://docs.joinmastodon.org/entities/Instance/#icon -- Add `api_versions` to `/api/v2/instance` (#31354 by @ClearlyClaire)\ - Add API version number to make it easier for clients to detect compatible features going forward.\ - See API documentation at https://docs.joinmastodon.org/entities/Instance/#api-versions -- Add quick links to Administration and Moderation Reports from Web UI (#24838 by @ThisIsMissEm) -- Add link to `/admin/roles` in moderation interface when changing someone's role (#31791 by @ClearlyClaire) -- Add recent audit log entries in federation moderation interface (#27386 by @ThisIsMissEm) -- Add profile setup to onboarding in web UI (#27829, #27876, and #28453 by @Gargron) -- Add prominent share/copy button on profiles in web UI (#27865 and #27889 by @ClearlyClaire and @Gargron) -- Add optional hints for server rules (#29539 and #29758 by @ClearlyClaire and @Gargron)\ - Server rules can now be broken into a short rule name and a longer explanation of the rule.\ - This adds a new [`hint` attribute](https://docs.joinmastodon.org/entities/Rule/#hint) to `Rule` entities in the REST API. -- Add support for PKCE in OAuth flow (#31129 by @ThisIsMissEm) -- Add CDN cache busting on media deletion (#31353 and #31414 by @ClearlyClaire and @tribela) -- Add the OAuth application used in local reports (#30539 by @ThisIsMissEm) -- Add hint to user that other remote statuses may be missing (#26910, #31387, and #31516 by @Gargron, @audiodude, and @renchap) -- Add lang attribute on preview card title (#31303 by @c960657) -- Add check for `Content-Length` in `ResponseWithLimitAdapter` (#31285 by @c960657) -- Add `Accept-Language` header to fetch preview cards in the server's default language (#31232 by @c960657) -- Add support for PKCE Extension in OmniAuth OIDC through the `OIDC_USE_PKCE` environment variable (#31131 by @ThisIsMissEm) -- Add API endpoints for unread notifications count (#31191 by @ClearlyClaire)\ - This adds the following REST API endpoints: - - `GET /api/v1/notifications/unread_count`: https://docs.joinmastodon.org/methods/notifications/#unread-count -- Add `/` keyboard shortcut to focus the search field (#29921 by @ClearlyClaire) -- Add button to view the Hashtag on the instance from Hashtags in Moderation UI (#31533 by @ThisIsMissEm) -- Add list of pending releases directly in mail notifications for version updates (#29436 and #30035 by @ClearlyClaire) -- Add “Appeals” link under “Moderation” navigation category in moderation interface (#31071 by @ThisIsMissEm) -- Add badge on account card in report moderation interface when account is already suspended (#29592 by @ClearlyClaire) -- Add admin comments directly to the `admin/instances` page (#29240 by @tribela) -- Add ability to require approval when users sign up using specific email domains (#28468, #28732, #28607, and #28608 by @ClearlyClaire) -- Add banner for forwarded reports made by remote users about remote content (#27549 by @ClearlyClaire) -- Add support HTML ruby tags in remote posts for east-asian languages (#30897 by @ThisIsMissEm) -- Add link to manage warning presets in admin navigation (#26199 by @vmstan) -- Add volume saving/reuse to video player (#27488 by @thehydrogen) -- Add Elasticsearch index size, ffmpeg and ImageMagick versions to the admin dashboard (#27301, #30710, #31130, and #30845 by @vmstan) -- Add `MASTODON_SIDEKIQ_READY_FILENAME` environment variable to use a file for Sidekiq to signal it is ready to process jobs (#30971 and #30988 by @renchap)\ - In the official Docker image, this is set to `sidekiq_process_has_started_and_will_begin_processing_jobs` so that Sidekiq will touch `tmp/sidekiq_process_has_started_and_will_begin_processing_jobs` to signal readiness. -- Add `S3_RETRY_LIMIT` environment variable to make S3 retries configurable (#23215 by @smiba) -- Add `S3_KEY_PREFIX` environment variable (#30181 by @S0yKaf) -- Add support for multiple `redirect_uris` when creating OAuth 2.0 Applications (#29192 by @ThisIsMissEm) -- Add Interlingue and Interlingua to interface languages (#28630 and #30828 by @Dhghomon and @renchap) -- Add Kashubian, Pennsylvania Dutch, Vai, Jawi Malay, Mohawk and Low German to posting languages (#26024, #26634, #27136, #29098, #27115, and #27434 by @EngineerDali, @HelgeKrueger, and @gunchleoc) -- Add option to use native Ruby driver for Redis through `REDIS_DRIVER=ruby` (#30717 by @vmstan) -- Add support for libvips in addition to ImageMagick (#30090, #30590, #30597, #30632, #30857, #30869, #30858 and #32104 by @ClearlyClaire, @Gargron, and @mjankowski)\ - Server admins can now use libvips as a faster and lighter alternative to ImageMagick for processing user-uploaded images.\ - This requires libvips 8.13 or newer, and needs to be enabled with `MASTODON_USE_LIBVIPS=true`.\ - This is enabled by default in the official Docker images, and is intended to completely replace ImageMagick in the future. -- Add validations to `Web::PushSubscription` (#30540 and #30542 by @ThisIsMissEm) -- Add anchors to each authorized application in `/oauth/authorized_applications` (#31677 by @fowl2) -- Add active animation to header settings button (#30221, #30307, and #30388 by @daudix) -- Add OpenTelemetry instrumentation (#30130, #30322, #30353, #30350 and #31998 by @julianocosta89, @renchap, @robbkidd and @timetinytim)\ - See https://docs.joinmastodon.org/admin/config/#otel for documentation -- Add API to get multiple accounts and statuses (#27871 and #30465 by @ClearlyClaire)\ - This adds `GET /api/v1/accounts` and `GET /api/v1/statuses` to the REST API, see https://docs.joinmastodon.org/methods/accounts/#index and https://docs.joinmastodon.org/methods/statuses/#index -- Add support for CORS to `POST /oauth/revoke` (#31743 by @ClearlyClaire) -- Add redirection back to previous page after site upload deletion (#30141 by @FawazFarid) -- Add RFC8414 OAuth 2.0 server metadata (#29191 by @ThisIsMissEm) -- Add loading indicator and empty result message to advanced interface search (#30085 by @ClearlyClaire) -- Add `profile` OAuth 2.0 scope, allowing more limited access to user data (#29087 and #30357 by @ThisIsMissEm) -- Add the role ID to the badge component (#29707 by @renchap) -- Add diagnostic message for failure during CLI search deploy (#29462 by @mjankowski) -- Add pagination `Link` headers on API accounts/statuses when pinned true (#29442 by @mjankowski) -- Add support for specifying custom CA cert for Elasticsearch through `ES_CA_FILE` (#29122 and #29147 by @ClearlyClaire) -- Add groundwork for annual reports for accounts (#28693 by @Gargron)\ - This lays the groundwork for a “year-in-review”/“wrapped” style report for local users, but is currently not in use. -- Add notification email on invalid second authenticator (#28822 by @ClearlyClaire) -- Add date of account deletion in list of accounts in the admin interface (#25640 by @tribela) -- Add new emojis from `jdecked/twemoji` 15.0 (#28404 by @TheEssem) -- Add configurable error handling in attachment batch deletion (#28184 by @vmstan)\ - This makes the S3 batch size configurable through the `S3_BATCH_DELETE_LIMIT` environment variable (defaults to 1000), and adds some retry logic, configurable through the `S3_BATCH_DELETE_RETRY` environment variable (defaults to 3). -- Add VAPID public key to instance serializer (#28006 by @ThisIsMissEm) -- Add support for serving JRD `/.well-known/host-meta.json` in addition to XRD host-meta (#32206 by @c960657) -- Add `nodeName` and `nodeDescription` to nodeinfo `metadata` (#28079 by @6543) -- Add Thai diacritics and tone marks in `HASHTAG_INVALID_CHARS_RE` (#26576 by @ppnplus) -- Add variable delay before link verification of remote account links (#27774 by @ClearlyClaire) -- Add support for invite codes in the registration API (#27805 by @ClearlyClaire) -- Add HTML lang attribute to preview card descriptions (#27503 by @srapilly) -- Add display of relevant account warnings to report action logs (#27425 by @ClearlyClaire) -- Add validation of allowed schemes on preview card URLs (#27485 by @mjankowski) -- Add token introspection without read scope to `/api/v1/apps/verify_credentials` (#27142 by @ThisIsMissEm) -- Add support for cross-origin request to `/nodeinfo/2.0` (#27413 by @palant) -- Add variable delay before link verification of remote account links (#27351 by @ClearlyClaire) -- Add PWA shortcut to `/explore` page (#27235 by @jake-anto) - -### Changed - -- **Change icons throughout the web interface** (#27385, #27539, #27555, #27579, #27700, #27817, #28519, #28709, #28064, #28775, #28780, #27924, #29294, #29395, #29537, #29569, #29610, #29612, #29649, #29844, #27780, #30974, #30963, #30962, #30961, #31362, #31363, #31359, #31371, #31360, #31512, #31511, #31525, #32153, and #32201 by @ClearlyClaire, @Gargron, @arbolitoloco1, @mjankowski, @nclm, @renchap, @ronilaukkarinen, and @zunda)\ - This changes all the interface icons from FontAwesome to Material Symbols for a more modern look, consistent with the official Mastodon Android app.\ - In addition, better care is given to pixel alignment, and icon variants are used to better highlight active/inactive state. -- **Change design of compose form in web UI** (#28119, #29059, #29248, #29372, #29384, #29417, #29456, #29406, #29651, #29659, #31889 and #32033 by @ClearlyClaire, @Gargron, @eai04191, @hinaloe, and @ronilaukkarinen)\ - The compose form has been completely redesigned for a more modern and consistent look, as well as spelling out the chosen privacy setting and language name at all times.\ - As part of this, the “Unlisted” privacy setting has been renamed to “Quiet public”. -- **Change design of modals in the web UI** (#29576, #29614, #29640, #29644, #30131, #30884, #31399, #31555, #31752, #31801, #31883, #31844, #31864, and #31943 by @ClearlyClaire, @Gargron, @tribela and @vmstan)\ - The mute, block, and domain block confirmation modals have been completely redesigned to be clearer and include more detailed information on the action to be performed.\ - They also have a more modern and consistent design, along with other confirmation modals in the application. -- **Change colors throughout the web UI** (#29522, #29584, #29653, #29779, #29803, #29809, #29808, #29828, #31034, #31168, #31266, #31348, #31349, #31361, #31510 and #32128 by @ClearlyClaire, @Gargron, @mjankowski, @renchap, and @vmstan) -- **Change onboarding prompt to follow suggestions carousel in web UI** (#28878, #29272, and #31912 by @Gargron) -- **Change email templates** (#28416, #28755, #28814, #29064, #28883, #29470, #29607, #29761, #29760, #29879, #32073 and #32132 by @c960657, @ClearlyClaire, @Gargron, @hteumeuleu, and @mjankowski)\ - All emails to end-users have been completely redesigned with a fresh new look, providing more information while making them easier to read and keeping maximum compatibility across mail clients. -- **Change follow recommendations algorithm** (#28314, #28433, #29017, #29108, #29306, #29550, #29619, and #31474 by @ClearlyClaire, @Gargron, @kernal053, @mjankowski, and @wheatear-dev)\ - This replaces the “past interactions” recommendation algorithm with a “friends of friends” algorithm that suggests accounts followed by people you follow, and a “similar profiles” algorithm that suggests accounts with a profile similar to your most recent follows.\ - In addition, the implementation has been significantly reworked, and all follow recommendations are now dismissable.\ - This change deprecates the `source` attribute in `Suggestion` entities in the REST API, and replaces it with the new [`sources` attribute](https://docs.joinmastodon.org/entities/Suggestion/#sources). -- Change account search algorithm (#30803 by @Gargron) -- **Change streaming server to use its own dependencies and its own docker image** (#24702, #27967, #26850, #28112, #28115, #28137, #28138, #28497, #28548, #30795, #31612, and #31615 by @TheEssem, @ThisIsMissEm, @jippi, @renchap, @timetinytim, and @vmstan)\ - In order to reduce the amount of runtime dependencies, the streaming server has been moved into a separate package and Docker image.\ - The `mastodon` image does not contain the streaming server anymore, as it has been moved to its own `mastodon-streaming` image.\ - Administrators may need to update their setup accordingly. -- Change how content warnings and filters are displayed in web UI (#31365, and #31761 by @Gargron) -- Change preview card processing to ignore `undefined` as canonical url (#31882 by @oneiros) -- Change embedded posts to use web UI (#31766, #32135 and #32271 by @Gargron) -- Change inner borders in media galleries in web UI (#31852 by @Gargron) -- Change design of media attachments and profile media tab in web UI (#31807, #32048, #31967, #32217, #32224 and #32257 by @ClearlyClaire and @Gargron) -- Change labels on thread indicators in web UI (#31806 by @Gargron) -- Change label of "Data export" menu item in settings interface (#32099 by @c960657) -- Change responsive break points on navigation panel in web UI (#32034 by @Gargron) -- Change cursor to `not-allowed` on disabled buttons (#32076 by @mjankowski) -- Change OAuth authorization prompt to not refer to apps as “third-party” (#32005 by @Gargron) -- Change Mastodon to issue correct HTTP signatures by default (#31994 by @ClearlyClaire) -- Change zoom icon in web UI (#29683 by @Gargron) -- Change directory page to use URL query strings for options (#31980, #31977 and #31984 by @ClearlyClaire and @renchap) -- Change report action buttons to be disabled when action has already been taken (#31773, #31822, and #31899 by @ClearlyClaire and @ThisIsMissEm) -- Change width of columns in advanced web UI (#31762 by @Gargron) -- Change design of unread conversations in web UI (#31763 by @Gargron) -- Change Web UI to allow viewing and severing relationships with suspended accounts (#27667 by @ClearlyClaire)\ - This also adds a `with_suspended` parameter to `GET /api/v1/accounts/relationships` in the REST API. -- Change preview card image size limit from 2MB to 8MB when using libvips (#31904 by @ClearlyClaire) -- Change avatars border radius (#31390 by @renchap) -- Change counters to be displayed on profile timelines in web UI (#30525 by @Gargron) -- Change disabled buttons color in light mode to make the difference more visible (#30998 by @renchap) -- Change design of people tab on explore in web UI (#30059 by @Gargron) -- Change sidebar text in web UI (#30696 by @Gargron) -- Change "Follow" to "Follow back" and "Mutual" when appropriate in web UI (#28452, #28465, and #31934 by @ClearlyClaire, @Gargron and @renchap) -- Change media to be hidden/blurred by default in report modal (#28522 by @ClearlyClaire) -- Change order of the "muting" and "blocking" list options in “Data Exports” (#26088 by @fixermark) -- Change admin and moderation notes character limit from 500 to 2000 characters (#30288 by @ThisIsMissEm) -- Change mute options to be in dropdown on muted users list in web UI (#30049 and #31315 by @ClearlyClaire and @Gargron) -- Change out-of-band hashtags design in web UI (#29732 by @Gargron) -- Change design of metadata underneath detailed posts in web UI (#29585, #29605, and #29648 by @ClearlyClaire and @Gargron) -- Change action button to be last on profiles in web UI (#29533 and #29923 by @ClearlyClaire and @Gargron) -- Change confirmation prompts in trending moderation interface to be more specific (#19626 by @tribela) -- Change “Trends” moderation menu to “Recommendations & Trends” and move follow recommendations there (#31292 by @ThisIsMissEm) -- Change irrelevant fields in account cleanup settings to be disabled unless automatic cleanup is enabled (#26562 by @c960657) -- Change dropdown menu icon to not be replaced by close icon when open in web UI (#29532 by @Gargron) -- Change back button to always appear in advanced web UI (#29551 and #29669 by @Gargron) -- Change border of active compose field search inputs (#29832 and #29839 by @vmstan) -- Change instances of Nokogiri HTML4 parsing to HTML5 (#31812, #31815, #31813, and #31814 by @flavorjones) -- Change link detection to allow `@` at the end of an URL (#31124 by @adamniedzielski) -- Change User-Agent to use Mastodon as the product, and http.rb as platform details (#31192 by @ClearlyClaire) -- Change layout and wording of the Content Retention server settings page (#27733 by @vmstan) -- Change unconfirmed users to be kept for one week instead of two days (#30285 by @renchap) -- Change maximum page size for Admin Domain Management APIs from 200 to 500 (#31253 by @ThisIsMissEm) -- Change database pool size to default to Sidekiq concurrency settings in Sidekiq processes (#26488 by @sinoru) -- Change alt text to empty string for avatars (#21875 by @jasminjohal) -- Change Docker images to use custom-built libvips and ffmpeg (#30571, #30569, and #31498 by @vmstan) -- Change external links in the admin audit log to plain text or local administration pages (#27139 and #27150 by @ClearlyClaire and @ThisIsMissEm) -- Change YJIT to be enabled when available (#30310 and #27283 by @ClearlyClaire and @mjankowski)\ - Enable Ruby's built-in just-in-time compiler. This improves performances substantially, at the cost of a slightly increased memory usage. -- Change `.env` file loading from deprecated `dotenv-rails` gem to `dotenv` gem (#29173 and #30121 by @mjankowski)\ - This should have no effect except in the unlikely case an environment variable included a newline. -- Change “Panjabi” language name to the more common spelling “Punjabi” (#27117 by @gunchleoc) -- Change encryption of OTP secrets to use ActiveRecord Encryption (#29831, #28325, #30151, #30202, #30340, and #30344 by @ClearlyClaire and @mjankowski)\ - This requires a manual step from administrators of existing servers. Indeed, they need to generate new secrets, which can be done using `bundle exec rails db:encryption:init`.\ - Furthermore, there is a risk that the introduced migration fails if the server was misconfigured in the past. If that happens, the migration error will include the relevant information. -- Change `/api/v1/announcements` to return regular `Status` entities (#26736 by @ClearlyClaire) -- Change imports to convert case-insensitive fields to lowercase (#29739 and #29740 by @ThisIsMissEm) -- Change stats in the admin interface to be inclusive of the full selected range, from beginning of day to end of day (#29416 and #29841 by @mjankowski) -- Change materialized views to be refreshed concurrently to avoid locks (#29015 by @Gargron) -- Change compose form to use server-provided post character and poll options limits (#28928 and #29490 by @ClearlyClaire and @renchap) -- Change streaming server logging from `npmlog` to `pino` and `pino-http` (#27828 by @ThisIsMissEm)\ - This changes the Mastodon streaming server log format, so this might be considered a breaking change if you were parsing the logs. -- Change media “ALT” label to use a specific CSS class (#28777 by @ClearlyClaire) -- Change streaming API host to not be overridden to localhost in development mode (#28557 by @ClearlyClaire) -- Change cookie rotator to use SHA1 digest for new cookies (#27392 by @ClearlyClaire)\ - Note that this requires that no pre-4.2.0 Mastodon web server is running when this code is deployed, as those would not understand the new cookies.\ - Therefore, zero-downtime updates are only supported if you're coming from 4.2.0 or newer. If you want to skip Mastodon 4.2, you will need to completely stop Mastodon services before updating. -- Change preview card deletes to be done using batch method (#28183 by @vmstan) -- Change `img-src` and `media-src` CSP directives to not include `https:` (#28025 and #28561 by @ClearlyClaire) -- Change self-destruct procedure (#26439, #29049, and #29420 by @ClearlyClaire and @zunda)\ - Instead of enqueuing deletion jobs immediately, `tootctl self-destruct` now outputs a value for the `SELF_DESTRUCT` environment variable, which puts a server in self-destruct mode, processing deletions in the background, while giving users access to their export archives. - -### Removed - -- Remove unused E2EE messaging code and related `crypto` OAuth scope (#31193, #31945, #31963, and #31964 by @ClearlyClaire and @mjankowski) -- Remove StatsD integration (replaced by OpenTelemetry) (#30240 by @mjankowski) -- Remove `CacheBuster` default options (#30718 by @mjankowski) -- Remove home marker updates from the Web UI (#22721 by @davbeck)\ - The web interface was unconditionally updating the home marker to the most recent received post, discarding any value set by other clients, thus making the feature unreliable. -- Remove support for Ruby 3.0 (reaching EOL) (#29702 by @mjankowski) -- Remove setting for unfollow confirmation modal (#29373 by @ClearlyClaire)\ - Instead, the unfollow confirmation modal will always be displayed. -- Remove support for Capistrano (#27295 and #30009 by @mjankowski and @renchap) - -### Fixed - -- **Fix link preview cards not always preserving the original URL from the status** (#27312 by @Gargron) -- Fix log out from user menu not working on Safari (#31402 by @renchap) -- Fix various issues when in link preview card generation (#28748, #30017, #30362, #30173, #30853, #30929, #30933, #30957, #30987, and #31144 by @adamniedzielski, @oneiros, @phocks, @timothyjrogers, and @tribela) -- Fix handling of missing links in Webfinger responses (#31030 by @adamniedzielski) -- Fix error when accepting an appeal for sensitive posts deleted in the meantime (#32037 by @ClearlyClaire) -- Fix error when encountering reblog of deleted post in feed rebuild (#32001 by @ClearlyClaire) -- Fix Safari browser glitch related to horizontal scrolling (#31960 by @Gargron) -- Fix unresolvable mentions sometimes preventing processing incoming posts (#29215 by @tribela and @ClearlyClaire) -- Fix too many requests caused by relationship look-ups in web UI (#32042 by @Gargron) -- Fix links for reblogs in moderation interface (#31979 by @ClearlyClaire) -- Fix the appearance of avatars when they do not load (#31966 and #32270 by @Gargron and @renchap) -- Fix spurious error notifications for aborted requests in web UI (#31952 by @c960657) -- Fix HTTP 500 error in `/api/v1/polls/:id/votes` when required `choices` parameter is missing (#25598 by @danielmbrasil) -- Fix security context sometimes not being added in LD-Signed activities (#31871 by @ClearlyClaire) -- Fix cross-origin loading of `inert.css` polyfill (#30687 by @louis77) -- Fix wrapping in dashboard quick access buttons (#32043 by @renchap) -- Fix recently used tags hint being displayed in profile edition page when there is none (#32120 by @mjankowski) -- Fix checkbox lists on narrow screens in the settings interface (#32112 by @mjankowski) -- Fix the position of status action buttons being affected by interaction counters (#32084 by @renchap) -- Fix the summary of converted ActivityPub object types to be treated as HTML (#28629 by @Menrath) -- Fix cutoff of instance name in sign-up form (#30598 by @oneiros) -- Fix invalid date searches returning 503 errors (#31526 by @notchairmk) -- Fix invalid `visibility` values in `POST /api/v1/statuses` returning 500 errors (#31571 by @c960657) -- Fix some components re-rendering spuriously in web UI (#31879 and #31881 by @ClearlyClaire and @Gargron) -- Fix sort order of moderation notes on Reports and Accounts (#31528 by @ThisIsMissEm) -- Fix email language when recipient has no selected locale (#31747 by @ClearlyClaire) -- Fix frequently-used languages not correctly updating in the web UI (#31386 by @c960657) -- Fix `POST /api/v1/statuses` silently ignoring invalid `media_ids` parameter (#31681 by @c960657) -- Fix handling of the `BIND` environment variable in the streaming server (#31624 by @ThisIsMissEm) -- Fix empty `aria-hidden` attribute value in logo resources area (#30570 by @mjankowski) -- Fix “Redirect URI” field not being marked as required in “New application” form (#30311 by @ThisIsMissEm) -- Fix right-to-left text in preview cards (#30930 by @ClearlyClaire) -- Fix rack attack `match_type` value typo in logging config (#30514 by @mjankowski) -- Fix various cases of duplicate, missing, or inconsistent borders or scrollbar styles (#31068, #31286, #31268, #31275, #31284, #31305, #31346, #31372, #31373, #31389, #31432, #31391, #31445, #32091, #32147 and #32137 by @ClearlyClaire, @mjankowski, @valtlai and @vmstan) -- Fix editing description of media uploads with custom thumbnails (#32221 by @ClearlyClaire) -- Fix race condition in `POST /api/v1/push/subscription` (#30166 by @ClearlyClaire) -- Fix post deletion not being delayed when those are part of an account warning (#30163 by @ClearlyClaire) -- Fix rendering error on `/start` when not logged in (#30023 by @timothyjrogers) -- Fix unneeded requests to blocked domains when receiving relayed signed activities from them (#31161 by @ClearlyClaire) -- Fix logo pushing header buttons out of view on certain conditions in mobile layout (#29787 by @ClearlyClaire) -- Fix notification-related records not being reattributed when merging accounts (#29694 by @ClearlyClaire) -- Fix results/query in `api/v1/featured_tags/suggestions` (#29597 by @mjankowski) -- Fix distracting and confusing always-showing scrollbar track in boost confirmation modal (#31524 by @ClearlyClaire) -- Fix being able to upload more than 4 media attachments in some cases (#29183 by @mashirozx) -- Fix preview card player getting embedded when clicking on the external link button (#29457 by @ClearlyClaire) -- Fix full date display not respecting the locale 12/24h format (#29448 by @renchap) -- Fix filters title and keywords overflow (#29396 by @GeopJr) -- Fix incorrect date format in “Follows and followers” (#29390 by @JasonPunyon) -- Fix navigation item active highlight for some paths (#32159 by @mjankowski) -- Fix “Edit media” modal sizing and layout when space-constrained (#27095 by @ronilaukkarinen) -- Fix modal container bounds (#29185 by @nico3333fr) -- Fix inefficient HTTP signature parsing using regexps and `StringScanner` (#29133 by @ClearlyClaire) -- Fix moderation report updates through `PUT /api/v1/admin/reports/:id` not being logged in the audit log (#29044, #30342, and #31033 by @mjankowski, @tribela, and @vmstan) -- Fix moderation interface allowing to select rule violation when there are no server rules (#31458 by @ThisIsMissEm) -- Fix redirection from paths with url-encoded `@` to their decoded form (#31184 by @timothyjrogers) -- Fix Trending Tags pending review having an unstable sort order (#31473 by @ThisIsMissEm) -- Fix the emoji dropdown button always opening the dropdown instead of behaving like a toggle (#29012 by @jh97uk) -- Fix processing of incoming posts with bearcaps (#26527 by @kmycode) -- Fix support for IPv6 redis connections in streaming (#31229 by @ThisIsMissEm) -- Fix search form re-rendering spuriously in web UI (#28876 by @Gargron) -- Fix `RedownloadMediaWorker` not being called on transient S3 failure (#28714 by @ClearlyClaire) -- Fix ISO code for Canadian French from incorrect `fr-QC` to `fr-CA` (#26015 by @gunchleoc) -- Fix `.opus` file uploads being misidentified by Paperclip (#28580 by @vmstan) -- Fix loading local accounts with extraneous domain part in WebUI (#28559 by @ClearlyClaire) -- Fix destructive actions in dropdowns not using error color in light theme (#28484 by @logicalmoody) -- Fix call to inefficient `delete_matched` cache method in domain blocks (#28374 by @ClearlyClaire) -- Fix status edits not always being streamed to mentioned users (#28324 by @ClearlyClaire) -- Fix onboarding step descriptions being truncated on narrow screens (#28021 by @ClearlyClaire) -- Fix duplicate IDs in relationships and familiar_followers APIs (#27982 by @KevinBongart) -- Fix modal content not being selectable (#27813 by @pajowu) -- Fix Web UI not displaying appropriate explanation when a user hides their follows/followers (#27791 by @ClearlyClaire) -- Fix format-dependent redirects being cached regardless of requested format (#27632 by @ClearlyClaire) -- Fix confusing screen when visiting a confirmation link for an already-confirmed email (#27368 by @ClearlyClaire) -- Fix explore page reloading when you navigate back to it in web UI (#27489 by @Gargron) -- Fix missing redirection from `/home` to `/deck/home` in the advanced interface (#27378 by @Signez) -- Fix empty environment variables not using default nil value (#27400 by @renchap) -- Fix language sorting in settings (#27158 by @gunchleoc) - -## [4.2.11] - 2024-08-16 +## |4.2.11] - 2024-08-16 ### Added diff --git a/Dockerfile b/Dockerfile index 6620f4c096..7f7eca06da 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -# syntax=docker/dockerfile:1.12 +# syntax=docker/dockerfile:1.8 # This file is designed for production server deployment, not local development work -# For a containerized local dev environment, see: https://github.com/mastodon/mastodon/blob/main/docs/DEVELOPMENT.md#docker +# For a containerized local dev environment, see: https://github.com/mastodon/mastodon/blob/main/README.md#docker # Please see https://docs.docker.com/engine/reference/builder for information about # the extended buildx capabilities used in this file. @@ -9,20 +9,19 @@ # See: https://docs.docker.com/build/building/multi-platform/ ARG TARGETPLATFORM=${TARGETPLATFORM} ARG BUILDPLATFORM=${BUILDPLATFORM} -ARG BASE_REGISTRY="docker.io" -# Ruby image to use for base image, change with [--build-arg RUBY_VERSION="3.4.x"] +# Ruby image to use for base image, change with [--build-arg RUBY_VERSION="3.3.x"] # renovate: datasource=docker depName=docker.io/ruby -ARG RUBY_VERSION="3.4.2" -# # Node.js version to use in base image, change with [--build-arg NODE_MAJOR_VERSION="20"] +ARG RUBY_VERSION="3.3.3" +# # Node version to use in base image, change with [--build-arg NODE_MAJOR_VERSION="20"] # renovate: datasource=node-version depName=node -ARG NODE_MAJOR_VERSION="22" +ARG NODE_MAJOR_VERSION="20" # Debian image to use for base image, change with [--build-arg DEBIAN_VERSION="bookworm"] ARG DEBIAN_VERSION="bookworm" -# Node.js image to use for base image based on combined variables (ex: 20-bookworm-slim) -FROM ${BASE_REGISTRY}/node:${NODE_MAJOR_VERSION}-${DEBIAN_VERSION}-slim AS node -# Ruby image to use for base image based on combined variables (ex: 3.4.x-slim-bookworm) -FROM ${BASE_REGISTRY}/ruby:${RUBY_VERSION}-slim-${DEBIAN_VERSION} AS ruby +# Node image to use for base image based on combined variables (ex: 20-bookworm-slim) +FROM docker.io/node:${NODE_MAJOR_VERSION}-${DEBIAN_VERSION}-slim AS node +# Ruby image to use for base image based on combined variables (ex: 3.3.x-slim-bookworm) +FROM docker.io/ruby:${RUBY_VERSION}-slim-${DEBIAN_VERSION} AS ruby # Resulting version string is vX.X.X-MASTODON_VERSION_PRERELEASE+MASTODON_VERSION_METADATA # Example: v4.3.0-nightly.2023.11.09+pr-123456 @@ -30,8 +29,6 @@ FROM ${BASE_REGISTRY}/ruby:${RUBY_VERSION}-slim-${DEBIAN_VERSION} AS ruby ARG MASTODON_VERSION_PRERELEASE="" # Append build metadata or fork information to version.rb [--build-arg MASTODON_VERSION_METADATA="pr-123456"] ARG MASTODON_VERSION_METADATA="" -# Will be available as Mastodon::Version.source_commit -ARG SOURCE_COMMIT="" # Allow Ruby on Rails to serve static files # See: https://docs.joinmastodon.org/admin/config/#rails_serve_static_files @@ -48,32 +45,29 @@ ARG GID="991" # Apply Mastodon build options based on options above ENV \ - # Apply Mastodon version information +# Apply Mastodon version information MASTODON_VERSION_PRERELEASE="${MASTODON_VERSION_PRERELEASE}" \ MASTODON_VERSION_METADATA="${MASTODON_VERSION_METADATA}" \ - SOURCE_COMMIT="${SOURCE_COMMIT}" \ - # Apply Mastodon static files and YJIT options +# Apply Mastodon static files and YJIT options RAILS_SERVE_STATIC_FILES=${RAILS_SERVE_STATIC_FILES} \ RUBY_YJIT_ENABLE=${RUBY_YJIT_ENABLE} \ - # Apply timezone +# Apply timezone TZ=${TZ} ENV \ - # Configure the IP to bind Mastodon to when serving traffic +# Configure the IP to bind Mastodon to when serving traffic BIND="0.0.0.0" \ - # Use production settings for Yarn, Node.js and related tools +# Use production settings for Yarn, Node and related nodejs based tools NODE_ENV="production" \ - # Use production settings for Ruby on Rails +# Use production settings for Ruby on Rails RAILS_ENV="production" \ - # Add Ruby and Mastodon installation to the PATH +# Add Ruby and Mastodon installation to the PATH DEBIAN_FRONTEND="noninteractive" \ PATH="${PATH}:/opt/ruby/bin:/opt/mastodon/bin" \ - # Optimize jemalloc 5.x performance +# Optimize jemalloc 5.x performance MALLOC_CONF="narenas:2,background_thread:true,thp:never,dirty_decay_ms:1000,muzzy_decay_ms:0" \ - # Enable libvips, should not be changed - MASTODON_USE_LIBVIPS=true \ - # Sidekiq will touch tmp/sidekiq_process_has_started_and_will_begin_processing_jobs to indicate it is ready. This can be used for a readiness check in Kubernetes - MASTODON_SIDEKIQ_READY_FILENAME=sidekiq_process_has_started_and_will_begin_processing_jobs +# Enable libvips, should not be changed + MASTODON_USE_LIBVIPS=true # Set default shell used for running commands SHELL ["/bin/bash", "-o", "pipefail", "-o", "errexit", "-c"] @@ -83,122 +77,128 @@ ARG TARGETPLATFORM RUN echo "Target platform is $TARGETPLATFORM" RUN \ - # Remove automatic apt cache Docker cleanup scripts +# Remove automatic apt cache Docker cleanup scripts rm -f /etc/apt/apt.conf.d/docker-clean; \ - # Sets timezone +# Sets timezone echo "${TZ}" > /etc/localtime; \ - # Creates mastodon user/group and sets home directory +# Creates mastodon user/group and sets home directory groupadd -g "${GID}" mastodon; \ useradd -l -u "${UID}" -g "${GID}" -m -d /opt/mastodon mastodon; \ - # Creates /mastodon symlink to /opt/mastodon +# Creates /mastodon symlink to /opt/mastodon ln -s /opt/mastodon /mastodon; # Set /opt/mastodon as working directory WORKDIR /opt/mastodon -# Add backport repository for some specific packages where we need the latest version -RUN echo 'deb http://deb.debian.org/debian bookworm-backports main' >> /etc/apt/sources.list - # hadolint ignore=DL3008,DL3005 RUN \ - # Mount Apt cache and lib directories from Docker buildx caches - --mount=type=cache,id=apt-cache-${TARGETPLATFORM},target=/var/cache/apt,sharing=locked \ - --mount=type=cache,id=apt-lib-${TARGETPLATFORM},target=/var/lib/apt,sharing=locked \ - # Apt update & upgrade to check for security updates to Debian image +# Mount Apt cache and lib directories from Docker buildx caches +--mount=type=cache,id=apt-cache-${TARGETPLATFORM},target=/var/cache/apt,sharing=locked \ +--mount=type=cache,id=apt-lib-${TARGETPLATFORM},target=/var/lib/apt,sharing=locked \ +# Apt update & upgrade to check for security updates to Debian image apt-get update; \ apt-get dist-upgrade -yq; \ - # Install jemalloc, curl and other necessary components +# Install jemalloc, curl and other necessary components apt-get install -y --no-install-recommends \ - curl \ - file \ - libjemalloc2 \ - patchelf \ - procps \ - tini \ - tzdata \ - wget \ + curl \ + file \ + libjemalloc2 \ + patchelf \ + procps \ + tini \ + tzdata \ + wget \ ; \ - # Patch Ruby to use jemalloc +# Patch Ruby to use jemalloc patchelf --add-needed libjemalloc.so.2 /usr/local/bin/ruby; \ - # Discard patchelf after use +# Discard patchelf after use apt-get purge -y \ - patchelf \ + patchelf \ ; # Create temporary build layer from base image FROM ruby AS build +# Copy Node package configuration files into working directory +COPY package.json yarn.lock .yarnrc.yml /opt/mastodon/ +COPY .yarn /opt/mastodon/.yarn + +COPY --from=node /usr/local/bin /usr/local/bin +COPY --from=node /usr/local/lib /usr/local/lib + ARG TARGETPLATFORM # hadolint ignore=DL3008 RUN \ - # Mount Apt cache and lib directories from Docker buildx caches - --mount=type=cache,id=apt-cache-${TARGETPLATFORM},target=/var/cache/apt,sharing=locked \ - --mount=type=cache,id=apt-lib-${TARGETPLATFORM},target=/var/lib/apt,sharing=locked \ - # Install build tools and bundler dependencies from APT +# Mount Apt cache and lib directories from Docker buildx caches +--mount=type=cache,id=apt-cache-${TARGETPLATFORM},target=/var/cache/apt,sharing=locked \ +--mount=type=cache,id=apt-lib-${TARGETPLATFORM},target=/var/lib/apt,sharing=locked \ +# Install build tools and bundler dependencies from APT apt-get install -y --no-install-recommends \ - autoconf \ - automake \ - build-essential \ - cmake \ - git \ - libgdbm-dev \ - libglib2.0-dev \ - libgmp-dev \ - libicu-dev \ - libidn-dev \ - libpq-dev \ - libssl-dev \ - libtool \ - libyaml-dev \ - meson \ - nasm \ - pkg-config \ - shared-mime-info \ - xz-utils \ - # libvips components - libcgif-dev \ - libexif-dev \ - libexpat1-dev \ - libgirepository1.0-dev \ - libheif-dev/bookworm-backports \ - libimagequant-dev \ - libjpeg62-turbo-dev \ - liblcms2-dev \ - liborc-dev \ - libspng-dev \ - libtiff-dev \ - libwebp-dev \ + autoconf \ + automake \ + build-essential \ + cmake \ + git \ + libgdbm-dev \ + libglib2.0-dev \ + libgmp-dev \ + libicu-dev \ + libidn-dev \ + libpq-dev \ + libssl-dev \ + libtool \ + meson \ + nasm \ + pkg-config \ + shared-mime-info \ + xz-utils \ + # libvips components + libcgif-dev \ + libexif-dev \ + libexpat1-dev \ + libgirepository1.0-dev \ + libheif-dev \ + libimagequant-dev \ + libjpeg62-turbo-dev \ + liblcms2-dev \ + liborc-dev \ + libspng-dev \ + libtiff-dev \ + libwebp-dev \ # ffmpeg components - libdav1d-dev \ - liblzma-dev \ - libmp3lame-dev \ - libopus-dev \ - libsnappy-dev \ - libvorbis-dev \ - libvpx-dev \ - libx264-dev \ - libx265-dev \ + libdav1d-dev \ + liblzma-dev \ + libmp3lame-dev \ + libopus-dev \ + libsnappy-dev \ + libvorbis-dev \ + libvpx-dev \ + libx264-dev \ + libx265-dev \ ; +RUN \ +# Configure Corepack + rm /usr/local/bin/yarn*; \ + corepack enable; \ + corepack prepare --activate; + # Create temporary libvips specific build layer from build layer FROM build AS libvips # libvips version to compile, change with [--build-arg VIPS_VERSION="8.15.2"] # renovate: datasource=github-releases depName=libvips packageName=libvips/libvips -ARG VIPS_VERSION=8.16.1 +ARG VIPS_VERSION=8.15.2 # libvips download URL, change with [--build-arg VIPS_URL="https://github.com/libvips/libvips/releases/download"] ARG VIPS_URL=https://github.com/libvips/libvips/releases/download WORKDIR /usr/local/libvips/src -# Download and extract libvips source code -ADD ${VIPS_URL}/v${VIPS_VERSION}/vips-${VIPS_VERSION}.tar.xz /usr/local/libvips/src/ -RUN tar xf vips-${VIPS_VERSION}.tar.xz; -WORKDIR /usr/local/libvips/src/vips-${VIPS_VERSION} - -# Configure and compile libvips RUN \ + curl -sSL -o vips-${VIPS_VERSION}.tar.xz ${VIPS_URL}/v${VIPS_VERSION}/vips-${VIPS_VERSION}.tar.xz; \ + tar xf vips-${VIPS_VERSION}.tar.xz; \ + cd vips-${VIPS_VERSION}; \ meson setup build --prefix /usr/local/libvips --libdir=lib -Ddeprecated=false -Dintrospection=disabled -Dmodules=disabled -Dexamples=false; \ cd build; \ ninja; \ @@ -209,42 +209,39 @@ FROM build AS ffmpeg # ffmpeg version to compile, change with [--build-arg FFMPEG_VERSION="7.0.x"] # renovate: datasource=repology depName=ffmpeg packageName=openpkg_current/ffmpeg -ARG FFMPEG_VERSION=7.1 +ARG FFMPEG_VERSION=7.0.1 # ffmpeg download URL, change with [--build-arg FFMPEG_URL="https://ffmpeg.org/releases"] ARG FFMPEG_URL=https://ffmpeg.org/releases WORKDIR /usr/local/ffmpeg/src -# Download and extract ffmpeg source code -ADD ${FFMPEG_URL}/ffmpeg-${FFMPEG_VERSION}.tar.xz /usr/local/ffmpeg/src/ -RUN tar xf ffmpeg-${FFMPEG_VERSION}.tar.xz; -WORKDIR /usr/local/ffmpeg/src/ffmpeg-${FFMPEG_VERSION} - -# Configure and compile ffmpeg RUN \ + curl -sSL -o ffmpeg-${FFMPEG_VERSION}.tar.xz ${FFMPEG_URL}/ffmpeg-${FFMPEG_VERSION}.tar.xz; \ + tar xf ffmpeg-${FFMPEG_VERSION}.tar.xz; \ + cd ffmpeg-${FFMPEG_VERSION}; \ ./configure \ - --prefix=/usr/local/ffmpeg \ - --toolchain=hardened \ - --disable-debug \ - --disable-devices \ - --disable-doc \ - --disable-ffplay \ - --disable-network \ - --disable-static \ - --enable-ffmpeg \ - --enable-ffprobe \ - --enable-gpl \ - --enable-libdav1d \ - --enable-libmp3lame \ - --enable-libopus \ - --enable-libsnappy \ - --enable-libvorbis \ - --enable-libvpx \ - --enable-libwebp \ - --enable-libx264 \ - --enable-libx265 \ - --enable-shared \ - --enable-version3 \ + --prefix=/usr/local/ffmpeg \ + --toolchain=hardened \ + --disable-debug \ + --disable-devices \ + --disable-doc \ + --disable-ffplay \ + --disable-network \ + --disable-static \ + --enable-ffmpeg \ + --enable-ffprobe \ + --enable-gpl \ + --enable-libdav1d \ + --enable-libmp3lame \ + --enable-libopus \ + --enable-libsnappy \ + --enable-libvorbis \ + --enable-libvpx \ + --enable-libwebp \ + --enable-libx264 \ + --enable-libx265 \ + --enable-shared \ + --enable-version3 \ ; \ make -j$(nproc); \ make install; @@ -258,57 +255,58 @@ ARG TARGETPLATFORM COPY Gemfile* /opt/mastodon/ RUN \ - # Mount Ruby Gem caches - --mount=type=cache,id=gem-cache-${TARGETPLATFORM},target=/usr/local/bundle/cache/,sharing=locked \ - # Configure bundle to prevent changes to Gemfile and Gemfile.lock +# Mount Ruby Gem caches +--mount=type=cache,id=gem-cache-${TARGETPLATFORM},target=/usr/local/bundle/cache/,sharing=locked \ +# Configure bundle to prevent changes to Gemfile and Gemfile.lock bundle config set --global frozen "true"; \ - # Configure bundle to not cache downloaded Gems +# Configure bundle to not cache downloaded Gems bundle config set --global cache_all "false"; \ - # Configure bundle to only process production Gems +# Configure bundle to only process production Gems bundle config set --local without "development test"; \ - # Configure bundle to not warn about root user +# Configure bundle to not warn about root user bundle config set silence_root_warning "true"; \ - # Download and install required Gems +# Download and install required Gems bundle install -j"$(nproc)"; +# Create temporary node specific build layer from build layer +FROM build AS yarn + +ARG TARGETPLATFORM + +# Copy Node package configuration files into working directory +COPY package.json yarn.lock .yarnrc.yml /opt/mastodon/ +COPY streaming/package.json /opt/mastodon/streaming/ +COPY .yarn /opt/mastodon/.yarn + +# hadolint ignore=DL3008 +RUN \ +--mount=type=cache,id=corepack-cache-${TARGETPLATFORM},target=/usr/local/share/.cache/corepack,sharing=locked \ +--mount=type=cache,id=yarn-cache-${TARGETPLATFORM},target=/usr/local/share/.cache/yarn,sharing=locked \ +# Install Node packages + yarn workspaces focus --production @mastodon/mastodon; + # Create temporary assets build layer from build layer FROM build AS precompiler -ARG TARGETPLATFORM - -# Copy Mastodon sources into layer +# Copy Mastodon sources into precompiler layer COPY . /opt/mastodon/ -# Copy Node.js binaries/libraries into layer -COPY --from=node /usr/local/bin /usr/local/bin -COPY --from=node /usr/local/lib /usr/local/lib - -RUN \ - # Configure Corepack - rm /usr/local/bin/yarn*; \ - corepack enable; \ - corepack prepare --activate; - -# hadolint ignore=DL3008 -RUN \ - --mount=type=cache,id=corepack-cache-${TARGETPLATFORM},target=/usr/local/share/.cache/corepack,sharing=locked \ - --mount=type=cache,id=yarn-cache-${TARGETPLATFORM},target=/usr/local/share/.cache/yarn,sharing=locked \ - # Install Node.js packages - yarn workspaces focus --production @mastodon/mastodon; - -# Copy libvips components into layer for precompiler -COPY --from=libvips /usr/local/libvips/bin /usr/local/bin -COPY --from=libvips /usr/local/libvips/lib /usr/local/lib -# Copy bundler packages into layer for precompiler +# Copy bundler and node packages from build layer to container +COPY --from=yarn /opt/mastodon /opt/mastodon/ COPY --from=bundler /opt/mastodon /opt/mastodon/ COPY --from=bundler /usr/local/bundle/ /usr/local/bundle/ +# Copy libvips components to layer for precompiler +COPY --from=libvips /usr/local/libvips/bin /usr/local/bin +COPY --from=libvips /usr/local/libvips/lib /usr/local/lib + +ARG TARGETPLATFORM RUN \ ldconfig; \ - # Use Ruby on Rails to create Mastodon assets +# Use Ruby on Rails to create Mastodon assets SECRET_KEY_BASE_DUMMY=1 \ bundle exec rails assets:precompile; \ - # Cleanup temporary files +# Cleanup temporary files rm -fr /opt/mastodon/tmp; # Prep final Mastodon Ruby layer @@ -318,49 +316,49 @@ ARG TARGETPLATFORM # hadolint ignore=DL3008 RUN \ - # Mount Apt cache and lib directories from Docker buildx caches - --mount=type=cache,id=apt-cache-${TARGETPLATFORM},target=/var/cache/apt,sharing=locked \ - --mount=type=cache,id=apt-lib-${TARGETPLATFORM},target=/var/lib/apt,sharing=locked \ - # Mount Corepack and Yarn caches from Docker buildx caches - --mount=type=cache,id=corepack-cache-${TARGETPLATFORM},target=/usr/local/share/.cache/corepack,sharing=locked \ - --mount=type=cache,id=yarn-cache-${TARGETPLATFORM},target=/usr/local/share/.cache/yarn,sharing=locked \ - # Apt update install non-dev versions of necessary components +# Mount Apt cache and lib directories from Docker buildx caches +--mount=type=cache,id=apt-cache-${TARGETPLATFORM},target=/var/cache/apt,sharing=locked \ +--mount=type=cache,id=apt-lib-${TARGETPLATFORM},target=/var/lib/apt,sharing=locked \ +# Mount Corepack and Yarn caches from Docker buildx caches +--mount=type=cache,id=corepack-cache-${TARGETPLATFORM},target=/usr/local/share/.cache/corepack,sharing=locked \ +--mount=type=cache,id=yarn-cache-${TARGETPLATFORM},target=/usr/local/share/.cache/yarn,sharing=locked \ +# Apt update install non-dev versions of necessary components apt-get install -y --no-install-recommends \ - libexpat1 \ - libglib2.0-0 \ - libicu72 \ - libidn12 \ - libpq5 \ - libreadline8 \ - libssl3 \ - libyaml-0-2 \ + libexpat1 \ + libglib2.0-0 \ + libicu72 \ + libidn12 \ + libpq5 \ + libreadline8 \ + libssl3 \ + libyaml-0-2 \ # libvips components - libcgif0 \ - libexif12 \ - libheif1/bookworm-backports \ - libimagequant0 \ - libjpeg62-turbo \ - liblcms2-2 \ - liborc-0.4-0 \ - libspng0 \ - libtiff6 \ - libwebp7 \ - libwebpdemux2 \ - libwebpmux3 \ + libcgif0 \ + libexif12 \ + libheif1 \ + libimagequant0 \ + libjpeg62-turbo \ + liblcms2-2 \ + liborc-0.4-0 \ + libspng0 \ + libtiff6 \ + libwebp7 \ + libwebpdemux2 \ + libwebpmux3 \ # ffmpeg components - libdav1d6 \ - libmp3lame0 \ - libopencore-amrnb0 \ - libopencore-amrwb0 \ - libopus0 \ - libsnappy1v5 \ - libtheora0 \ - libvorbis0a \ - libvorbisenc2 \ - libvorbisfile3 \ - libvpx7 \ - libx264-164 \ - libx265-199 \ + libdav1d6 \ + libmp3lame0 \ + libopencore-amrnb0 \ + libopencore-amrwb0 \ + libopus0 \ + libsnappy1v5 \ + libtheora0 \ + libvorbis0a \ + libvorbisenc2 \ + libvorbisfile3 \ + libvpx7 \ + libx264-164 \ + libx265-199 \ ; # Copy Mastodon sources into final layer @@ -380,7 +378,7 @@ COPY --from=ffmpeg /usr/local/ffmpeg/lib /usr/local/lib RUN \ ldconfig; \ - # Smoketest media processors +# Smoketest media processors vips -v; \ ffmpeg -version; \ ffprobe -version; @@ -390,10 +388,10 @@ RUN \ bundle exec bootsnap precompile --gemfile app/ lib/; RUN \ - # Pre-create and chown system volume to Mastodon user +# Pre-create and chown system volume to Mastodon user mkdir -p /opt/mastodon/public/system; \ chown mastodon:mastodon /opt/mastodon/public/system; \ - # Set Mastodon user as owner of tmp folder +# Set Mastodon user as owner of tmp folder chown -R mastodon:mastodon /opt/mastodon/tmp; # Set the running user for resulting container diff --git a/Gemfile b/Gemfile index 9e5955e0b8..ef52d50cac 100644 --- a/Gemfile +++ b/Gemfile @@ -1,12 +1,12 @@ # frozen_string_literal: true source 'https://rubygems.org' -ruby '>= 3.2.0', '< 3.5.0' +ruby '>= 3.1.0' gem 'propshaft' gem 'puma', '~> 6.3' gem 'rack', '~> 2.2.7' -gem 'rails', '~> 8.0' +gem 'rails', '~> 7.1.1' gem 'thor', '~> 1.2' gem 'dotenv' @@ -14,19 +14,18 @@ gem 'haml-rails', '~>2.0' gem 'pg', '~> 1.5' gem 'pghero' -gem 'aws-sdk-core', '< 3.216.0', require: false # TODO: https://github.com/mastodon/mastodon/pull/34173#issuecomment-2733378873 gem 'aws-sdk-s3', '~> 1.123', require: false gem 'blurhash', '~> 0.1' -gem 'fog-core', '<= 2.6.0' +gem 'fog-core', '<= 2.4.0' gem 'fog-openstack', '~> 1.0', require: false -gem 'jd-paperclip-azure', '~> 3.0', require: false gem 'kt-paperclip', '~> 7.2' +gem 'md-paperclip-azure', '~> 2.2', require: false gem 'ruby-vips', '~> 2.2', require: false gem 'active_model_serializers', '~> 0.10' gem 'addressable', '~> 2.8' gem 'bootsnap', '~> 1.18.0', require: false -gem 'browser' +gem 'browser', '< 6' # https://github.com/fnando/browser/issues/543 gem 'charlock_holmes', '~> 0.7.7' gem 'chewy', '~> 7.3' gem 'devise', '~> 4.9' @@ -40,7 +39,7 @@ gem 'net-ldap', '~> 0.18' gem 'omniauth', '~> 2.0' gem 'omniauth-cas', '~> 3.0.0.beta.1' -gem 'omniauth_openid_connect', '~> 0.8.0' +gem 'omniauth_openid_connect', '~> 0.6.1' gem 'omniauth-rails_csrf_protection', '~> 1.0' gem 'omniauth-saml', '~> 2.0' @@ -48,25 +47,24 @@ gem 'color_diff', '~> 0.1' gem 'csv', '~> 3.2' gem 'discard', '~> 1.2' gem 'doorkeeper', '~> 5.6' -gem 'faraday-httpclient' +gem 'ed25519', '~> 1.3' gem 'fast_blank', '~> 1.0' gem 'fastimage' gem 'hiredis', '~> 0.6' gem 'htmlentities', '~> 4.3' gem 'http', '~> 5.2.0' gem 'http_accept_language', '~> 2.1' -gem 'httplog', '~> 1.7.0', require: false +gem 'httplog', '~> 1.7.0' gem 'i18n' gem 'idn-ruby', require: 'idn' gem 'inline_svg' gem 'irb', '~> 1.8' gem 'kaminari', '~> 1.2' gem 'link_header', '~> 0.0' -gem 'linzer', '~> 0.6.1' gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock' -gem 'mime-types', '~> 3.6.0', require: 'mime/types/columnar' -gem 'mutex_m' +gem 'mime-types', '~> 3.5.0', require: 'mime/types/columnar' gem 'nokogiri', '~> 1.15' +gem 'nsa' gem 'oj', '~> 3.14' gem 'ox', '~> 2.14' gem 'parslet' @@ -75,13 +73,13 @@ gem 'public_suffix', '~> 6.0' gem 'pundit', '~> 2.3' gem 'rack-attack', '~> 6.6' gem 'rack-cors', '~> 2.0', require: 'rack/cors' -gem 'rails-i18n', '~> 8.0' +gem 'rails-i18n', '~> 7.0' gem 'redcarpet', '~> 3.6' gem 'redis', '~> 4.5', require: ['redis', 'redis/connection/hiredis'] gem 'redis-namespace', '~> 1.10' gem 'rqrcode', '~> 2.2' gem 'ruby-progressbar', '~> 1.13' -gem 'sanitize', '~> 7.0' +gem 'sanitize', '~> 6.0' gem 'scenic', '~> 1.7' gem 'sidekiq', '~> 6.5' gem 'sidekiq-bulk', '~> 0.2.0' @@ -90,37 +88,35 @@ gem 'sidekiq-unique-jobs', '~> 7.1' gem 'simple_form', '~> 5.2' gem 'simple-navigation', '~> 4.4' gem 'stoplight', '~> 4.1' -gem 'strong_migrations' +gem 'strong_migrations', '1.8.0' gem 'tty-prompt', '~> 0.23', require: false gem 'twitter-text', '~> 3.1.0' gem 'tzinfo-data', '~> 1.2023' gem 'webauthn', '~> 3.0' gem 'webpacker', '~> 5.4' -gem 'webpush', github: 'mastodon/webpush', ref: '9631ac63045cfabddacc69fc06e919b4c13eb913' +gem 'webpush', github: 'ClearlyClaire/webpush', ref: 'f14a4d52e201128b1b00245d11b6de80d6cfdcd9' gem 'json-ld' gem 'json-ld-preloaded', '~> 3.2' gem 'rdf-normalize', '~> 0.5' -gem 'prometheus_exporter', '~> 2.2', require: false - -gem 'opentelemetry-api', '~> 1.5.0' +gem 'opentelemetry-api', '~> 1.2.5' group :opentelemetry do - gem 'opentelemetry-exporter-otlp', '~> 0.30.0', require: false - gem 'opentelemetry-instrumentation-active_job', '~> 0.8.0', require: false - gem 'opentelemetry-instrumentation-active_model_serializers', '~> 0.22.0', require: false - gem 'opentelemetry-instrumentation-concurrent_ruby', '~> 0.22.0', require: false - gem 'opentelemetry-instrumentation-excon', '~> 0.23.0', require: false - gem 'opentelemetry-instrumentation-faraday', '~> 0.26.0', require: false - gem 'opentelemetry-instrumentation-http', '~> 0.24.0', require: false - gem 'opentelemetry-instrumentation-http_client', '~> 0.23.0', require: false - gem 'opentelemetry-instrumentation-net_http', '~> 0.23.0', require: false - gem 'opentelemetry-instrumentation-pg', '~> 0.30.0', require: false - gem 'opentelemetry-instrumentation-rack', '~> 0.26.0', require: false - gem 'opentelemetry-instrumentation-rails', '~> 0.36.0', require: false - gem 'opentelemetry-instrumentation-redis', '~> 0.26.0', require: false - gem 'opentelemetry-instrumentation-sidekiq', '~> 0.26.0', require: false + gem 'opentelemetry-exporter-otlp', '~> 0.28.0', require: false + gem 'opentelemetry-instrumentation-active_job', '~> 0.7.1', require: false + gem 'opentelemetry-instrumentation-active_model_serializers', '~> 0.20.1', require: false + gem 'opentelemetry-instrumentation-concurrent_ruby', '~> 0.21.2', require: false + gem 'opentelemetry-instrumentation-excon', '~> 0.22.0', require: false + gem 'opentelemetry-instrumentation-faraday', '~> 0.24.1', require: false + gem 'opentelemetry-instrumentation-http', '~> 0.23.2', require: false + gem 'opentelemetry-instrumentation-http_client', '~> 0.22.3', require: false + gem 'opentelemetry-instrumentation-net_http', '~> 0.22.4', require: false + gem 'opentelemetry-instrumentation-pg', '~> 0.27.1', require: false + gem 'opentelemetry-instrumentation-rack', '~> 0.24.1', require: false + gem 'opentelemetry-instrumentation-rails', '~> 0.31.0', require: false + gem 'opentelemetry-instrumentation-redis', '~> 0.25.3', require: false + gem 'opentelemetry-instrumentation-sidekiq', '~> 0.25.2', require: false gem 'opentelemetry-sdk', '~> 1.4', require: false end @@ -129,7 +125,10 @@ group :test do gem 'flatware-rspec' # Adds RSpec Error/Warning annotations to GitHub PRs on the Files tab - gem 'rspec-github', '~> 3.0', require: false + gem 'rspec-github', '~> 2.4', require: false + + # RSpec progress bar formatter + gem 'fuubar', '~> 2.5' # RSpec helpers for email specs gem 'email_spec' @@ -147,15 +146,16 @@ group :test do # Used to mock environment variables gem 'climate_control' + # Add back helpers functions removed in Rails 5.1 + gem 'rails-controller-testing', '~> 1.0' + # Validate schemas in specs - gem 'json-schema', '~> 5.0' + gem 'json-schema', '~> 4.0' # Test harness fo rack components gem 'rack-test', '~> 2.1' - gem 'shoulda-matchers' - - # Coverage formatter for RSpec + # Coverage formatter for RSpec test if DISABLE_SIMPLECOV is false gem 'simplecov', '~> 0.22', require: false gem 'simplecov-lcov', '~> 0.8', require: false @@ -167,14 +167,13 @@ group :development do # Code linting CLI and plugins gem 'rubocop', require: false gem 'rubocop-capybara', require: false - gem 'rubocop-i18n', require: false gem 'rubocop-performance', require: false gem 'rubocop-rails', require: false gem 'rubocop-rspec', require: false gem 'rubocop-rspec_rails', require: false # Annotates modules with schema - gem 'annotaterb', '~> 4.13', require: false + gem 'annotate', '~> 3.2' # Enhanced error message pages for development gem 'better_errors', '~> 2.9' @@ -185,7 +184,7 @@ group :development do gem 'letter_opener_web', '~> 3.0' # Security analysis CLI tools - gem 'brakeman', '~> 7.0', require: false + gem 'brakeman', '~> 6.0', require: false gem 'bundler-audit', '~> 0.9', require: false # Linter CLI for HAML files @@ -197,7 +196,7 @@ end group :development, :test do # Interactive Debugging tools - gem 'debug', '~> 1.8', require: false + gem 'debug', '~> 1.8' # Generate fake data values gem 'faker', '~> 3.2' @@ -209,10 +208,10 @@ group :development, :test do gem 'memory_profiler', require: false gem 'ruby-prof', require: false gem 'stackprof', require: false - gem 'test-prof', require: false + gem 'test-prof' # RSpec runner for rails - gem 'rspec-rails', '~> 7.0' + gem 'rspec-rails', '~> 6.0' end group :production do @@ -224,7 +223,7 @@ gem 'concurrent-ruby', require: false gem 'connection_pool', require: false gem 'xorcist', '~> 1.1' -gem 'net-http', '~> 0.6.0' +gem 'net-http', '~> 0.4.0' gem 'rubyzip', '~> 2.3' gem 'hcaptcha', '~> 7.1' diff --git a/Gemfile.lock b/Gemfile.lock index f13df0c43f..eb6720e454 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,139 +1,150 @@ GIT - remote: https://github.com/mastodon/webpush.git - revision: 9631ac63045cfabddacc69fc06e919b4c13eb913 - ref: 9631ac63045cfabddacc69fc06e919b4c13eb913 + remote: https://github.com/ClearlyClaire/webpush.git + revision: f14a4d52e201128b1b00245d11b6de80d6cfdcd9 + ref: f14a4d52e201128b1b00245d11b6de80d6cfdcd9 specs: - webpush (1.1.0) + webpush (0.3.8) hkdf (~> 0.2) jwt (~> 2.0) GEM remote: https://rubygems.org/ specs: - actioncable (8.0.2) - actionpack (= 8.0.2) - activesupport (= 8.0.2) + actioncable (7.1.3.4) + actionpack (= 7.1.3.4) + activesupport (= 7.1.3.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (8.0.2) - actionpack (= 8.0.2) - activejob (= 8.0.2) - activerecord (= 8.0.2) - activestorage (= 8.0.2) - activesupport (= 8.0.2) - mail (>= 2.8.0) - actionmailer (8.0.2) - actionpack (= 8.0.2) - actionview (= 8.0.2) - activejob (= 8.0.2) - activesupport (= 8.0.2) - mail (>= 2.8.0) + actionmailbox (7.1.3.4) + actionpack (= 7.1.3.4) + activejob (= 7.1.3.4) + activerecord (= 7.1.3.4) + activestorage (= 7.1.3.4) + activesupport (= 7.1.3.4) + mail (>= 2.7.1) + net-imap + net-pop + net-smtp + actionmailer (7.1.3.4) + actionpack (= 7.1.3.4) + actionview (= 7.1.3.4) + activejob (= 7.1.3.4) + activesupport (= 7.1.3.4) + mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp rails-dom-testing (~> 2.2) - actionpack (8.0.2) - actionview (= 8.0.2) - activesupport (= 8.0.2) + actionpack (7.1.3.4) + actionview (= 7.1.3.4) + activesupport (= 7.1.3.4) nokogiri (>= 1.8.5) + racc rack (>= 2.2.4) rack-session (>= 1.0.1) rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - useragent (~> 0.16) - actiontext (8.0.2) - actionpack (= 8.0.2) - activerecord (= 8.0.2) - activestorage (= 8.0.2) - activesupport (= 8.0.2) + actiontext (7.1.3.4) + actionpack (= 7.1.3.4) + activerecord (= 7.1.3.4) + activestorage (= 7.1.3.4) + activesupport (= 7.1.3.4) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (8.0.2) - activesupport (= 8.0.2) + actionview (7.1.3.4) + activesupport (= 7.1.3.4) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - active_model_serializers (0.10.15) + active_model_serializers (0.10.14) actionpack (>= 4.1) activemodel (>= 4.1) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) - activejob (8.0.2) - activesupport (= 8.0.2) + activejob (7.1.3.4) + activesupport (= 7.1.3.4) globalid (>= 0.3.6) - activemodel (8.0.2) - activesupport (= 8.0.2) - activerecord (8.0.2) - activemodel (= 8.0.2) - activesupport (= 8.0.2) + activemodel (7.1.3.4) + activesupport (= 7.1.3.4) + activerecord (7.1.3.4) + activemodel (= 7.1.3.4) + activesupport (= 7.1.3.4) timeout (>= 0.4.0) - activestorage (8.0.2) - actionpack (= 8.0.2) - activejob (= 8.0.2) - activerecord (= 8.0.2) - activesupport (= 8.0.2) + activestorage (7.1.3.4) + actionpack (= 7.1.3.4) + activejob (= 7.1.3.4) + activerecord (= 7.1.3.4) + activesupport (= 7.1.3.4) marcel (~> 1.0) - activesupport (8.0.2) + activesupport (7.1.3.4) base64 - benchmark (>= 0.3) bigdecimal - concurrent-ruby (~> 1.0, >= 1.3.1) + concurrent-ruby (~> 1.0, >= 1.0.2) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) - logger (>= 1.4.2) minitest (>= 5.1) - securerandom (>= 0.3) - tzinfo (~> 2.0, >= 2.0.5) - uri (>= 0.13.1) + mutex_m + tzinfo (~> 2.0) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aes_key_wrap (1.1.0) android_key_attestation (0.3.0) - annotaterb (4.14.0) - ast (2.4.3) + annotate (3.2.0) + activerecord (>= 3.2, < 8.0) + rake (>= 10.4, < 14.0) + ast (2.4.2) attr_required (1.0.2) - aws-eventstream (1.3.2) - aws-partitions (1.1087.0) - aws-sdk-core (3.215.1) + awrence (1.2.1) + aws-eventstream (1.3.0) + aws-partitions (1.950.0) + aws-sdk-core (3.201.0) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.992.0) - aws-sigv4 (~> 1.9) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.96.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-kms (1.88.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.177.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-s3 (1.156.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) - aws-sigv4 (1.11.0) + aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) - azure-blob (0.5.7) - rexml + azure-storage-blob (2.0.3) + azure-storage-common (~> 2.0) + nokogiri (~> 1, >= 1.10.8) + azure-storage-common (2.0.4) + faraday (~> 1.0) + faraday_middleware (~> 1.0, >= 1.0.0.rc1) + net-http-persistent (~> 4.0) + nokogiri (~> 1, >= 1.10.8) base64 (0.2.0) bcp47_spec (0.2.1) bcrypt (3.1.20) - benchmark (0.4.0) better_errors (2.10.1) erubi (>= 1.0.0) rack (>= 0.9.0) rouge (>= 1.0.0) - bigdecimal (3.1.9) - bindata (2.5.1) + bigdecimal (3.1.8) + bindata (2.5.0) binding_of_caller (1.0.1) debug_inspector (>= 1.2.0) - blurhash (0.1.8) - bootsnap (1.18.4) + blurhash (0.1.7) + bootsnap (1.18.3) msgpack (~> 1.2) - brakeman (7.0.2) + brakeman (6.1.2) racc - browser (6.2.0) + browser (5.3.1) brpoplpush-redis_script (0.1.3) concurrent-ruby (~> 1.0, >= 1.0.5) redis (>= 1.0, < 6) builder (3.3.0) - bundler-audit (0.9.2) + bundler-audit (0.9.1) bundler (>= 1.2.0, < 3) thor (~> 1.0) capybara (3.40.0) @@ -148,35 +159,33 @@ GEM case_transform (0.2) activesupport cbor (0.5.9.8) - charlock_holmes (0.7.9) + charlock_holmes (0.7.8) chewy (7.6.0) activesupport (>= 5.2) elasticsearch (>= 7.14.0, < 8) elasticsearch-dsl - childprocess (5.1.0) - logger (~> 1.5) chunky_png (1.4.0) climate_control (1.2.0) cocoon (1.2.15) color_diff (0.1) - concurrent-ruby (1.3.5) - connection_pool (2.5.0) - cose (1.3.1) + concurrent-ruby (1.3.3) + connection_pool (2.4.1) + cose (1.3.0) cbor (~> 0.5.9) openssl-signature_algorithm (~> 1.0) crack (1.0.0) bigdecimal rexml crass (1.0.6) - css_parser (1.21.1) + css_parser (1.17.1) addressable - csv (3.3.4) - database_cleaner-active_record (2.2.0) + csv (3.3.0) + database_cleaner-active_record (2.1.0) activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) - date (3.4.1) - debug (1.10.0) + date (3.3.4) + debug (1.9.2) irb (~> 1.10) reline (>= 0.3.8) debug_inspector (1.2.0) @@ -186,91 +195,103 @@ GEM railties (>= 4.1.0) responders warden (~> 1.2.3) - devise-two-factor (6.1.0) - activesupport (>= 7.0, < 8.1) + devise-two-factor (5.1.0) + activesupport (~> 7.0) devise (~> 4.0) - railties (>= 7.0, < 8.1) + railties (~> 7.0) rotp (~> 6.0) devise_pam_authenticatable2 (9.2.0) devise (>= 4.0.0) rpam2 (~> 4.0) - diff-lcs (1.6.1) - discard (1.4.0) - activerecord (>= 4.2, < 9.0) - docile (1.4.1) + diff-lcs (1.5.1) + discard (1.3.0) + activerecord (>= 4.2, < 8) + docile (1.4.0) domain_name (0.6.20240107) - doorkeeper (5.8.2) + doorkeeper (5.7.1) railties (>= 5) - dotenv (3.1.8) + dotenv (3.1.2) drb (2.2.1) - elasticsearch (7.17.11) - elasticsearch-api (= 7.17.11) - elasticsearch-transport (= 7.17.11) - elasticsearch-api (7.17.11) + ed25519 (1.3.0) + elasticsearch (7.17.10) + elasticsearch-api (= 7.17.10) + elasticsearch-transport (= 7.17.10) + elasticsearch-api (7.17.10) multi_json elasticsearch-dsl (0.1.10) - elasticsearch-transport (7.17.11) - base64 + elasticsearch-transport (7.17.10) faraday (>= 1, < 3) multi_json - email_spec (2.3.0) + email_spec (2.2.2) htmlentities (~> 4.3.3) - launchy (>= 2.1, < 4.0) + launchy (~> 2.1) mail (~> 2.7) - email_validator (2.2.4) - activemodel - erubi (1.13.1) + erubi (1.13.0) et-orbi (1.2.11) tzinfo - excon (1.2.5) - logger + excon (0.110.0) fabrication (2.31.0) - faker (3.5.1) + faker (3.4.1) i18n (>= 1.8.11, < 2) - faraday (2.13.0) - faraday-net_http (>= 2.0, < 3.5) - json - logger - faraday-follow_redirects (0.3.0) - faraday (>= 1, < 3) - faraday-httpclient (2.0.1) - httpclient (>= 2.2) - faraday-net_http (3.4.0) - net-http (>= 0.5.0) + faraday (1.10.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.0) + faraday (~> 1.0) fast_blank (1.0.1) - fastimage (2.4.0) - ffi (1.17.2) + fastimage (2.3.1) + ffi (1.16.3) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake - flatware (2.3.4) - drb + flatware (2.3.2) thor (< 2.0) - flatware-rspec (2.3.4) - flatware (= 2.3.4) + flatware-rspec (2.3.2) + flatware (= 2.3.2) rspec (>= 3.6) - fog-core (2.6.0) + fog-core (2.4.0) builder - excon (~> 1.0) + excon (~> 0.71) formatador (>= 0.2, < 2.0) mime-types fog-json (1.2.0) fog-core multi_json (~> 1.10) - fog-openstack (1.1.5) + fog-openstack (1.1.3) fog-core (~> 2.1) fog-json (>= 1.0) formatador (1.1.0) - fugit (1.11.1) - et-orbi (~> 1, >= 1.2.11) + fugit (1.10.1) + et-orbi (~> 1, >= 1.2.7) raabro (~> 1.4) + fuubar (2.5.1) + rspec-core (~> 3.0) + ruby-progressbar (~> 1.4) globalid (1.2.1) activesupport (>= 6.1) - google-protobuf (4.30.2) - bigdecimal - rake (>= 13) - googleapis-common-protos-types (1.19.0) - google-protobuf (>= 3.18, < 5.a) + google-protobuf (3.25.3) + googleapis-common-protos-types (1.14.0) + google-protobuf (~> 3.18) haml (6.3.0) temple (>= 0.8.2) thor @@ -280,18 +301,17 @@ GEM activesupport (>= 5.1) haml (>= 4.0.6) railties (>= 5.1) - haml_lint (0.62.0) + haml_lint (0.58.0) haml (>= 5.0) parallel (~> 1.10) rainbow rubocop (>= 1.0) sysexits (~> 1.1) - hashdiff (1.1.2) + hashdiff (1.1.0) hashie (5.0.0) hcaptcha (7.1.0) json - highline (3.1.2) - reline + highline (3.0.1) hiredis (0.6.3) hkdf (0.3.0) htmlentities (4.3.4) @@ -301,18 +321,17 @@ GEM http-cookie (~> 1.0) http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) - http-cookie (1.0.8) + http-cookie (1.0.5) domain_name (~> 0.5) http-form_data (2.3.0) http_accept_language (2.1.1) - httpclient (2.9.0) - mutex_m + httpclient (2.8.3) httplog (1.7.0) rack (>= 2.0) rainbow (>= 2.0.0) - i18n (1.14.7) + i18n (1.14.5) concurrent-ruby (~> 1.0) - i18n-tasks (1.0.15) + i18n-tasks (1.0.14) activesupport (>= 4.0.2) ast (>= 2.1.0) erubi @@ -321,48 +340,37 @@ GEM parser (>= 3.2.2.1) rails-i18n rainbow (>= 2.2.2, < 4.0) - ruby-progressbar (~> 1.8, >= 1.8.1) terminal-table (>= 1.5.1) idn-ruby (0.1.5) - inline_svg (1.10.0) + inline_svg (1.9.0) activesupport (>= 3.0) nokogiri (>= 1.6) - io-console (0.8.0) - irb (1.15.2) - pp (>= 0.6.0) + io-console (0.7.2) + irb (1.13.2) rdoc (>= 4.0.0) reline (>= 0.4.2) - jd-paperclip-azure (3.0.0) - addressable (~> 2.5) - azure-blob (~> 0.5.2) - hashie (~> 5.0) jmespath (1.6.2) - json (2.10.2) + json (2.7.2) json-canonicalization (1.0.0) - json-jwt (1.16.7) + json-jwt (1.15.3.1) activesupport (>= 4.2) aes_key_wrap - base64 bindata - faraday (~> 2.0) - faraday-follow_redirects - json-ld (3.3.2) + httpclient + json-ld (3.3.1) htmlentities (~> 4.3) json-canonicalization (~> 1.0) link_header (~> 0.0, >= 0.0.8) multi_json (~> 1.15) rack (>= 2.2, < 4) rdf (~> 3.3) - rexml (~> 3.2) - json-ld-preloaded (3.3.1) + json-ld-preloaded (3.3.0) json-ld (~> 3.3) rdf (~> 3.3) - json-schema (5.1.1) - addressable (~> 2.8) - bigdecimal (~> 3.1) + json-schema (4.3.0) + addressable (>= 2.8) jsonapi-renderer (0.2.2) - jwt (2.10.1) - base64 + jwt (2.7.1) kaminari (1.2.2) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.2) @@ -381,11 +389,9 @@ GEM marcel (~> 1.0.1) mime-types terrapin (>= 0.6.0, < 2.0) - language_server-protocol (3.17.0.4) - launchy (3.1.1) + language_server-protocol (3.17.0.3) + launchy (2.5.2) addressable (~> 2.8) - childprocess (~> 5.0) - logger (~> 1.6) letter_opener (1.10.0) launchy (>= 2.2, < 4) letter_opener_web (3.0.0) @@ -394,23 +400,16 @@ GEM railties (>= 6.1) rexml link_header (0.0.8) - lint_roller (1.1.0) - linzer (0.6.5) - openssl (~> 3.0, >= 3.0.0) - rack (>= 2.2, < 4.0) - starry (~> 0.2) - stringio (~> 3.1, >= 3.1.2) - uri (~> 1.0, >= 1.0.2) - llhttp-ffi (0.5.1) + llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) - logger (1.7.0) + logger (1.6.0) lograge (0.14.0) actionpack (>= 4) activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.24.0) + loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.8.1) @@ -422,20 +421,26 @@ GEM mario-redis-lock (1.2.1) redis (>= 3.0.5) matrix (0.4.2) - memory_profiler (1.1.0) - mime-types (3.6.2) - logger + md-paperclip-azure (2.2.0) + addressable (~> 2.5) + azure-storage-blob (~> 2.0.1) + hashie (~> 5.0) + memory_profiler (1.0.2) + mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2025.0408) + mime-types-data (3.2024.0604) mini_mime (1.1.5) - mini_portile2 (2.8.8) - minitest (5.25.5) - msgpack (1.8.0) + mini_portile2 (2.8.7) + minitest (5.24.1) + msgpack (1.7.2) multi_json (1.15.0) - mutex_m (0.3.0) - net-http (0.6.0) + multipart-post (2.4.0) + mutex_m (0.2.0) + net-http (0.4.1) uri - net-imap (0.5.6) + net-http-persistent (4.0.2) + connection_pool (~> 2.2) + net-imap (0.4.12) date net-protocol net-ldap (0.19.0) @@ -443,197 +448,181 @@ GEM net-protocol net-protocol (0.2.2) timeout - net-smtp (0.5.1) + net-smtp (0.5.0) net-protocol - nio4r (2.7.4) - nokogiri (1.18.7) + nio4r (2.7.3) + nokogiri (1.16.6) mini_portile2 (~> 2.8.2) racc (~> 1.4) - oj (3.16.10) + nsa (0.3.0) + activesupport (>= 4.2, < 7.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + sidekiq (>= 3.5) + statsd-ruby (~> 1.4, >= 1.4.0) + oj (3.16.4) bigdecimal (>= 3.0) - ostruct (>= 0.2) - omniauth (2.1.3) + omniauth (2.1.2) hashie (>= 3.4.6) rack (>= 2.2.3) rack-protection - omniauth-cas (3.0.1) + omniauth-cas (3.0.0) addressable (~> 2.8) nokogiri (~> 1.12) omniauth (~> 2.1) - omniauth-rails_csrf_protection (1.0.2) + omniauth-rails_csrf_protection (1.0.1) actionpack (>= 4.2) omniauth (~> 2.0) - omniauth-saml (2.2.3) - omniauth (~> 2.1) - ruby-saml (~> 1.18) - omniauth_openid_connect (0.8.0) + omniauth-saml (2.1.0) + omniauth (~> 2.0) + ruby-saml (~> 1.12) + omniauth_openid_connect (0.6.1) omniauth (>= 1.9, < 3) - openid_connect (~> 2.2) - openid_connect (2.3.1) + openid_connect (~> 1.1) + openid_connect (1.4.2) activemodel attr_required (>= 1.0.0) - email_validator - faraday (~> 2.0) - faraday-follow_redirects - json-jwt (>= 1.16) - mail - rack-oauth2 (~> 2.2) - swd (~> 2.0) + json-jwt (>= 1.15.0) + net-smtp + rack-oauth2 (~> 1.21) + swd (~> 1.3) tzinfo + validate_email validate_url - webfinger (~> 2.0) - openssl (3.3.0) + webfinger (~> 1.2) + openssl (3.2.0) openssl-signature_algorithm (1.3.0) openssl (> 2.0) - opentelemetry-api (1.5.0) - opentelemetry-common (0.22.0) + opentelemetry-api (1.2.5) + opentelemetry-common (0.20.1) opentelemetry-api (~> 1.0) - opentelemetry-exporter-otlp (0.30.0) + opentelemetry-exporter-otlp (0.28.0) google-protobuf (>= 3.18) googleapis-common-protos-types (~> 1.3) opentelemetry-api (~> 1.1) opentelemetry-common (~> 0.20) opentelemetry-sdk (~> 1.2) opentelemetry-semantic_conventions - opentelemetry-helpers-sql-obfuscation (0.3.0) - opentelemetry-common (~> 0.21) - opentelemetry-instrumentation-action_mailer (0.4.0) + opentelemetry-helpers-sql-obfuscation (0.1.0) + opentelemetry-common (~> 0.20) + opentelemetry-instrumentation-action_mailer (0.1.0) opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-active_support (~> 0.7) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-action_pack (0.12.0) + opentelemetry-instrumentation-active_support (~> 0.1) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-action_pack (0.9.0) opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) + opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-rack (~> 0.21) - opentelemetry-instrumentation-action_view (0.9.0) + opentelemetry-instrumentation-action_view (0.7.0) opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-active_support (~> 0.7) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-active_job (0.8.0) + opentelemetry-instrumentation-active_support (~> 0.1) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-active_job (0.7.2) opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-active_model_serializers (0.22.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-active_model_serializers (0.20.1) opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-active_support (>= 0.7.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-active_record (0.9.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-active_record (0.7.2) opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-active_storage (0.1.1) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-active_support (0.6.0) opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-active_support (~> 0.7) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-active_support (0.8.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-base (0.22.3) opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-base (0.23.0) - opentelemetry-api (~> 1.0) - opentelemetry-common (~> 0.21) opentelemetry-registry (~> 0.1) - opentelemetry-instrumentation-concurrent_ruby (0.22.0) + opentelemetry-instrumentation-concurrent_ruby (0.21.3) opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-excon (0.23.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-excon (0.22.3) opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-faraday (0.26.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-faraday (0.24.5) opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-http (0.24.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-http (0.23.3) opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-http_client (0.23.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-http_client (0.22.6) opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-net_http (0.23.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-net_http (0.22.6) opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-pg (0.30.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-pg (0.27.3) opentelemetry-api (~> 1.0) opentelemetry-helpers-sql-obfuscation - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-rack (0.26.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-rack (0.24.5) opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-rails (0.36.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-rails (0.31.0) opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-action_mailer (~> 0.4.0) - opentelemetry-instrumentation-action_pack (~> 0.12.0) - opentelemetry-instrumentation-action_view (~> 0.9.0) - opentelemetry-instrumentation-active_job (~> 0.8.0) - opentelemetry-instrumentation-active_record (~> 0.9.0) - opentelemetry-instrumentation-active_storage (~> 0.1.0) - opentelemetry-instrumentation-active_support (~> 0.8.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-concurrent_ruby (~> 0.22.0) - opentelemetry-instrumentation-redis (0.26.1) + opentelemetry-instrumentation-action_mailer (~> 0.1.0) + opentelemetry-instrumentation-action_pack (~> 0.9.0) + opentelemetry-instrumentation-action_view (~> 0.7.0) + opentelemetry-instrumentation-active_job (~> 0.7.0) + opentelemetry-instrumentation-active_record (~> 0.7.0) + opentelemetry-instrumentation-active_support (~> 0.6.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-redis (0.25.6) opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-sidekiq (0.26.1) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-sidekiq (0.25.6) opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-registry (0.4.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-registry (0.3.1) opentelemetry-api (~> 1.1) - opentelemetry-sdk (1.8.0) + opentelemetry-sdk (1.4.1) opentelemetry-api (~> 1.1) opentelemetry-common (~> 0.20) opentelemetry-registry (~> 0.2) opentelemetry-semantic_conventions - opentelemetry-semantic_conventions (1.11.0) + opentelemetry-semantic_conventions (1.10.0) opentelemetry-api (~> 1.0) orm_adapter (0.5.0) - ostruct (0.6.1) - ox (2.14.22) - bigdecimal (>= 3.0) - parallel (1.27.0) - parser (3.3.8.0) + ox (2.14.18) + parallel (1.25.1) + parser (3.3.3.0) ast (~> 2.4.1) racc parslet (2.0.0) pastel (0.8.0) tty-color (~> 0.5) - pg (1.5.9) - pghero (3.6.2) - activerecord (>= 6.1) - pp (0.6.2) - prettyprint - premailer (1.27.0) + pg (1.5.6) + pghero (3.5.0) + activerecord (>= 6) + premailer (1.23.0) addressable - css_parser (>= 1.19.0) + css_parser (>= 1.12.0) htmlentities (>= 4.0.0) premailer-rails (1.12.0) actionmailer (>= 3) net-smtp premailer (~> 1.7, >= 1.7.9) - prettyprint (0.2.0) - prism (1.4.0) - prometheus_exporter (2.2.0) - webrick - propshaft (1.1.0) + propshaft (0.9.0) actionpack (>= 7.0.0) activesupport (>= 7.0.0) rack railties (>= 7.0.0) - psych (5.2.3) - date + psych (5.1.2) stringio - public_suffix (6.0.1) - puma (6.6.0) + public_suffix (6.0.0) + puma (6.4.2) nio4r (~> 2.0) - pundit (2.5.0) + pundit (2.3.2) activesupport (>= 3.0.0) raabro (1.4.0) - racc (1.8.1) - rack (2.2.13) + racc (1.8.0) + rack (2.2.9) rack-attack (6.7.0) rack (>= 1.0, < 4) rack-cors (2.0.2) rack (>= 2.0.0) - rack-oauth2 (2.2.1) + rack-oauth2 (1.21.3) activesupport attr_required - faraday (~> 2.0) - faraday-follow_redirects + httpclient json-jwt (>= 1.11.0) rack (>= 2.1.0) rack-protection (3.2.0) @@ -643,70 +632,74 @@ GEM rack rack-session (1.0.2) rack (< 3) - rack-test (2.2.0) + rack-test (2.1.0) rack (>= 1.3) - rackup (1.0.1) + rackup (1.0.0) rack (< 3) webrick - rails (8.0.2) - actioncable (= 8.0.2) - actionmailbox (= 8.0.2) - actionmailer (= 8.0.2) - actionpack (= 8.0.2) - actiontext (= 8.0.2) - actionview (= 8.0.2) - activejob (= 8.0.2) - activemodel (= 8.0.2) - activerecord (= 8.0.2) - activestorage (= 8.0.2) - activesupport (= 8.0.2) + rails (7.1.3.4) + actioncable (= 7.1.3.4) + actionmailbox (= 7.1.3.4) + actionmailer (= 7.1.3.4) + actionpack (= 7.1.3.4) + actiontext (= 7.1.3.4) + actionview (= 7.1.3.4) + activejob (= 7.1.3.4) + activemodel (= 7.1.3.4) + activerecord (= 7.1.3.4) + activestorage (= 7.1.3.4) + activesupport (= 7.1.3.4) bundler (>= 1.15.0) - railties (= 8.0.2) + railties (= 7.1.3.4) + rails-controller-testing (1.0.5) + actionpack (>= 5.0.1.rc1) + actionview (>= 5.0.1.rc1) + activesupport (>= 5.0.1.rc1) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.6.2) + rails-html-sanitizer (1.6.0) loofah (~> 2.21) - nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) - rails-i18n (8.0.1) + nokogiri (~> 1.14) + rails-i18n (7.0.9) i18n (>= 0.7, < 2) - railties (>= 8.0.0, < 9) - railties (8.0.2) - actionpack (= 8.0.2) - activesupport (= 8.0.2) - irb (~> 1.13) + railties (>= 6.0.0, < 8) + railties (7.1.3.4) + actionpack (= 7.1.3.4) + activesupport (= 7.1.3.4) + irb rackup (>= 1.0.0) rake (>= 12.2) thor (~> 1.0, >= 1.2.2) zeitwerk (~> 2.6) rainbow (3.1.1) rake (13.2.1) - rdf (3.3.2) + rdf (3.3.1) bcp47_spec (~> 0.2) - bigdecimal (~> 3.1, >= 3.1.5) link_header (~> 0.0, >= 0.0.8) rdf-normalize (0.7.0) rdf (~> 3.3) - rdoc (6.13.1) + rdoc (6.7.0) psych (>= 4.0.0) - redcarpet (3.6.1) + redcarpet (3.6.0) redis (4.8.1) redis-namespace (1.11.0) redis (>= 4) redlock (1.3.2) redis (>= 3.0.0, < 6.0) - regexp_parser (2.10.0) - reline (0.6.1) + regexp_parser (2.9.2) + reline (0.5.9) io-console (~> 0.5) - request_store (1.7.0) + request_store (1.6.0) rack (>= 1.4) responders (3.1.1) actionpack (>= 5.2) railties (>= 5.2) - rexml (3.4.1) + rexml (3.3.1) + strscan rotp (6.3.0) - rouge (4.5.1) + rouge (4.2.1) rpam2 (4.0.2) rqrcode (2.2.0) chunky_png (~> 1.0) @@ -716,106 +709,94 @@ GEM rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) rspec-mocks (~> 3.13.0) - rspec-core (3.13.3) + rspec-core (3.13.0) rspec-support (~> 3.13.0) - rspec-expectations (3.13.3) + rspec-expectations (3.13.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-github (3.0.0) + rspec-github (2.4.0) rspec-core (~> 3.0) - rspec-mocks (3.13.2) + rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-rails (7.1.1) - actionpack (>= 7.0) - activesupport (>= 7.0) - railties (>= 7.0) + rspec-rails (6.1.3) + actionpack (>= 6.1) + activesupport (>= 6.1) + railties (>= 6.1) rspec-core (~> 3.13) rspec-expectations (~> 3.13) rspec-mocks (~> 3.13) rspec-support (~> 3.13) - rspec-sidekiq (5.1.0) + rspec-sidekiq (5.0.0) rspec-core (~> 3.0) rspec-expectations (~> 3.0) rspec-mocks (~> 3.0) - sidekiq (>= 5, < 9) - rspec-support (3.13.2) - rubocop (1.75.2) + sidekiq (>= 5, < 8) + rspec-support (3.13.1) + rubocop (1.64.1) json (~> 2.3) - language_server-protocol (~> 3.17.0.2) - lint_roller (~> 1.1.0) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 2.9.3, < 3.0) - rubocop-ast (>= 1.44.0, < 2.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 2.4.0, < 4.0) - rubocop-ast (1.44.1) - parser (>= 3.3.7.2) - prism (~> 1.4) - rubocop-capybara (2.22.1) - lint_roller (~> 1.1) - rubocop (~> 1.72, >= 1.72.1) - rubocop-i18n (3.2.3) - lint_roller (~> 1.1) - rubocop (>= 1.72.1) - rubocop-performance (1.25.0) - lint_roller (~> 1.1) - rubocop (>= 1.75.0, < 2.0) - rubocop-ast (>= 1.38.0, < 2.0) - rubocop-rails (2.31.0) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.31.3) + parser (>= 3.3.1.0) + rubocop-capybara (2.21.0) + rubocop (~> 1.41) + rubocop-performance (1.21.1) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) + rubocop-rails (2.25.1) activesupport (>= 4.2.0) - lint_roller (~> 1.1) rack (>= 1.1) - rubocop (>= 1.75.0, < 2.0) - rubocop-ast (>= 1.38.0, < 2.0) - rubocop-rspec (3.5.0) - lint_roller (~> 1.1) - rubocop (~> 1.72, >= 1.72.1) - rubocop-rspec_rails (2.31.0) - lint_roller (~> 1.1) - rubocop (~> 1.72, >= 1.72.1) - rubocop-rspec (~> 3.5) - ruby-prof (1.7.1) + rubocop (>= 1.33.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) + rubocop-rspec (3.0.2) + rubocop (~> 1.61) + rubocop-rspec_rails (2.30.0) + rubocop (~> 1.61) + rubocop-rspec (~> 3, >= 3.0.1) + ruby-prof (1.7.0) ruby-progressbar (1.13.0) - ruby-saml (1.18.0) + ruby-saml (1.16.0) nokogiri (>= 1.13.10) rexml - ruby-vips (2.2.3) + ruby-vips (2.2.1) ffi (~> 1.12) - logger - rubyzip (2.4.1) - rufus-scheduler (3.9.2) - fugit (~> 1.1, >= 1.11.1) + ruby2_keywords (0.0.5) + rubyzip (2.3.2) + rufus-scheduler (3.9.1) + fugit (~> 1.1, >= 1.1.6) safety_net_attestation (0.4.0) jwt (~> 2.0) - sanitize (7.0.0) + sanitize (6.1.1) crass (~> 1.0.2) - nokogiri (>= 1.16.8) + nokogiri (>= 1.12.0) scenic (1.8.0) activerecord (>= 4.0.0) railties (>= 4.0.0) - securerandom (0.4.1) - selenium-webdriver (4.31.0) + selenium-webdriver (4.22.0) base64 (~> 0.2) logger (~> 1.4) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) - semantic_range (3.1.0) - shoulda-matchers (6.4.0) - activesupport (>= 5.2.0) + semantic_range (3.0.0) sidekiq (6.5.12) connection_pool (>= 2.2.5, < 3) rack (~> 2.0) redis (>= 4.5.0, < 5) sidekiq-bulk (0.2.0) sidekiq - sidekiq-scheduler (5.0.6) + sidekiq-scheduler (5.0.3) rufus-scheduler (~> 3.2) sidekiq (>= 6, < 8) - tilt (>= 1.4.0, < 3) + tilt (>= 1.4.0) sidekiq-unique-jobs (7.1.33) brpoplpush-redis_script (> 0.1.1, <= 2.0.0) concurrent-ruby (~> 1.0, >= 1.0.5) @@ -831,33 +812,32 @@ GEM docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) - simplecov-html (0.13.1) + simplecov-html (0.12.3) simplecov-lcov (0.8.0) simplecov_json_formatter (0.1.4) - stackprof (0.2.27) - starry (0.2.0) - base64 - stoplight (4.1.1) + stackprof (0.2.26) + statsd-ruby (1.5.0) + stoplight (4.1.0) redlock (~> 1.0) - stringio (3.1.6) - strong_migrations (2.3.0) - activerecord (>= 7) - swd (2.0.3) + stringio (3.1.1) + strong_migrations (1.8.0) + activerecord (>= 5.2) + strscan (3.1.0) + swd (1.3.0) activesupport (>= 3) attr_required (>= 0.0.5) - faraday (~> 2.0) - faraday-follow_redirects + httpclient (>= 2.4) sysexits (1.2.0) temple (0.10.3) - terminal-table (4.0.0) - unicode-display_width (>= 1.1.1, < 4) - terrapin (1.1.0) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + terrapin (1.0.1) climate_control - test-prof (1.4.4) - thor (1.3.2) - tilt (2.6.0) - timeout (0.4.3) - tpm-key_attestation (0.14.0) + test-prof (1.3.3.1) + thor (1.3.1) + tilt (2.3.0) + timeout (0.4.1) + tpm-key_attestation (0.12.0) bindata (~> 2.4) openssl (> 2.0) openssl-signature_algorithm (~> 1.0) @@ -876,34 +856,34 @@ GEM unf (~> 0.1.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2025.2) + tzinfo-data (1.2024.1) tzinfo (>= 1.0.0) unf (0.1.4) unf_ext unf_ext (0.0.9.1) - unicode-display_width (3.1.4) - unicode-emoji (~> 4.0, >= 4.0.4) - unicode-emoji (4.0.4) - uri (1.0.3) - useragent (0.16.11) + unicode-display_width (2.5.0) + uri (0.13.0) + validate_email (0.1.6) + activemodel (>= 3.0) + mail (>= 2.2.5) validate_url (1.0.15) activemodel (>= 3.0.0) public_suffix warden (1.2.9) rack (>= 2.0.9) - webauthn (3.4.0) + webauthn (3.1.0) android_key_attestation (~> 0.3.0) + awrence (~> 1.1) bindata (~> 2.4) cbor (~> 0.5.9) cose (~> 1.1) openssl (>= 2.2) safety_net_attestation (~> 0.4.0) - tpm-key_attestation (~> 0.14.0) - webfinger (2.1.3) + tpm-key_attestation (~> 0.12.0) + webfinger (1.2.0) activesupport - faraday (~> 2.0) - faraday-follow_redirects - webmock (3.25.1) + httpclient (>= 2.4) + webmock (3.23.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -912,17 +892,16 @@ GEM rack-proxy (>= 0.6.1) railties (>= 5.2) semantic_range (>= 2.3.0) - webrick (1.9.1) - websocket (1.2.11) - websocket-driver (0.7.7) - base64 + webrick (1.8.1) + websocket (1.2.10) + websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) wisper (2.0.1) xorcist (1.1.3) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.7.2) + zeitwerk (2.6.16) PLATFORMS ruby @@ -930,15 +909,14 @@ PLATFORMS DEPENDENCIES active_model_serializers (~> 0.10) addressable (~> 2.8) - annotaterb (~> 4.13) - aws-sdk-core (< 3.216.0) + annotate (~> 3.2) aws-sdk-s3 (~> 1.123) better_errors (~> 2.9) binding_of_caller (~> 1.0) blurhash (~> 0.1) bootsnap (~> 1.18.0) - brakeman (~> 7.0) - browser + brakeman (~> 6.0) + browser (< 6) bundler-audit (~> 0.9) capybara (~> 3.39) charlock_holmes (~> 0.7.7) @@ -957,15 +935,16 @@ DEPENDENCIES discard (~> 1.2) doorkeeper (~> 5.6) dotenv + ed25519 (~> 1.3) email_spec fabrication (~> 2.30) faker (~> 3.2) - faraday-httpclient fast_blank (~> 1.0) fastimage flatware-rspec - fog-core (<= 2.6.0) + fog-core (<= 2.4.0) fog-openstack (~> 1.0) + fuubar (~> 2.5) haml-rails (~> 2.0) haml_lint hcaptcha (~> 7.1) @@ -979,53 +958,51 @@ DEPENDENCIES idn-ruby inline_svg irb (~> 1.8) - jd-paperclip-azure (~> 3.0) json-ld json-ld-preloaded (~> 3.2) - json-schema (~> 5.0) + json-schema (~> 4.0) kaminari (~> 1.2) kt-paperclip (~> 7.2) letter_opener (~> 1.8) letter_opener_web (~> 3.0) link_header (~> 0.0) - linzer (~> 0.6.1) lograge (~> 0.12) mail (~> 2.8) mario-redis-lock (~> 1.2) + md-paperclip-azure (~> 2.2) memory_profiler - mime-types (~> 3.6.0) - mutex_m - net-http (~> 0.6.0) + mime-types (~> 3.5.0) + net-http (~> 0.4.0) net-ldap (~> 0.18) nokogiri (~> 1.15) + nsa oj (~> 3.14) omniauth (~> 2.0) omniauth-cas (~> 3.0.0.beta.1) omniauth-rails_csrf_protection (~> 1.0) omniauth-saml (~> 2.0) - omniauth_openid_connect (~> 0.8.0) - opentelemetry-api (~> 1.5.0) - opentelemetry-exporter-otlp (~> 0.30.0) - opentelemetry-instrumentation-active_job (~> 0.8.0) - opentelemetry-instrumentation-active_model_serializers (~> 0.22.0) - opentelemetry-instrumentation-concurrent_ruby (~> 0.22.0) - opentelemetry-instrumentation-excon (~> 0.23.0) - opentelemetry-instrumentation-faraday (~> 0.26.0) - opentelemetry-instrumentation-http (~> 0.24.0) - opentelemetry-instrumentation-http_client (~> 0.23.0) - opentelemetry-instrumentation-net_http (~> 0.23.0) - opentelemetry-instrumentation-pg (~> 0.30.0) - opentelemetry-instrumentation-rack (~> 0.26.0) - opentelemetry-instrumentation-rails (~> 0.36.0) - opentelemetry-instrumentation-redis (~> 0.26.0) - opentelemetry-instrumentation-sidekiq (~> 0.26.0) + omniauth_openid_connect (~> 0.6.1) + opentelemetry-api (~> 1.2.5) + opentelemetry-exporter-otlp (~> 0.28.0) + opentelemetry-instrumentation-active_job (~> 0.7.1) + opentelemetry-instrumentation-active_model_serializers (~> 0.20.1) + opentelemetry-instrumentation-concurrent_ruby (~> 0.21.2) + opentelemetry-instrumentation-excon (~> 0.22.0) + opentelemetry-instrumentation-faraday (~> 0.24.1) + opentelemetry-instrumentation-http (~> 0.23.2) + opentelemetry-instrumentation-http_client (~> 0.22.3) + opentelemetry-instrumentation-net_http (~> 0.22.4) + opentelemetry-instrumentation-pg (~> 0.27.1) + opentelemetry-instrumentation-rack (~> 0.24.1) + opentelemetry-instrumentation-rails (~> 0.31.0) + opentelemetry-instrumentation-redis (~> 0.25.3) + opentelemetry-instrumentation-sidekiq (~> 0.25.2) opentelemetry-sdk (~> 1.4) ox (~> 2.14) parslet pg (~> 1.5) pghero premailer-rails - prometheus_exporter (~> 2.2) propshaft public_suffix (~> 6.0) puma (~> 6.3) @@ -1034,19 +1011,19 @@ DEPENDENCIES rack-attack (~> 6.6) rack-cors (~> 2.0) rack-test (~> 2.1) - rails (~> 8.0) - rails-i18n (~> 8.0) + rails (~> 7.1.1) + rails-controller-testing (~> 1.0) + rails-i18n (~> 7.0) rdf-normalize (~> 0.5) redcarpet (~> 3.6) redis (~> 4.5) redis-namespace (~> 1.10) rqrcode (~> 2.2) - rspec-github (~> 3.0) - rspec-rails (~> 7.0) + rspec-github (~> 2.4) + rspec-rails (~> 6.0) rspec-sidekiq (~> 5.0) rubocop rubocop-capybara - rubocop-i18n rubocop-performance rubocop-rails rubocop-rspec @@ -1055,10 +1032,9 @@ DEPENDENCIES ruby-progressbar (~> 1.13) ruby-vips (~> 2.2) rubyzip (~> 2.3) - sanitize (~> 7.0) + sanitize (~> 6.0) scenic (~> 1.7) selenium-webdriver - shoulda-matchers sidekiq (~> 6.5) sidekiq-bulk (~> 0.2.0) sidekiq-scheduler (~> 5.0) @@ -1069,7 +1045,7 @@ DEPENDENCIES simplecov-lcov (~> 0.8) stackprof stoplight (~> 4.1) - strong_migrations + strong_migrations (= 1.8.0) test-prof thor (~> 1.2) tty-prompt (~> 0.23) @@ -1082,7 +1058,7 @@ DEPENDENCIES xorcist (~> 1.1) RUBY VERSION - ruby 3.4.1p0 + ruby 3.3.2p78 BUNDLED WITH - 2.6.8 + 2.5.11 diff --git a/Procfile b/Procfile index f033fd36c6..d15c835b86 100644 --- a/Procfile +++ b/Procfile @@ -11,4 +11,4 @@ worker: bundle exec sidekiq # # and let the main app use the separate app: # -# heroku config:set STREAMING_API_BASE_URL=wss://.herokuapp.com -a +# heroku config:set STREAMING_API_BASE_URL=wss://.herokuapp.com -a diff --git a/README.md b/README.md index 854e8ac3d9..e438d0bd7b 100644 --- a/README.md +++ b/README.md @@ -1,27 +1,112 @@ -NAS is an KMY & Mastodon Fork +# ![kmyblue icon](https://raw.githubusercontent.com/kmycode/mastodon/kb_development/app/javascript/icons/favicon-32x32.png) kmyblue -The following are just a few of the most common features. There are many other minor changes to the specifications. +[![Ruby Testing](https://github.com/kmycode/mastodon/actions/workflows/test-ruby.yml/badge.svg)](https://github.com/kmycode/mastodon/actions/workflows/test-ruby.yml) -Emoji reactions +kmyblueは[Mastodon](https://github.com/mastodon/mastodon)のフォークです。創作作家のためのMastodonを目指して開発しました。 -Local Public (Does not appear on the federated timeline of remote servers, but does appear on followers' home timelines. This is different from local only) +kmyblueはフォーク名であり、同時に[サーバー名](https://kmy.blue)でもあります。以下は特に記述がない限り、フォークとしてのkmyblueをさします。 -Bookmark classification +kmyblueは AGPL ライセンスで公開されているため、どなたでも自由にフォークし、このソースコードを元に自分でサーバーを立てて公開することができます。確かにサーバーkmyblueは創作作家向けのものですが、フォークとしてのkmyblueはAGPLでライセンスつけられており、ルールは全くの別物です。創作活動の一部（エロ関係含む）または全体を否定するコミュニティなどにも平等にお使いいただけます。サーバーkmyblueのルールを適用する必要もなく、「Anyone But Kmyblue」なルールを設定することすら許容されます。 +kmyblueは、特に非収載投稿の検索が強化されているため、ローカルタイムラインに掲載されていない投稿も検索・購読することが可能な場合があります。閉鎖的なコミュニティ、あまり目立ちたくないコミュニティには特に強力な機能を提供します。それ以外のコミュニティに対しても、kmyblueはプライバシーを考慮したうえで強力な検索・購読機能を提供するため、汎用サーバーとして利用するにもある程度十分な機能が揃っています。 -Set who can search your posts for each post (Searchability) +ただしkmyblueにおいて**テストコードは飾り**でしかありません。これはkmyblueを利用する人が本家Mastodonより圧倒的に少なく、バグやセキュリティインシデントを発見するだけの人数が足りないことを意味します。kmyblueは対策として自動テストを拡充しています。独自機能のテストを記述するだけでなく、本家のテストコードの補強も行っておりますが、確認漏れは必ず発生するものです。不具合が発生しても自己責任になります。既知のバグもいくつかありますし、直す予定のないものも含まれます。 -Quote posts, modest quotes (references) +テストコード、Lint どちらも動いています。 -Record posts that meet certain conditions such as domains, accounts, and keywords (Subscriptions/Antennas) +## インストール方法 -Send posts to a designated set of followers (Circles) (different from direct messages) +[Wiki](https://github.com/kmycode/mastodon/wiki/Installation)を参照してください。 -Notification of new posts on lists +## 開発への参加方法 -Exclude posts from people you follow when filtering posts +CONTRIBUTING.mdを参照してください。 -Hide number of followers and followings +## テスト -Automatically delete posts after a specified time has passed +``` +# デバッグ実行（以下のいずれか） +foreman start +DB_USER=postgres DB_PASS=password foreman start -Expanding moderation functions +# 一部を除く全てのテストを行う +RAILS_ENV=test bundle exec rspec spec + +# ElasticSearch連携テストを行う +新 +RAILS_ENV=test ES_ENABLED=true bundle exec rspec --tag search +旧 +RAILS_ENV=test ES_ENABLED=true RUN_SEARCH_SPECS=true bundle exec rspec spec/search +``` + +## kmyblueのブランチ + +- **main** - 管理者が本家MastodonにPRするときに使うことがあります +- **kb_development** - 開発中の最新のソースコードです。メジャーバージョンアップデートは通常このブランチから公開されます +- **kb_lts** - LTSの管理に使います。LTSはこのブランチから公開されます +- **kb_patch** - 修正パッチの管理に使います。マイナーバージョンアップデートは通常このブランチから公開されます + +## kmyblueの強み + +追加の詳細は下記記事もご覧ください。 + +https://note.com/kmycode/n/n5fd5e823ed40 + +以下に書いているもの以外にも多数の機能が存在します。 + +### 本家Mastodonへの積極的追従 + +kmyblueは、追加機能を控えめにする代わりに本家Mastodonに積極的に追従を行います。kmyblueの追加機能そのままに、Mastodonの新機能も利用できるよう調整を行います。 + +### ゆるやかな内輪での運用 + +kmyblueは同人向けサーバーとして出発したため、同人作家に需要のある「内輪ノリを外部にできるだけもらさない」という部分に特化しています。 + +「ローカル公開」という機能によって、「ローカルタイムラインに流すが他のサーバーの連合タイムラインに流さない」投稿が可能です。ただしMisskeyのローカル限定とは異なり、他のサーバーのフォロワーのタイムラインにも投稿は流れます。自分のサーバーの中で内輪で盛り上がって、他のサーバーの連合タイムラインには外面だけの投稿を流すことも可能です。 + +「サークル」という機能によって、特定のフォロワーにだけ見える投稿を行うことも可能です。その投稿に返信することで、相手サークルの会話に参加することも可能です。ただしサークル投稿を正常に処理できるソフトウェアは現在、kmyblue・Fedibirdに限ります。 + +また、通常のMastodonでは公開投稿を他のサーバーの人に自由に検索できるようにすることも可能ですが、kmyblueでは非収載投稿に対して同様の設定が可能です。つまり、ローカルタイムラインにも連合タイムラインにも流れない、誰かの目に自然に触れることはない、でも特定キーワードを使った検索では引っかかりたい、そのような需要に対応できます。 + +内輪とは自分のサーバーに限ったものではありません。内輪同士で複数のサーバーを運営するとき、お互いが深く繋がれるフレンドサーバーというシステムも用意しています。 + +ただしkmyblueは、同時に連合も重視しています。ローカル限定投稿など、連合を大きく制限させるような機能は作る予定はありません。 + +### 少人数サーバーでの運用 + +kmyblueは、人の少ないサーバーでの運用を考慮して設計しています。そのため、他のサーバーのアカウントの購読機能はFedibirdほど発達していませんし、人の多いサーバー向けの独自改造もほとんど存在しません。 + +ただしサーバーの負荷については一部度外視している部分があります。たとえば絵文字リアクション機能はサーバーへ著しい負荷をかける場合があります。絵文字リアクション機能そのものを無効にする管理者オプションも存在します。 + +もちろん人の多いサーバーでの運用が不便になるような修正は行っていません。人の多いサーバーでもそのままお使いいただけます。 + +### 比較的高い防御力 + +kmyblueでは、「Fediverseは将来的に荒むのではないか」「Fediverseは将来的にスパムに溢れるのではないか」を念頭に設計している部分があります。 + +個別ユーザー向けの設定項目が複数あります。 + +- Misskeyは、たとえMastodonの投稿であっても非収載投稿を自由に検索できますが、kmyblueではそれをブロックできるユーザー設定が存在します +- 他の人からの絵文字リアクションの受け入れを制限する設定も可能であり、例えば他のサーバーから好ましくない絵文字リアクションを受け取ることを防止できます +- 公開タイムラインの引用表示はデフォルトで無効になっています。不快な投稿を引用したものが公開タイムラインに流れても、ある程度は防止できます + - フィルター（ワードミュート）は、引用された投稿の内容にも適用されます。この場合、引用投稿そのものが表示されなくなります +- 自分のフォローしている相手の投稿をフィルターから除外する設定が存在します。防御を上げすぎると不便な箇所が出てくるので、そちらも緩和できるよう可能な限り配慮しています + +管理者向けには、スパムへの利用を前提とした正規表現可能なNGワード設定、細かい指定が可能な拡張ドメインブロック機能を用意しています。 + +ただし防御力の高さは自由を犠牲にします。例えばkmyblueは、絵文字リアクションの表示サイズ調整機能など、MisskeyやFedibirdには当たり前のようにある表示設定は存在しません。騒がしくなるようなものはあまり作りたいとは考えていません。 + +### その他の主な機能 + +- 絵文字リアクションによる手軽な交流 +- 絵文字デッキによる頻繁に使用する絵文字の登録・選択 +- 検索機能の強化（検索許可） +- 投稿の引用 +- ブックマークの分類 + +## kmyblueは何でないか + +kmyblueは、Misskeyではありません。絵文字リアクションなどMisskeyと同様の機能はありますが、根本的にUIの使い勝手が違う他にも、例えばブックマークを分類できてもそれを公開する機能を作っていません。Misskeyは「楽しむ」をコンセプトにしていますが、kmyblueはMastodonの思想を受け継ぎ、炎上や喧騒を避けることのできる落ち着いた場所を目指しています。そのため、思想に合わない機能は実装しないか、大幅に弱体化しています。 + +kmyblueは、Fedibirdではありません。確かにローカルタイムラインを無効にしFedibirdのような運営を可能にする設定は存在します。しかしkmyblueは本家追従を優先する観点からWebで対応する範囲をある程度絞り込んでいるため、Fedibirdにあるような豊富な表示設定は作っていません。絵文字の大きさすら調整することはできません。また、Fedibirdではアカウントの購読機能があります。kmyblueにも同様の機能はあるものの、Fedibirdのように一発ですぐできるようなUIではありません。購読機能は相手のフォローを伴わないため、特に利用者に擬似的なフォロー体験を与えるアカウント購読は、人の少ない小規模サーバーには向いていません。これは、小規模サーバーの運用を想定しているkmyblueがあえて作っていない部分です。 + +kmyblueは、企業・政府機関向けに開発されたものではありません。そもそも管理者はセキュリティに関する資格や専門知識を有しておらず、高度なセキュリティの求められる機関向けのソフトウェアを制作する能力はありません。kmyblueは確かに本家Mastodonに対して大幅に機能を追加していますが、そもそも個人によるフォークは、開発者が飽きたらそこで終わりというリスクも伴います。高い信頼性・安全性を保証することはできないので、導入の際はご自身で安全を十分に確認してからお使いになることを強くおすすめします。 diff --git a/Rakefile b/Rakefile index 488c551fee..e51cf0e17e 100644 --- a/Rakefile +++ b/Rakefile @@ -3,6 +3,6 @@ # Add your own tasks in files placed in lib/tasks ending in .rake, # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. -require_relative 'config/application' +require File.expand_path('config/application', __dir__) Rails.application.load_tasks diff --git a/SECURITY.md b/SECURITY.md index 993dcfb546..d5b27adfac 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -17,4 +17,9 @@ kmyblueにセキュリティインシデントを報告する場合、以下の ## サポートするバージョン -(サポート期間)[https://github.com/kmycode/mastodon/wiki/%E3%82%B5%E3%83%9D%E3%83%BC%E3%83%88%E6%9C%9F%E9%96%93] を参照してください。 +下記以外のバージョンは、セキュリティインシデントを起票されても対応しません。 + +- 最新メジャーバージョン、かつ、最新マイナーバージョン + - 最新メジャーバージョンのサポートは、次のメジャーバージョンが出た時点で終了します +- LTS + - LTSのサポートは、次のLTSが出た時点で終了します（ただし移行期間があってもいいと思ってるので、１〜３ヶ月以内ならセキュリティインシデントの程度に応じて対応する可能性があります） diff --git a/Vagrantfile b/Vagrantfile index ce456060cd..89f5536edc 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -174,7 +174,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| if config.vm.networks.any? { |type, options| type == :private_network } config.vm.synced_folder ".", "/vagrant", type: "nfs", mount_options: ['rw', 'actimeo=1'] else - config.vm.synced_folder ".", "/vagrant", type: "rsync", create: true, rsync__args: ["--verbose", "--archive", "--delete", "-z"] + config.vm.synced_folder ".", "/vagrant" end # Otherwise, you can access the site at http://localhost:3000 and http://localhost:4000 , http://localhost:8080 diff --git a/app.json b/app.json index 5e5a3dc1e7..4f05a64f51 100644 --- a/app.json +++ b/app.json @@ -90,15 +90,9 @@ } }, "buildpacks": [ - { - "url": "https://github.com/heroku/heroku-buildpack-activestorage-preview" - }, { "url": "https://github.com/heroku/heroku-buildpack-apt" }, - { - "url": "heroku/nodejs" - }, { "url": "heroku/ruby" } @@ -106,6 +100,5 @@ "scripts": { "postdeploy": "bundle exec rails db:migrate && bundle exec rails db:seed" }, - "addons": ["heroku-postgresql", "heroku-redis"], - "stack": "heroku-24" + "addons": ["heroku-postgresql", "heroku-redis"] } diff --git a/app/controllers/activitypub/claims_controller.rb b/app/controllers/activitypub/claims_controller.rb new file mode 100644 index 0000000000..480baaf2bc --- /dev/null +++ b/app/controllers/activitypub/claims_controller.rb @@ -0,0 +1,18 @@ +# frozen_string_literal: true + +class ActivityPub::ClaimsController < ActivityPub::BaseController + skip_before_action :authenticate_user! + + before_action :require_account_signature! + before_action :set_claim_result + + def create + render json: @claim_result, serializer: ActivityPub::OneTimeKeySerializer + end + + private + + def set_claim_result + @claim_result = ::Keys::ClaimService.new.call(@account.id, params[:id]) + end +end diff --git a/app/controllers/activitypub/collections_controller.rb b/app/controllers/activitypub/collections_controller.rb index c80db3500d..c25362c9bc 100644 --- a/app/controllers/activitypub/collections_controller.rb +++ b/app/controllers/activitypub/collections_controller.rb @@ -22,6 +22,8 @@ class ActivityPub::CollectionsController < ActivityPub::BaseController @items = @items.map { |item| item.distributable? ? item : ActivityPub::TagManager.instance.uri_for(item) } when 'tags' @items = for_signed_account { @account.featured_tags } + when 'devices' + @items = @account.devices else not_found end @@ -29,7 +31,7 @@ class ActivityPub::CollectionsController < ActivityPub::BaseController def set_size case params[:id] - when 'featured', 'tags' + when 'featured', 'devices', 'tags' @size = @items.size else not_found @@ -40,7 +42,7 @@ class ActivityPub::CollectionsController < ActivityPub::BaseController case params[:id] when 'featured' @type = :ordered - when 'tags' + when 'devices', 'tags' @type = :unordered else not_found @@ -49,7 +51,7 @@ class ActivityPub::CollectionsController < ActivityPub::BaseController def collection_presenter ActivityPub::CollectionPresenter.new( - id: ActivityPub::TagManager.instance.collection_uri_for(@account, params[:id]), + id: account_collection_url(@account, params[:id]), type: @type, size: @size, items: @items diff --git a/app/controllers/activitypub/likes_controller.rb b/app/controllers/activitypub/likes_controller.rb deleted file mode 100644 index 4aa6a4a771..0000000000 --- a/app/controllers/activitypub/likes_controller.rb +++ /dev/null @@ -1,36 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::LikesController < ActivityPub::BaseController - include Authorization - - vary_by -> { 'Signature' if authorized_fetch_mode? } - - before_action :require_account_signature!, if: :authorized_fetch_mode? - before_action :set_status - - def index - expires_in 0, public: @status.distributable? && public_fetch_mode? - render json: likes_collection_presenter, serializer: ActivityPub::CollectionSerializer, adapter: ActivityPub::Adapter, content_type: 'application/activity+json' - end - - private - - def pundit_user - signed_request_account - end - - def set_status - @status = @account.statuses.find(params[:status_id]) - authorize @status, :show? - rescue Mastodon::NotPermittedError - not_found - end - - def likes_collection_presenter - ActivityPub::CollectionPresenter.new( - id: account_status_likes_url(@account, @status), - type: :unordered, - size: @status.favourites_count - ) - end -end diff --git a/app/controllers/activitypub/outboxes_controller.rb b/app/controllers/activitypub/outboxes_controller.rb index 171161d491..82b1830941 100644 --- a/app/controllers/activitypub/outboxes_controller.rb +++ b/app/controllers/activitypub/outboxes_controller.rb @@ -41,8 +41,12 @@ class ActivityPub::OutboxesController < ActivityPub::BaseController end end - def outbox_url(...) - ActivityPub::TagManager.instance.outbox_uri_for(@account, ...) + def outbox_url(**kwargs) + if params[:account_username].present? + account_outbox_url(@account, **kwargs) + else + instance_actor_outbox_url(**kwargs) + end end def next_page diff --git a/app/controllers/activitypub/references_controller.rb b/app/controllers/activitypub/references_controller.rb index 7412540fe4..8f41fd6922 100644 --- a/app/controllers/activitypub/references_controller.rb +++ b/app/controllers/activitypub/references_controller.rb @@ -69,7 +69,6 @@ class ActivityPub::ReferencesController < ActivityPub::BaseController ActivityPub::CollectionPresenter.new( type: :unordered, id: ActivityPub::TagManager.instance.references_uri_for(@status), - size: @status.status_referred_by_count, first: page ) end diff --git a/app/controllers/activitypub/replies_controller.rb b/app/controllers/activitypub/replies_controller.rb index 0a19275d38..11aac48c9c 100644 --- a/app/controllers/activitypub/replies_controller.rb +++ b/app/controllers/activitypub/replies_controller.rb @@ -12,7 +12,7 @@ class ActivityPub::RepliesController < ActivityPub::BaseController before_action :set_replies def index - expires_in 0, public: @status.distributable? && public_fetch_mode? + 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 diff --git a/app/controllers/activitypub/shares_controller.rb b/app/controllers/activitypub/shares_controller.rb deleted file mode 100644 index 65b4a5b383..0000000000 --- a/app/controllers/activitypub/shares_controller.rb +++ /dev/null @@ -1,36 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::SharesController < ActivityPub::BaseController - include Authorization - - vary_by -> { 'Signature' if authorized_fetch_mode? } - - before_action :require_account_signature!, if: :authorized_fetch_mode? - before_action :set_status - - def index - expires_in 0, public: @status.distributable? && public_fetch_mode? - render json: shares_collection_presenter, serializer: ActivityPub::CollectionSerializer, adapter: ActivityPub::Adapter, content_type: 'application/activity+json' - end - - private - - def pundit_user - signed_request_account - end - - def set_status - @status = @account.statuses.find(params[:status_id]) - authorize @status, :show? - rescue Mastodon::NotPermittedError - not_found - end - - def shares_collection_presenter - ActivityPub::CollectionPresenter.new( - id: account_status_shares_url(@account, @status), - type: :unordered, - size: @status.reblogs_count - ) - end -end diff --git a/app/controllers/admin/account_actions_controller.rb b/app/controllers/admin/account_actions_controller.rb index 91849811e3..e674bf55a0 100644 --- a/app/controllers/admin/account_actions_controller.rb +++ b/app/controllers/admin/account_actions_controller.rb @@ -34,8 +34,7 @@ module Admin end def resource_params - params - .expect(admin_account_action: [:type, :report_id, :warning_preset_id, :text, :send_email_notification, :include_statuses]) + params.require(:admin_account_action).permit(:type, :report_id, :warning_preset_id, :text, :send_email_notification, :include_statuses) end end end diff --git a/app/controllers/admin/account_moderation_notes_controller.rb b/app/controllers/admin/account_moderation_notes_controller.rb index 7f65ced517..8b6c1a4454 100644 --- a/app/controllers/admin/account_moderation_notes_controller.rb +++ b/app/controllers/admin/account_moderation_notes_controller.rb @@ -13,7 +13,7 @@ module Admin redirect_to admin_account_path(@account_moderation_note.target_account_id), notice: I18n.t('admin.account_moderation_notes.created_msg') else @account = @account_moderation_note.target_account - @moderation_notes = @account.targeted_moderation_notes.chronological.includes(:account) + @moderation_notes = @account.targeted_moderation_notes.latest @warnings = @account.strikes.custom.latest render 'admin/accounts/show' @@ -29,8 +29,10 @@ module Admin private def resource_params - params - .expect(account_moderation_note: [:content, :target_account_id]) + params.require(:account_moderation_note).permit( + :content, + :target_account_id + ) end def set_account_moderation_note diff --git a/app/controllers/admin/accounts_controller.rb b/app/controllers/admin/accounts_controller.rb index a779a0cf51..8749a2ca77 100644 --- a/app/controllers/admin/accounts_controller.rb +++ b/app/controllers/admin/accounts_controller.rb @@ -33,7 +33,7 @@ module Admin @deletion_request = @account.deletion_request @account_moderation_note = current_account.account_moderation_notes.new(target_account: @account) - @moderation_notes = @account.targeted_moderation_notes.chronological.includes(:account) + @moderation_notes = @account.targeted_moderation_notes.latest @warnings = @account.strikes.includes(:target_account, :account, :appeal).latest @domain_block = DomainBlock.rule_for(@account.domain) end @@ -172,8 +172,7 @@ module Admin end def form_account_batch_params - params - .expect(form_account_batch: [:action, account_ids: []]) + params.require(:form_account_batch).permit(:action, account_ids: []) end def action_from_button diff --git a/app/controllers/admin/announcements/distributions_controller.rb b/app/controllers/admin/announcements/distributions_controller.rb deleted file mode 100644 index 4bd8769834..0000000000 --- a/app/controllers/admin/announcements/distributions_controller.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -class Admin::Announcements::DistributionsController < Admin::BaseController - before_action :set_announcement - - def create - authorize @announcement, :distribute? - @announcement.touch(:notification_sent_at) - Admin::DistributeAnnouncementNotificationWorker.perform_async(@announcement.id) - redirect_to admin_announcements_path - end - - private - - def set_announcement - @announcement = Announcement.find(params[:announcement_id]) - end -end diff --git a/app/controllers/admin/announcements/previews_controller.rb b/app/controllers/admin/announcements/previews_controller.rb deleted file mode 100644 index d77f931a7f..0000000000 --- a/app/controllers/admin/announcements/previews_controller.rb +++ /dev/null @@ -1,16 +0,0 @@ -# frozen_string_literal: true - -class Admin::Announcements::PreviewsController < Admin::BaseController - before_action :set_announcement - - def show - authorize @announcement, :distribute? - @user_count = @announcement.scope_for_notification.count - end - - private - - def set_announcement - @announcement = Announcement.find(params[:announcement_id]) - end -end diff --git a/app/controllers/admin/announcements/tests_controller.rb b/app/controllers/admin/announcements/tests_controller.rb deleted file mode 100644 index f2457eb23a..0000000000 --- a/app/controllers/admin/announcements/tests_controller.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -class Admin::Announcements::TestsController < Admin::BaseController - before_action :set_announcement - - def create - authorize @announcement, :distribute? - UserMailer.announcement_published(current_user, @announcement).deliver_later! - redirect_to admin_announcements_path - end - - private - - def set_announcement - @announcement = Announcement.find(params[:announcement_id]) - end -end diff --git a/app/controllers/admin/announcements_controller.rb b/app/controllers/admin/announcements_controller.rb index eaf84aab25..8f9708183a 100644 --- a/app/controllers/admin/announcements_controller.rb +++ b/app/controllers/admin/announcements_controller.rb @@ -6,7 +6,6 @@ class Admin::AnnouncementsController < Admin::BaseController def index authorize :announcement, :index? - @published_announcements_count = Announcement.published.async_count end def new @@ -84,7 +83,6 @@ class Admin::AnnouncementsController < Admin::BaseController end def resource_params - params - .expect(announcement: [:text, :scheduled_at, :starts_at, :ends_at, :all_day]) + params.require(:announcement).permit(:text, :scheduled_at, :starts_at, :ends_at, :all_day) end end diff --git a/app/controllers/admin/base_controller.rb b/app/controllers/admin/base_controller.rb index 14338dd293..4b5afbe157 100644 --- a/app/controllers/admin/base_controller.rb +++ b/app/controllers/admin/base_controller.rb @@ -7,14 +7,19 @@ module Admin layout 'admin' - before_action :set_referrer_policy_header + before_action :set_body_classes + before_action :set_cache_headers after_action :verify_authorized private - def set_referrer_policy_header - response.headers['Referrer-Policy'] = 'same-origin' + def set_body_classes + @body_classes = 'admin' + end + + def set_cache_headers + response.cache_control.replace(private: true, no_store: true) end def set_user diff --git a/app/controllers/admin/change_emails_controller.rb b/app/controllers/admin/change_emails_controller.rb index c923b94b1a..a689d3a530 100644 --- a/app/controllers/admin/change_emails_controller.rb +++ b/app/controllers/admin/change_emails_controller.rb @@ -41,8 +41,9 @@ module Admin end def resource_params - params - .expect(user: [:unconfirmed_email]) + params.require(:user).permit( + :unconfirmed_email + ) end end end diff --git a/app/controllers/admin/custom_emojis_controller.rb b/app/controllers/admin/custom_emojis_controller.rb index 596b167249..34368f08a2 100644 --- a/app/controllers/admin/custom_emojis_controller.rb +++ b/app/controllers/admin/custom_emojis_controller.rb @@ -67,13 +67,11 @@ module Admin end def resource_params - params - .expect(custom_emoji: [:shortcode, :image, :category_id, :visible_in_picker, :aliases_raw, :license]) + params.require(:custom_emoji).permit(:shortcode, :image, :category_id, :visible_in_picker, :aliases_raw, :license) end def update_params - params - .expect(custom_emoji: [:category_id, :visible_in_picker, :aliases_raw, :license]) + params.require(:custom_emoji).permit(:category_id, :visible_in_picker, :aliases_raw, :license) end def filtered_custom_emojis @@ -103,8 +101,7 @@ module Admin end def form_custom_emoji_batch_params - params - .expect(form_custom_emoji_batch: [:action, :category_id, :category_name, custom_emoji_ids: []]) + params.require(:form_custom_emoji_batch).permit(:action, :category_id, :category_name, custom_emoji_ids: []) end end end diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb index 5b0867dcfb..3a6df662ea 100644 --- a/app/controllers/admin/dashboard_controller.rb +++ b/app/controllers/admin/dashboard_controller.rb @@ -7,12 +7,12 @@ module Admin def index authorize :dashboard, :index? - @pending_appeals_count = Appeal.pending.async_count - @pending_reports_count = Report.unresolved.async_count - @pending_tags_count = Tag.pending_review.async_count - @pending_users_count = User.pending.async_count @system_checks = Admin::SystemCheck.perform(current_user) @time_period = (29.days.ago.to_date...Time.now.utc.to_date) + @pending_users_count = User.pending.count + @pending_reports_count = Report.unresolved.count + @pending_tags_count = Tag.pending_review.count + @pending_appeals_count = Appeal.pending.count end end end diff --git a/app/controllers/admin/disputes/appeals_controller.rb b/app/controllers/admin/disputes/appeals_controller.rb index 0c41553676..5e342409b0 100644 --- a/app/controllers/admin/disputes/appeals_controller.rb +++ b/app/controllers/admin/disputes/appeals_controller.rb @@ -6,7 +6,6 @@ class Admin::Disputes::AppealsController < Admin::BaseController def index authorize :appeal, :index? - @pending_appeals_count = Appeal.pending.async_count @appeals = filtered_appeals.page(params[:page]) end diff --git a/app/controllers/admin/domain_allows_controller.rb b/app/controllers/admin/domain_allows_controller.rb index 913c1a8246..b0f139e3a8 100644 --- a/app/controllers/admin/domain_allows_controller.rb +++ b/app/controllers/admin/domain_allows_controller.rb @@ -37,7 +37,6 @@ class Admin::DomainAllowsController < Admin::BaseController end def resource_params - params - .expect(domain_allow: [:domain]) + params.require(:domain_allow).permit(:domain) end end diff --git a/app/controllers/admin/domain_blocks_controller.rb b/app/controllers/admin/domain_blocks_controller.rb index 520db814f2..78d2a2da28 100644 --- a/app/controllers/admin/domain_blocks_controller.rb +++ b/app/controllers/admin/domain_blocks_controller.rb @@ -35,9 +35,7 @@ module Admin rescue Mastodon::NotPermittedError flash[:alert] = I18n.t('admin.domain_blocks.not_permitted') else - flash[:notice] = I18n.t('admin.domain_blocks.created_msg') - ensure - redirect_to admin_instances_path(limited: '1') + redirect_to admin_instances_path(limited: '1'), notice: I18n.t('admin.domain_blocks.created_msg') end def new @@ -126,14 +124,9 @@ module Admin end def form_domain_block_batch_params - params - .expect( - form_domain_block_batch: [ - domain_blocks_attributes: [[:enabled, :domain, :severity, :reject_media, :reject_reports, :private_comment, :public_comment, :obfuscate, - :reject_favourite, :reject_reply_exclude_followers, :reject_send_sensitive, :reject_hashtag, - :reject_straight_follow, :reject_new_follow, :reject_friend, :block_trends, :detect_invalid_subscription, :hidden]], - ] - ) + params.require(:form_domain_block_batch).permit(domain_blocks_attributes: [:enabled, :domain, :severity, :reject_media, :reject_favourite, :reject_reply_exclude_followers, + :reject_send_sensitive, :reject_hashtag, :reject_straight_follow, :reject_new_follow, :reject_friend, :block_trends, :detect_invalid_subscription, + :reject_reports, :private_comment, :public_comment, :obfuscate, :hidden]) end def action_from_button diff --git a/app/controllers/admin/email_domain_blocks_controller.rb b/app/controllers/admin/email_domain_blocks_controller.rb index 12f221164f..faa0a061a6 100644 --- a/app/controllers/admin/email_domain_blocks_controller.rb +++ b/app/controllers/admin/email_domain_blocks_controller.rb @@ -5,7 +5,7 @@ module Admin def index authorize :email_domain_block, :index? - @email_domain_blocks = EmailDomainBlock.parents.includes(:children).order(id: :desc).page(params[:page]) + @email_domain_blocks = EmailDomainBlock.where(parent_id: nil).includes(:children).order(id: :desc).page(params[:page]) @form = Form::EmailDomainBlockBatch.new end @@ -58,17 +58,18 @@ module Admin private def set_resolved_records - @resolved_records = DomainResource.new(@email_domain_block.domain).mx + Resolv::DNS.open do |dns| + dns.timeouts = 5 + @resolved_records = dns.getresources(@email_domain_block.domain, Resolv::DNS::Resource::IN::MX).to_a + end end def resource_params - params - .expect(email_domain_block: [:domain, :allow_with_approval, other_domains: []]) + params.require(:email_domain_block).permit(:domain, :allow_with_approval, other_domains: []) end def form_email_domain_block_batch_params - params - .expect(form_email_domain_block_batch: [email_domain_block_ids: []]) + params.require(:form_email_domain_block_batch).permit(email_domain_block_ids: []) end def action_from_button diff --git a/app/controllers/admin/fasp/debug/callbacks_controller.rb b/app/controllers/admin/fasp/debug/callbacks_controller.rb deleted file mode 100644 index 28aba5e489..0000000000 --- a/app/controllers/admin/fasp/debug/callbacks_controller.rb +++ /dev/null @@ -1,20 +0,0 @@ -# frozen_string_literal: true - -class Admin::Fasp::Debug::CallbacksController < Admin::BaseController - def index - authorize [:admin, :fasp, :provider], :update? - - @callbacks = Fasp::DebugCallback - .includes(:fasp_provider) - .order(created_at: :desc) - end - - def destroy - authorize [:admin, :fasp, :provider], :update? - - callback = Fasp::DebugCallback.find(params[:id]) - callback.destroy - - redirect_to admin_fasp_debug_callbacks_path - end -end diff --git a/app/controllers/admin/fasp/debug_calls_controller.rb b/app/controllers/admin/fasp/debug_calls_controller.rb deleted file mode 100644 index 1e1b6dbf3c..0000000000 --- a/app/controllers/admin/fasp/debug_calls_controller.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -class Admin::Fasp::DebugCallsController < Admin::BaseController - before_action :set_provider - - def create - authorize [:admin, @provider], :update? - - @provider.perform_debug_call - - redirect_to admin_fasp_providers_path - end - - private - - def set_provider - @provider = Fasp::Provider.find(params[:provider_id]) - end -end diff --git a/app/controllers/admin/fasp/providers_controller.rb b/app/controllers/admin/fasp/providers_controller.rb deleted file mode 100644 index 4f1f1271bf..0000000000 --- a/app/controllers/admin/fasp/providers_controller.rb +++ /dev/null @@ -1,47 +0,0 @@ -# frozen_string_literal: true - -class Admin::Fasp::ProvidersController < Admin::BaseController - before_action :set_provider, only: [:show, :edit, :update, :destroy] - - def index - authorize [:admin, :fasp, :provider], :index? - - @providers = Fasp::Provider.order(confirmed: :asc, created_at: :desc) - end - - def show - authorize [:admin, @provider], :show? - end - - def edit - authorize [:admin, @provider], :update? - end - - def update - authorize [:admin, @provider], :update? - - if @provider.update(provider_params) - redirect_to admin_fasp_providers_path - else - render :edit - end - end - - def destroy - authorize [:admin, @provider], :destroy? - - @provider.destroy - - redirect_to admin_fasp_providers_path - end - - private - - def provider_params - params.expect(fasp_provider: [capabilities_attributes: {}]) - end - - def set_provider - @provider = Fasp::Provider.find(params[:id]) - end -end diff --git a/app/controllers/admin/fasp/registrations_controller.rb b/app/controllers/admin/fasp/registrations_controller.rb deleted file mode 100644 index 52c46c2eb6..0000000000 --- a/app/controllers/admin/fasp/registrations_controller.rb +++ /dev/null @@ -1,23 +0,0 @@ -# frozen_string_literal: true - -class Admin::Fasp::RegistrationsController < Admin::BaseController - before_action :set_provider - - def new - authorize [:admin, @provider], :create? - end - - def create - authorize [:admin, @provider], :create? - - @provider.update_info!(confirm: true) - - redirect_to edit_admin_fasp_provider_path(@provider) - end - - private - - def set_provider - @provider = Fasp::Provider.find(params[:provider_id]) - end -end diff --git a/app/controllers/admin/follow_recommendations_controller.rb b/app/controllers/admin/follow_recommendations_controller.rb index b060cfbe94..a54e41bd8c 100644 --- a/app/controllers/admin/follow_recommendations_controller.rb +++ b/app/controllers/admin/follow_recommendations_controller.rb @@ -37,8 +37,7 @@ module Admin end def form_account_batch_params - params - .expect(form_account_batch: [:action, account_ids: []]) + params.require(:form_account_batch).permit(:action, account_ids: []) end def filter_params diff --git a/app/controllers/admin/friend_servers_controller.rb b/app/controllers/admin/friend_servers_controller.rb index ec41ba672c..729d3b3912 100644 --- a/app/controllers/admin/friend_servers_controller.rb +++ b/app/controllers/admin/friend_servers_controller.rb @@ -79,11 +79,11 @@ module Admin end def resource_params - params.expect(friend_domain: [:domain, :inbox_url, :available, :pseudo_relay, :delivery_local, :unlocked, :allow_all_posts]) + params.require(:friend_domain).permit(:domain, :inbox_url, :available, :pseudo_relay, :delivery_local, :unlocked, :allow_all_posts) end def update_resource_params - params.expect(friend_domain: [:inbox_url, :available, :pseudo_relay, :delivery_local, :unlocked, :allow_all_posts]) + params.require(:friend_domain).permit(:inbox_url, :available, :pseudo_relay, :delivery_local, :unlocked, :allow_all_posts) end def warn_signatures_not_enabled! diff --git a/app/controllers/admin/instances_controller.rb b/app/controllers/admin/instances_controller.rb index a48c4773ed..a6997b62f7 100644 --- a/app/controllers/admin/instances_controller.rb +++ b/app/controllers/admin/instances_controller.rb @@ -5,8 +5,6 @@ module Admin before_action :set_instances, only: :index before_action :set_instance, except: :index - LOGS_LIMIT = 5 - def index authorize :instance, :index? preload_delivery_failures! @@ -15,7 +13,6 @@ module Admin def show authorize :instance, :show? @time_period = (6.days.ago.to_date...Time.now.utc.to_date) - @action_logs = Admin::ActionLogFilter.new(target_domain: @instance.domain).results.limit(LOGS_LIMIT) end def destroy diff --git a/app/controllers/admin/invites_controller.rb b/app/controllers/admin/invites_controller.rb index ac4ee35271..dabfe97655 100644 --- a/app/controllers/admin/invites_controller.rb +++ b/app/controllers/admin/invites_controller.rb @@ -32,15 +32,14 @@ module Admin def deactivate_all authorize :invite, :deactivate_all? - Invite.available.in_batches.touch_all(:expires_at) + Invite.available.in_batches.update_all(expires_at: Time.now.utc) redirect_to admin_invites_path end private def resource_params - params - .expect(invite: [:max_uses, :expires_in]) + params.require(:invite).permit(:max_uses, :expires_in) end def filtered_invites diff --git a/app/controllers/admin/ip_blocks_controller.rb b/app/controllers/admin/ip_blocks_controller.rb index afabda1b88..1bd7ec8059 100644 --- a/app/controllers/admin/ip_blocks_controller.rb +++ b/app/controllers/admin/ip_blocks_controller.rb @@ -44,8 +44,7 @@ module Admin private def resource_params - params - .expect(ip_block: [:ip, :severity, :comment, :expires_in]) + params.require(:ip_block).permit(:ip, :severity, :comment, :expires_in) end def action_from_button @@ -53,8 +52,7 @@ module Admin end def form_ip_block_batch_params - params - .expect(form_ip_block_batch: [ip_block_ids: []]) + params.require(:form_ip_block_batch).permit(ip_block_ids: []) end end end diff --git a/app/controllers/admin/ng_rules_controller.rb b/app/controllers/admin/ng_rules_controller.rb index 0bdda41c0c..f37424cced 100644 --- a/app/controllers/admin/ng_rules_controller.rb +++ b/app/controllers/admin/ng_rules_controller.rb @@ -82,16 +82,16 @@ module Admin end def resource_params - params.expect(ng_rule: [:title, :expires_in, :available, :account_domain, :account_username, :account_display_name, - :account_note, :account_field_name, :account_field_value, :account_avatar_state, - :account_header_state, :account_include_local, :status_spoiler_text, :status_text, :status_tag, - :status_sensitive_state, :status_cw_state, :status_media_state, :status_poll_state, - :status_mention_state, :status_reference_state, - :status_quote_state, :status_reply_state, :status_media_threshold, :status_poll_threshold, - :status_mention_threshold, :status_allow_follower_mention, - :reaction_allow_follower, :emoji_reaction_name, :emoji_reaction_origin_domain, - :status_reference_threshold, :account_allow_followed_by_local, :record_history_also_local, - status_visibility: [], status_searchability: [], reaction_type: []]) + params.require(:ng_rule).permit(:title, :expires_in, :available, :account_domain, :account_username, :account_display_name, + :account_note, :account_field_name, :account_field_value, :account_avatar_state, + :account_header_state, :account_include_local, :status_spoiler_text, :status_text, :status_tag, + :status_sensitive_state, :status_cw_state, :status_media_state, :status_poll_state, + :status_mention_state, :status_reference_state, + :status_quote_state, :status_reply_state, :status_media_threshold, :status_poll_threshold, + :status_mention_threshold, :status_allow_follower_mention, + :reaction_allow_follower, :emoji_reaction_name, :emoji_reaction_origin_domain, + :status_reference_threshold, :account_allow_followed_by_local, :record_history_also_local, + status_visibility: [], status_searchability: [], reaction_type: []) end def test_words! diff --git a/app/controllers/admin/ng_words/keywords_controller.rb b/app/controllers/admin/ng_words/keywords_controller.rb index 10969204e8..9af38fab7b 100644 --- a/app/controllers/admin/ng_words/keywords_controller.rb +++ b/app/controllers/admin/ng_words/keywords_controller.rb @@ -21,10 +21,6 @@ module Admin false end - def avoid_save? - true - end - private def after_update_redirect_path diff --git a/app/controllers/admin/ng_words_controller.rb b/app/controllers/admin/ng_words_controller.rb index 9e437f8c8b..a70a435fa4 100644 --- a/app/controllers/admin/ng_words_controller.rb +++ b/app/controllers/admin/ng_words_controller.rb @@ -13,12 +13,6 @@ module Admin return unless validate - if avoid_save? - flash[:notice] = I18n.t('generic.changes_saved_msg') - redirect_to after_update_redirect_path - return - end - @admin_settings = Form::AdminSettings.new(settings_params) if @admin_settings.save @@ -39,18 +33,14 @@ module Admin admin_ng_words_path end - def avoid_save? - false - end - private def settings_params - params.expect(form_admin_settings: [*Form::AdminSettings::KEYS]) + params.require(:form_admin_settings).permit(*Form::AdminSettings::KEYS) end def settings_params_test - params.expect(form_admin_settings: [ng_words_test: [keywords: [], regexps: [], strangers: [], temporary_ids: []]])['ng_words_test'] + params.require(:form_admin_settings)[:ng_words_test] end end end diff --git a/app/controllers/admin/relays_controller.rb b/app/controllers/admin/relays_controller.rb index 9a796949de..c893802159 100644 --- a/app/controllers/admin/relays_controller.rb +++ b/app/controllers/admin/relays_controller.rb @@ -21,7 +21,6 @@ module Admin @relay = Relay.new(resource_params) if @relay.save - log_action :create, @relay @relay.enable! redirect_to admin_relays_path else @@ -32,21 +31,18 @@ module Admin def destroy authorize :relay, :update? @relay.destroy - log_action :destroy, @relay redirect_to admin_relays_path end def enable authorize :relay, :update? @relay.enable! - log_action :enable, @relay redirect_to admin_relays_path end def disable authorize :relay, :update? @relay.disable! - log_action :disable, @relay redirect_to admin_relays_path end @@ -57,8 +53,7 @@ module Admin end def resource_params - params - .expect(relay: [:inbox_url]) + params.require(:relay).permit(:inbox_url) end def warn_signatures_not_enabled! diff --git a/app/controllers/admin/report_notes_controller.rb b/app/controllers/admin/report_notes_controller.rb index 10dbe846e4..b5f04a1caa 100644 --- a/app/controllers/admin/report_notes_controller.rb +++ b/app/controllers/admin/report_notes_controller.rb @@ -21,7 +21,7 @@ module Admin redirect_to after_create_redirect_path, notice: I18n.t('admin.report_notes.created_msg') else - @report_notes = @report.notes.chronological.includes(:account) + @report_notes = @report.notes.includes(:account).order(id: :desc) @action_logs = @report.history.includes(:target) @form = Admin::StatusBatchAction.new @statuses = @report.statuses.with_includes @@ -47,8 +47,10 @@ module Admin end def resource_params - params - .expect(report_note: [:content, :report_id]) + params.require(:report_note).permit( + :content, + :report_id + ) end def set_report_note diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb index aa877f1448..00d200d7c8 100644 --- a/app/controllers/admin/reports_controller.rb +++ b/app/controllers/admin/reports_controller.rb @@ -13,7 +13,7 @@ module Admin authorize @report, :show? @report_note = @report.notes.new - @report_notes = @report.notes.chronological.includes(:account) + @report_notes = @report.notes.includes(:account).order(id: :desc) @action_logs = @report.history.includes(:target) @form = Admin::StatusBatchAction.new @statuses = @report.statuses.with_includes diff --git a/app/controllers/admin/roles_controller.rb b/app/controllers/admin/roles_controller.rb index 2f9af8a6fc..bcfc11159c 100644 --- a/app/controllers/admin/roles_controller.rb +++ b/app/controllers/admin/roles_controller.rb @@ -61,8 +61,7 @@ module Admin end def resource_params - params - .expect(user_role: [:name, :color, :highlighted, :position, permissions_as_keys: []]) + params.require(:user_role).permit(:name, :color, :highlighted, :position, permissions_as_keys: []) end end end diff --git a/app/controllers/admin/rules_controller.rb b/app/controllers/admin/rules_controller.rb index 289b6a98c3..b8def22ba3 100644 --- a/app/controllers/admin/rules_controller.rb +++ b/app/controllers/admin/rules_controller.rb @@ -53,8 +53,7 @@ module Admin end def resource_params - params - .expect(rule: [:text, :hint, :priority]) + params.require(:rule).permit(:text, :hint, :priority) end end end diff --git a/app/controllers/admin/sensitive_words_controller.rb b/app/controllers/admin/sensitive_words_controller.rb index 716dcc708a..24cdd4efcb 100644 --- a/app/controllers/admin/sensitive_words_controller.rb +++ b/app/controllers/admin/sensitive_words_controller.rb @@ -37,7 +37,7 @@ module Admin end def settings_params - params.expect(form_admin_settings: [*Form::AdminSettings::KEYS]) + params.require(:form_admin_settings).permit(*Form::AdminSettings::KEYS) end def settings_params_test diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb index 2ae5ec8255..338a3638c4 100644 --- a/app/controllers/admin/settings_controller.rb +++ b/app/controllers/admin/settings_controller.rb @@ -28,8 +28,7 @@ module Admin end def settings_params - params - .expect(form_admin_settings: [*Form::AdminSettings::KEYS]) + params.require(:form_admin_settings).permit(*Form::AdminSettings::KEYS) end end end diff --git a/app/controllers/admin/software_updates_controller.rb b/app/controllers/admin/software_updates_controller.rb index c9be97eb71..52d8cb41e6 100644 --- a/app/controllers/admin/software_updates_controller.rb +++ b/app/controllers/admin/software_updates_controller.rb @@ -6,7 +6,7 @@ module Admin def index authorize :software_update, :index? - @software_updates = SoftwareUpdate.by_version.filter(&:pending?) + @software_updates = SoftwareUpdate.all.sort_by(&:gem_version) end private diff --git a/app/controllers/admin/special_domains_controller.rb b/app/controllers/admin/special_domains_controller.rb index b36fe28d6e..0ddbf26786 100644 --- a/app/controllers/admin/special_domains_controller.rb +++ b/app/controllers/admin/special_domains_controller.rb @@ -28,7 +28,7 @@ module Admin end def settings_params - params.expect(form_admin_settings: [*Form::AdminSettings::KEYS]) + params.require(:form_admin_settings).permit(*Form::AdminSettings::KEYS) end end end diff --git a/app/controllers/admin/special_instances_controller.rb b/app/controllers/admin/special_instances_controller.rb index a16bae13ef..3fd35d474e 100644 --- a/app/controllers/admin/special_instances_controller.rb +++ b/app/controllers/admin/special_instances_controller.rb @@ -28,7 +28,7 @@ module Admin end def settings_params - params.expect(form_admin_settings: [*Form::AdminSettings::KEYS]) + params.require(:form_admin_settings).permit(*Form::AdminSettings::KEYS) end end end diff --git a/app/controllers/admin/statuses_controller.rb b/app/controllers/admin/statuses_controller.rb index 956950fe0d..2070a7c70c 100644 --- a/app/controllers/admin/statuses_controller.rb +++ b/app/controllers/admin/statuses_controller.rb @@ -16,8 +16,6 @@ module Admin def show authorize [:admin, @status], :show? - - @status_batch_action = Admin::StatusBatchAction.new end def batch @@ -98,8 +96,7 @@ module Admin helper_method :batched_ordered_status_edits def admin_status_batch_action_params - params - .expect(admin_status_batch_action: [status_ids: []]) + params.require(:admin_status_batch_action).permit(status_ids: []) end def after_create_redirect_path diff --git a/app/controllers/admin/tags_controller.rb b/app/controllers/admin/tags_controller.rb index a7bfd64794..4f727c398a 100644 --- a/app/controllers/admin/tags_controller.rb +++ b/app/controllers/admin/tags_controller.rb @@ -2,15 +2,7 @@ module Admin class TagsController < BaseController - before_action :set_tag, except: [:index] - - PER_PAGE = 20 - - def index - authorize :tag, :index? - - @tags = filtered_tags.page(params[:page]).per(PER_PAGE) - end + before_action :set_tag def show authorize @tag, :show? @@ -37,16 +29,7 @@ module Admin end def tag_params - params - .expect(tag: [:name, :display_name, :trendable, :usable, :listable]) - end - - def filtered_tags - TagFilter.new(filter_params.with_defaults(order: 'newest')).results - end - - def filter_params - params.slice(:page, *TagFilter::KEYS).permit(:page, *TagFilter::KEYS) + params.require(:tag).permit(:name, :display_name, :trendable, :usable, :listable) end end end diff --git a/app/controllers/admin/terms_of_service/distributions_controller.rb b/app/controllers/admin/terms_of_service/distributions_controller.rb deleted file mode 100644 index c639b083dd..0000000000 --- a/app/controllers/admin/terms_of_service/distributions_controller.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -class Admin::TermsOfService::DistributionsController < Admin::BaseController - before_action :set_terms_of_service - - def create - authorize @terms_of_service, :distribute? - @terms_of_service.touch(:notification_sent_at) - Admin::DistributeTermsOfServiceNotificationWorker.perform_async(@terms_of_service.id) - redirect_to admin_terms_of_service_index_path - end - - private - - def set_terms_of_service - @terms_of_service = TermsOfService.find(params[:terms_of_service_id]) - end -end diff --git a/app/controllers/admin/terms_of_service/drafts_controller.rb b/app/controllers/admin/terms_of_service/drafts_controller.rb deleted file mode 100644 index 0c67eb9df8..0000000000 --- a/app/controllers/admin/terms_of_service/drafts_controller.rb +++ /dev/null @@ -1,37 +0,0 @@ -# frozen_string_literal: true - -class Admin::TermsOfService::DraftsController < Admin::BaseController - before_action :set_terms_of_service - - def show - authorize :terms_of_service, :create? - end - - def update - authorize @terms_of_service, :update? - - @terms_of_service.published_at = Time.now.utc if params[:action_type] == 'publish' - - if @terms_of_service.update(resource_params) - log_action(:publish, @terms_of_service) if @terms_of_service.published? - redirect_to @terms_of_service.published? ? admin_terms_of_service_index_path : admin_terms_of_service_draft_path - else - render :show - end - end - - private - - def set_terms_of_service - @terms_of_service = TermsOfService.draft.first || TermsOfService.new(text: current_terms_of_service&.text, effective_date: 10.days.from_now) - end - - def current_terms_of_service - TermsOfService.live.first - end - - def resource_params - params - .expect(terms_of_service: [:text, :changelog, :effective_date]) - end -end diff --git a/app/controllers/admin/terms_of_service/generates_controller.rb b/app/controllers/admin/terms_of_service/generates_controller.rb deleted file mode 100644 index 0edc87893e..0000000000 --- a/app/controllers/admin/terms_of_service/generates_controller.rb +++ /dev/null @@ -1,38 +0,0 @@ -# frozen_string_literal: true - -class Admin::TermsOfService::GeneratesController < Admin::BaseController - before_action :set_instance_presenter - - def show - authorize :terms_of_service, :create? - - @generator = TermsOfService::Generator.new( - domain: @instance_presenter.domain, - admin_email: @instance_presenter.contact.email - ) - end - - def create - authorize :terms_of_service, :create? - - @generator = TermsOfService::Generator.new(resource_params) - - if @generator.valid? - TermsOfService.create!(text: @generator.render) - redirect_to admin_terms_of_service_draft_path - else - render :show - end - end - - private - - def set_instance_presenter - @instance_presenter = InstancePresenter.new - end - - def resource_params - params - .expect(terms_of_service_generator: [*TermsOfService::Generator::VARIABLES]) - end -end diff --git a/app/controllers/admin/terms_of_service/histories_controller.rb b/app/controllers/admin/terms_of_service/histories_controller.rb deleted file mode 100644 index 8f12341aea..0000000000 --- a/app/controllers/admin/terms_of_service/histories_controller.rb +++ /dev/null @@ -1,8 +0,0 @@ -# frozen_string_literal: true - -class Admin::TermsOfService::HistoriesController < Admin::BaseController - def show - authorize :terms_of_service, :index? - @terms_of_service = TermsOfService.published.all - end -end diff --git a/app/controllers/admin/terms_of_service/previews_controller.rb b/app/controllers/admin/terms_of_service/previews_controller.rb deleted file mode 100644 index 0a1a966751..0000000000 --- a/app/controllers/admin/terms_of_service/previews_controller.rb +++ /dev/null @@ -1,16 +0,0 @@ -# frozen_string_literal: true - -class Admin::TermsOfService::PreviewsController < Admin::BaseController - before_action :set_terms_of_service - - def show - authorize @terms_of_service, :distribute? - @user_count = @terms_of_service.scope_for_notification.count - end - - private - - def set_terms_of_service - @terms_of_service = TermsOfService.find(params[:terms_of_service_id]) - end -end diff --git a/app/controllers/admin/terms_of_service/tests_controller.rb b/app/controllers/admin/terms_of_service/tests_controller.rb deleted file mode 100644 index e2483c1005..0000000000 --- a/app/controllers/admin/terms_of_service/tests_controller.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -class Admin::TermsOfService::TestsController < Admin::BaseController - before_action :set_terms_of_service - - def create - authorize @terms_of_service, :distribute? - UserMailer.terms_of_service_changed(current_user, @terms_of_service).deliver_later! - redirect_to admin_terms_of_service_preview_path(@terms_of_service) - end - - private - - def set_terms_of_service - @terms_of_service = TermsOfService.find(params[:terms_of_service_id]) - end -end diff --git a/app/controllers/admin/terms_of_service_controller.rb b/app/controllers/admin/terms_of_service_controller.rb deleted file mode 100644 index 10aa5c66ca..0000000000 --- a/app/controllers/admin/terms_of_service_controller.rb +++ /dev/null @@ -1,8 +0,0 @@ -# frozen_string_literal: true - -class Admin::TermsOfServiceController < Admin::BaseController - def index - authorize :terms_of_service, :index? - @terms_of_service = TermsOfService.published.first - end -end diff --git a/app/controllers/admin/trends/links/preview_card_providers_controller.rb b/app/controllers/admin/trends/links/preview_card_providers_controller.rb index 5a650d5d8c..768b79f8db 100644 --- a/app/controllers/admin/trends/links/preview_card_providers_controller.rb +++ b/app/controllers/admin/trends/links/preview_card_providers_controller.rb @@ -4,7 +4,6 @@ class Admin::Trends::Links::PreviewCardProvidersController < Admin::BaseControll def index authorize :preview_card_provider, :review? - @pending_preview_card_providers_count = PreviewCardProvider.unreviewed.async_count @preview_card_providers = filtered_preview_card_providers.page(params[:page]) @form = Trends::PreviewCardProviderBatch.new end @@ -31,8 +30,7 @@ class Admin::Trends::Links::PreviewCardProvidersController < Admin::BaseControll end def trends_preview_card_provider_batch_params - params - .expect(trends_preview_card_provider_batch: [:action, preview_card_provider_ids: []]) + params.require(:trends_preview_card_provider_batch).permit(:action, preview_card_provider_ids: []) end def action_from_button diff --git a/app/controllers/admin/trends/links_controller.rb b/app/controllers/admin/trends/links_controller.rb index 68aa73c992..83d68eba63 100644 --- a/app/controllers/admin/trends/links_controller.rb +++ b/app/controllers/admin/trends/links_controller.rb @@ -4,7 +4,7 @@ class Admin::Trends::LinksController < Admin::BaseController def index authorize :preview_card, :review? - @locales = PreviewCardTrend.locales + @locales = PreviewCardTrend.pluck('distinct language') @preview_cards = filtered_preview_cards.page(params[:page]) @form = Trends::PreviewCardBatch.new end @@ -31,8 +31,7 @@ class Admin::Trends::LinksController < Admin::BaseController end def trends_preview_card_batch_params - params - .expect(trends_preview_card_batch: [:action, preview_card_ids: []]) + params.require(:trends_preview_card_batch).permit(:action, preview_card_ids: []) end def action_from_button diff --git a/app/controllers/admin/trends/statuses_controller.rb b/app/controllers/admin/trends/statuses_controller.rb index 873d777fe3..3d8b53ea8a 100644 --- a/app/controllers/admin/trends/statuses_controller.rb +++ b/app/controllers/admin/trends/statuses_controller.rb @@ -4,7 +4,7 @@ class Admin::Trends::StatusesController < Admin::BaseController def index authorize [:admin, :status], :review? - @locales = StatusTrend.locales + @locales = StatusTrend.pluck('distinct language') @statuses = filtered_statuses.page(params[:page]) @form = Trends::StatusBatch.new end @@ -31,8 +31,7 @@ class Admin::Trends::StatusesController < Admin::BaseController end def trends_status_batch_params - params - .expect(trends_status_batch: [:action, status_ids: []]) + params.require(:trends_status_batch).permit(:action, status_ids: []) end def action_from_button diff --git a/app/controllers/admin/trends/tags_controller.rb b/app/controllers/admin/trends/tags_controller.rb index 1ccd740686..f5946448ae 100644 --- a/app/controllers/admin/trends/tags_controller.rb +++ b/app/controllers/admin/trends/tags_controller.rb @@ -4,7 +4,6 @@ class Admin::Trends::TagsController < Admin::BaseController def index authorize :tag, :review? - @pending_tags_count = Tag.pending_review.async_count @tags = filtered_tags.page(params[:page]) @form = Trends::TagBatch.new end @@ -31,8 +30,7 @@ class Admin::Trends::TagsController < Admin::BaseController end def trends_tag_batch_params - params - .expect(trends_tag_batch: [:action, tag_ids: []]) + params.require(:trends_tag_batch).permit(:action, tag_ids: []) end def action_from_button diff --git a/app/controllers/admin/users/roles_controller.rb b/app/controllers/admin/users/roles_controller.rb index e8b58de504..f5dfc643d4 100644 --- a/app/controllers/admin/users/roles_controller.rb +++ b/app/controllers/admin/users/roles_controller.rb @@ -28,8 +28,7 @@ module Admin end def resource_params - params - .expect(user: [:role_id]) + params.require(:user).permit(:role_id) end end end diff --git a/app/controllers/admin/warning_presets_controller.rb b/app/controllers/admin/warning_presets_controller.rb index dcf88294ee..efbf65b119 100644 --- a/app/controllers/admin/warning_presets_controller.rb +++ b/app/controllers/admin/warning_presets_controller.rb @@ -52,8 +52,7 @@ module Admin end def warning_preset_params - params - .expect(account_warning_preset: [:title, :text]) + params.require(:account_warning_preset).permit(:title, :text) end end end diff --git a/app/controllers/admin/webhooks_controller.rb b/app/controllers/admin/webhooks_controller.rb index 31db369637..f1aad7c4b5 100644 --- a/app/controllers/admin/webhooks_controller.rb +++ b/app/controllers/admin/webhooks_controller.rb @@ -74,8 +74,7 @@ module Admin end def resource_params - params - .expect(webhook: [:url, :template, events: []]) + params.require(:webhook).permit(:url, :template, events: []) end end end diff --git a/app/controllers/antennas_controller.rb b/app/controllers/antennas_controller.rb new file mode 100644 index 0000000000..ca7ee5d2a2 --- /dev/null +++ b/app/controllers/antennas_controller.rb @@ -0,0 +1,51 @@ +# frozen_string_literal: true + +class AntennasController < ApplicationController + layout 'admin' + + before_action :authenticate_user! + before_action :set_antenna, only: [:edit, :update, :destroy] + before_action :set_body_classes + before_action :set_cache_headers + + def index + @antennas = current_account.antennas.includes(:antenna_domains).includes(:antenna_tags).includes(:antenna_accounts) + end + + def edit; end + + def update + if @antenna.update(resource_params) + redirect_to antennas_path + else + render action: :edit + end + end + + def destroy + @antenna.destroy + redirect_to antennas_path + end + + private + + def set_antenna + @antenna = current_account.antennas.find(params[:id]) + end + + def resource_params + params.require(:antenna).permit(:title, :available, :expires_in) + end + + def thin_resource_params + params.require(:antenna).permit(:title) + end + + def set_body_classes + @body_classes = 'admin' + end + + def set_cache_headers + response.cache_control.replace(private: true, no_store: true) + end +end diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb index 06a113511c..cc4e22d27d 100644 --- a/app/controllers/api/base_controller.rb +++ b/app/controllers/api/base_controller.rb @@ -30,10 +30,10 @@ class Api::BaseController < ApplicationController protected - def limit_param(default_limit, max_limit = nil) + def limit_param(default_limit) return default_limit unless params[:limit] - [params[:limit].to_i.abs, max_limit || (default_limit * 2)].min + [params[:limit].to_i.abs, default_limit * 2].min end def params_slice(*keys) diff --git a/app/controllers/api/fasp/base_controller.rb b/app/controllers/api/fasp/base_controller.rb deleted file mode 100644 index 690f7e419a..0000000000 --- a/app/controllers/api/fasp/base_controller.rb +++ /dev/null @@ -1,81 +0,0 @@ -# frozen_string_literal: true - -class Api::Fasp::BaseController < ApplicationController - class Error < ::StandardError; end - - DIGEST_PATTERN = /sha-256=:(.*?):/ - KEYID_PATTERN = /keyid="(.*?)"/ - - attr_reader :current_provider - - skip_forgery_protection - - before_action :check_fasp_enabled - before_action :require_authentication - after_action :sign_response - - private - - def require_authentication - validate_content_digest! - validate_signature! - rescue Error, Linzer::Error, ActiveRecord::RecordNotFound => e - logger.debug("FASP Authentication error: #{e}") - authentication_error - end - - def authentication_error - respond_to do |format| - format.json { head 401 } - end - end - - def validate_content_digest! - content_digest_header = request.headers['content-digest'] - raise Error, 'content-digest missing' if content_digest_header.blank? - - digest_received = content_digest_header.match(DIGEST_PATTERN)[1] - - digest_computed = OpenSSL::Digest.base64digest('sha256', request.body&.string || '') - - raise Error, 'content-digest does not match' if digest_received != digest_computed - end - - def validate_signature! - signature_input = request.headers['signature-input']&.encode('UTF-8') - raise Error, 'signature-input is missing' if signature_input.blank? - - keyid = signature_input.match(KEYID_PATTERN)[1] - provider = Fasp::Provider.find(keyid) - linzer_request = Linzer.new_request( - request.method, - request.original_url, - {}, - { - 'content-digest' => request.headers['content-digest'], - 'signature-input' => signature_input, - 'signature' => request.headers['signature'], - } - ) - message = Linzer::Message.new(linzer_request) - key = Linzer.new_ed25519_public_key(provider.provider_public_key_pem, keyid) - signature = Linzer::Signature.build(message.headers) - Linzer.verify(key, message, signature) - @current_provider = provider - end - - def sign_response - response.headers['content-digest'] = "sha-256=:#{OpenSSL::Digest.base64digest('sha256', response.body || '')}:" - - linzer_response = Linzer.new_response(response.body, response.status, { 'content-digest' => response.headers['content-digest'] }) - message = Linzer::Message.new(linzer_response) - key = Linzer.new_ed25519_key(current_provider.server_private_key_pem) - signature = Linzer.sign(key, message, %w(@status content-digest)) - - response.headers.merge!(signature.to_h) - end - - def check_fasp_enabled - raise ActionController::RoutingError unless Mastodon::Feature.fasp_enabled? - end -end diff --git a/app/controllers/api/fasp/debug/v0/callback/responses_controller.rb b/app/controllers/api/fasp/debug/v0/callback/responses_controller.rb deleted file mode 100644 index 794e53f095..0000000000 --- a/app/controllers/api/fasp/debug/v0/callback/responses_controller.rb +++ /dev/null @@ -1,15 +0,0 @@ -# frozen_string_literal: true - -class Api::Fasp::Debug::V0::Callback::ResponsesController < Api::Fasp::BaseController - def create - Fasp::DebugCallback.create( - fasp_provider: current_provider, - ip: request.remote_ip, - request_body: request.raw_post - ) - - respond_to do |format| - format.json { head 201 } - end - end -end diff --git a/app/controllers/api/fasp/registrations_controller.rb b/app/controllers/api/fasp/registrations_controller.rb deleted file mode 100644 index fecc992fec..0000000000 --- a/app/controllers/api/fasp/registrations_controller.rb +++ /dev/null @@ -1,26 +0,0 @@ -# frozen_string_literal: true - -class Api::Fasp::RegistrationsController < Api::Fasp::BaseController - skip_before_action :require_authentication - - def create - @current_provider = Fasp::Provider.create!( - name: params[:name], - base_url: params[:baseUrl], - remote_identifier: params[:serverId], - provider_public_key_base64: params[:publicKey] - ) - - render json: registration_confirmation - end - - private - - def registration_confirmation - { - faspId: current_provider.id.to_s, - publicKey: current_provider.server_public_key_base64, - registrationCompletionUri: new_admin_fasp_provider_registration_url(current_provider), - } - end -end diff --git a/app/controllers/api/oembed_controller.rb b/app/controllers/api/oembed_controller.rb index b7f22824a7..66da65beda 100644 --- a/app/controllers/api/oembed_controller.rb +++ b/app/controllers/api/oembed_controller.rb @@ -7,7 +7,7 @@ class Api::OEmbedController < Api::BaseController before_action :require_public_status! def show - render json: @status, serializer: OEmbedSerializer, width: params[:maxwidth], height: params[:maxheight] + render json: @status, serializer: OEmbedSerializer, width: maxwidth_or_default, height: maxheight_or_default end private @@ -23,4 +23,12 @@ class Api::OEmbedController < Api::BaseController def status_finder StatusFinder.new(params[:url]) end + + def maxwidth_or_default + (params[:maxwidth].presence || 400).to_i + end + + def maxheight_or_default + params[:maxheight].present? ? params[:maxheight].to_i : nil + end end diff --git a/app/controllers/api/v1/accounts/credentials_controller.rb b/app/controllers/api/v1/accounts/credentials_controller.rb index bdd7732b87..a0c6d24df6 100644 --- a/app/controllers/api/v1/accounts/credentials_controller.rb +++ b/app/controllers/api/v1/accounts/credentials_controller.rb @@ -14,7 +14,7 @@ class Api::V1::Accounts::CredentialsController < Api::BaseController @account = current_account UpdateAccountService.new.call(@account, account_params, raise_error: true) current_user.update(user_params) if user_params - ActivityPub::UpdateDistributionWorker.perform_in(ActivityPub::UpdateDistributionWorker::DEBOUNCE_DELAY, @account.id) + ActivityPub::UpdateDistributionWorker.perform_async(@account.id) render json: @account, serializer: REST::CredentialAccountSerializer rescue ActiveRecord::RecordInvalid => e render json: ValidationErrorFormatter.new(e).as_json, status: 422 @@ -32,9 +32,9 @@ class Api::V1::Accounts::CredentialsController < Api::BaseController :bot, :discoverable, :searchability, + :dissubscribable, :hide_collections, :indexable, - attribution_domains: [], fields_attributes: [:name, :value] ) end diff --git a/app/controllers/api/v1/accounts/endorsements_controller.rb b/app/controllers/api/v1/accounts/endorsements_controller.rb deleted file mode 100644 index 1e21994a90..0000000000 --- a/app/controllers/api/v1/accounts/endorsements_controller.rb +++ /dev/null @@ -1,66 +0,0 @@ -# frozen_string_literal: true - -class Api::V1::Accounts::EndorsementsController < Api::BaseController - include Authorization - - before_action -> { authorize_if_got_token! :read, :'read:accounts' }, only: :index - before_action -> { doorkeeper_authorize! :write, :'write:accounts' }, except: :index - before_action :require_user!, except: :index - before_action :set_account - before_action :set_endorsed_accounts, only: :index - after_action :insert_pagination_headers, only: :index - - def index - cache_if_unauthenticated! - render json: @endorsed_accounts, each_serializer: REST::AccountSerializer - end - - def create - AccountPin.find_or_create_by!(account: current_account, target_account: @account) - render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships_presenter - end - - def destroy - pin = AccountPin.find_by(account: current_account, target_account: @account) - pin&.destroy! - render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships_presenter - end - - private - - def set_account - @account = Account.find(params[:account_id]) - end - - def set_endorsed_accounts - @endorsed_accounts = @account.unavailable? ? [] : paginated_endorsed_accounts - end - - def paginated_endorsed_accounts - @account.endorsed_accounts.without_suspended.includes(:account_stat, :user).paginate_by_max_id( - limit_param(DEFAULT_ACCOUNTS_LIMIT), - params[:max_id], - params[:since_id] - ) - end - - def relationships_presenter - AccountRelationshipsPresenter.new([@account], current_user.account_id) - end - - def next_path - api_v1_account_endorsements_url pagination_params(max_id: pagination_max_id) if records_continue? - end - - def prev_path - api_v1_account_endorsements_url pagination_params(since_id: pagination_since_id) unless @endorsed_accounts.empty? - end - - def pagination_collection - @endorsed_accounts - end - - def records_continue? - @endorsed_accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT) - end -end diff --git a/app/controllers/api/v1/accounts/exclude_antennas_controller.rb b/app/controllers/api/v1/accounts/exclude_antennas_controller.rb index 65d75dbc6e..c1f5c5981c 100644 --- a/app/controllers/api/v1/accounts/exclude_antennas_controller.rb +++ b/app/controllers/api/v1/accounts/exclude_antennas_controller.rb @@ -6,7 +6,7 @@ class Api::V1::Accounts::ExcludeAntennasController < Api::BaseController before_action :set_account def index - @antennas = @account.suspended? ? [] : current_account.antennas.where("exclude_accounts @> '#{@account.id}'") + @antennas = @account.suspended? ? [] : current_account.antennas.where('exclude_accounts @> \'[?]\'', @account.id) render json: @antennas, each_serializer: REST::AntennaSerializer end diff --git a/app/controllers/api/v1/accounts/familiar_followers_controller.rb b/app/controllers/api/v1/accounts/familiar_followers_controller.rb index 81f0a9ed0f..a49eb2eb27 100644 --- a/app/controllers/api/v1/accounts/familiar_followers_controller.rb +++ b/app/controllers/api/v1/accounts/familiar_followers_controller.rb @@ -12,7 +12,7 @@ class Api::V1::Accounts::FamiliarFollowersController < Api::BaseController private def set_accounts - @accounts = Account.without_suspended.where(id: account_ids).select(:id, :hide_collections) + @accounts = Account.without_suspended.where(id: account_ids).select('id, hide_collections') end def familiar_followers diff --git a/app/controllers/api/v1/accounts/featured_tags_controller.rb b/app/controllers/api/v1/accounts/featured_tags_controller.rb index f95846366c..0101fb469b 100644 --- a/app/controllers/api/v1/accounts/featured_tags_controller.rb +++ b/app/controllers/api/v1/accounts/featured_tags_controller.rb @@ -17,6 +17,6 @@ class Api::V1::Accounts::FeaturedTagsController < Api::BaseController end def set_featured_tags - @featured_tags = @account.unavailable? ? [] : @account.featured_tags + @featured_tags = @account.suspended? ? [] : @account.featured_tags end end diff --git a/app/controllers/api/v1/accounts/identity_proofs_controller.rb b/app/controllers/api/v1/accounts/identity_proofs_controller.rb index 02a45e8758..48f293f47a 100644 --- a/app/controllers/api/v1/accounts/identity_proofs_controller.rb +++ b/app/controllers/api/v1/accounts/identity_proofs_controller.rb @@ -1,10 +1,6 @@ # frozen_string_literal: true class Api::V1::Accounts::IdentityProofsController < Api::BaseController - include DeprecationConcern - - deprecate_api '2022-03-30' - before_action :require_user! before_action :set_account diff --git a/app/controllers/api/v1/accounts/pins_controller.rb b/app/controllers/api/v1/accounts/pins_controller.rb new file mode 100644 index 0000000000..0eb13c048c --- /dev/null +++ b/app/controllers/api/v1/accounts/pins_controller.rb @@ -0,0 +1,30 @@ +# frozen_string_literal: true + +class Api::V1::Accounts::PinsController < Api::BaseController + include Authorization + + before_action -> { doorkeeper_authorize! :write, :'write:accounts' } + before_action :require_user! + before_action :set_account + + def create + AccountPin.find_or_create_by!(account: current_account, target_account: @account) + render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships_presenter + end + + def destroy + pin = AccountPin.find_by(account: current_account, target_account: @account) + pin&.destroy! + render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships_presenter + end + + private + + def set_account + @account = Account.find(params[:account_id]) + end + + def relationships_presenter + AccountRelationshipsPresenter.new([@account], current_user.account_id) + end +end diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb index 46838aeb66..6e55236c42 100644 --- a/app/controllers/api/v1/accounts_controller.rb +++ b/app/controllers/api/v1/accounts_controller.rb @@ -16,7 +16,6 @@ class Api::V1::AccountsController < Api::BaseController before_action :check_account_confirmation, except: [:index, :create] before_action :check_enabled_registrations, only: [:create] before_action :check_accounts_limit, only: [:index] - before_action :check_following_self, only: [:follow] skip_before_action :require_authenticated_user!, only: :create @@ -107,12 +106,8 @@ class Api::V1::AccountsController < Api::BaseController raise(Mastodon::ValidationError) if account_ids.size > DEFAULT_ACCOUNTS_LIMIT end - def check_following_self - render json: { error: I18n.t('accounts.self_follow_error') }, status: 403 if current_user.account.id == @account.id - end - - def relationships(**) - AccountRelationshipsPresenter.new([@account], current_user.account_id, **) + def relationships(**options) + AccountRelationshipsPresenter.new([@account], current_user.account_id, **options) end def account_ids @@ -124,7 +119,7 @@ class Api::V1::AccountsController < Api::BaseController end def account_params - params.permit(:username, :email, :password, :agreement, :locale, :reason, :time_zone, :invite_code, :date_of_birth) + params.permit(:username, :email, :password, :agreement, :locale, :reason, :time_zone, :invite_code) end def invite diff --git a/app/controllers/api/v1/admin/domain_allows_controller.rb b/app/controllers/api/v1/admin/domain_allows_controller.rb index 24f68aa1bd..9801d832b8 100644 --- a/app/controllers/api/v1/admin/domain_allows_controller.rb +++ b/app/controllers/api/v1/admin/domain_allows_controller.rb @@ -5,7 +5,6 @@ class Api::V1::Admin::DomainAllowsController < Api::BaseController include AccountableConcern LIMIT = 100 - MAX_LIMIT = 500 before_action -> { authorize_if_got_token! :'admin:read', :'admin:read:domain_allows' }, only: [:index, :show] before_action -> { authorize_if_got_token! :'admin:write', :'admin:write:domain_allows' }, except: [:index, :show] @@ -48,13 +47,18 @@ class Api::V1::Admin::DomainAllowsController < Api::BaseController private def set_domain_allows - @domain_allows = DomainAllow.order(id: :desc).to_a_paginated_by_id(limit_param(LIMIT, MAX_LIMIT), params_slice(:max_id, :since_id, :min_id)) + @domain_allows = filtered_domain_allows.order(id: :desc).to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id)) end def set_domain_allow @domain_allow = DomainAllow.find(params[:id]) end + def filtered_domain_allows + # TODO: no filtering yet + DomainAllow.all + end + def next_path api_v1_admin_domain_allows_url(pagination_params(max_id: pagination_max_id)) if records_continue? end @@ -68,7 +72,7 @@ class Api::V1::Admin::DomainAllowsController < Api::BaseController end def records_continue? - @domain_allows.size == limit_param(LIMIT, MAX_LIMIT) + @domain_allows.size == limit_param(LIMIT) end def resource_params diff --git a/app/controllers/api/v1/admin/domain_blocks_controller.rb b/app/controllers/api/v1/admin/domain_blocks_controller.rb index d84c4a8695..61a923eccb 100644 --- a/app/controllers/api/v1/admin/domain_blocks_controller.rb +++ b/app/controllers/api/v1/admin/domain_blocks_controller.rb @@ -5,7 +5,6 @@ class Api::V1::Admin::DomainBlocksController < Api::BaseController include AccountableConcern LIMIT = 100 - MAX_LIMIT = 500 before_action -> { authorize_if_got_token! :'admin:read', :'admin:read:domain_blocks' }, only: [:index, :show] before_action -> { authorize_if_got_token! :'admin:write', :'admin:write:domain_blocks' }, except: [:index, :show] @@ -60,13 +59,18 @@ class Api::V1::Admin::DomainBlocksController < Api::BaseController end def set_domain_blocks - @domain_blocks = DomainBlock.order(id: :desc).to_a_paginated_by_id(limit_param(LIMIT, MAX_LIMIT), params_slice(:max_id, :since_id, :min_id)) + @domain_blocks = filtered_domain_blocks.order(id: :desc).to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id)) end def set_domain_block @domain_block = DomainBlock.find(params[:id]) end + def filtered_domain_blocks + # TODO: no filtering yet + DomainBlock.all + end + def domain_block_params params.permit(:severity, :reject_media, :reject_favourite, :reject_reply_exclude_followers, :reject_reports, :reject_send_sensitive, :reject_hashtag, :reject_straight_follow, :reject_new_follow, :reject_friend, :block_trends, :detect_invalid_subscription, :private_comment, :public_comment, :obfuscate, :hidden) @@ -85,7 +89,7 @@ class Api::V1::Admin::DomainBlocksController < Api::BaseController end def records_continue? - @domain_blocks.size == limit_param(LIMIT, MAX_LIMIT) + @domain_blocks.size == limit_param(LIMIT) end def resource_params diff --git a/app/controllers/api/v1/annual_reports_controller.rb b/app/controllers/api/v1/annual_reports_controller.rb index b1aee288dd..9bc8e68ac2 100644 --- a/app/controllers/api/v1/annual_reports_controller.rb +++ b/app/controllers/api/v1/annual_reports_controller.rb @@ -17,17 +17,6 @@ class Api::V1::AnnualReportsController < Api::BaseController relationships: @relationships end - def show - with_read_replica do - @presenter = AnnualReportsPresenter.new([@annual_report]) - @relationships = StatusRelationshipsPresenter.new(@presenter.statuses, current_account.id) - end - - render json: @presenter, - serializer: REST::AnnualReportsSerializer, - relationships: @relationships - end - def read @annual_report.view! render_empty diff --git a/app/controllers/api/v1/antennas_controller.rb b/app/controllers/api/v1/antennas_controller.rb index 4040263c00..37bfb7f552 100644 --- a/app/controllers/api/v1/antennas_controller.rb +++ b/app/controllers/api/v1/antennas_controller.rb @@ -21,7 +21,7 @@ class Api::V1::AntennasController < Api::BaseController end def create - @antenna = Antenna.create!(antenna_params.merge(account: current_account)) + @antenna = Antenna.create!(antenna_params.merge(account: current_account, list_id: 0)) render json: @antenna, serializer: REST::AntennaSerializer end @@ -42,6 +42,6 @@ class Api::V1::AntennasController < Api::BaseController end def antenna_params - params.permit(:title, :list_id, :insert_feeds, :stl, :ltl, :with_media_only, :ignore_reblog, :favourite) + params.permit(:title, :list_id, :insert_feeds, :stl, :ltl, :with_media_only, :ignore_reblog) end end diff --git a/app/controllers/api/v1/crypto/deliveries_controller.rb b/app/controllers/api/v1/crypto/deliveries_controller.rb new file mode 100644 index 0000000000..aa9df6e03b --- /dev/null +++ b/app/controllers/api/v1/crypto/deliveries_controller.rb @@ -0,0 +1,30 @@ +# frozen_string_literal: true + +class Api::V1::Crypto::DeliveriesController < Api::BaseController + before_action -> { doorkeeper_authorize! :crypto } + before_action :require_user! + before_action :set_current_device + + def create + devices.each do |device_params| + DeliverToDeviceService.new.call(current_account, @current_device, device_params) + end + + render_empty + end + + private + + def set_current_device + @current_device = Device.find_by!(access_token: doorkeeper_token) + end + + def resource_params + params.require(:device) + params.permit(device: [:account_id, :device_id, :type, :body, :hmac]) + end + + def devices + Array(resource_params[:device]) + end +end diff --git a/app/controllers/api/v1/crypto/encrypted_messages_controller.rb b/app/controllers/api/v1/crypto/encrypted_messages_controller.rb new file mode 100644 index 0000000000..93ae0e7771 --- /dev/null +++ b/app/controllers/api/v1/crypto/encrypted_messages_controller.rb @@ -0,0 +1,47 @@ +# frozen_string_literal: true + +class Api::V1::Crypto::EncryptedMessagesController < Api::BaseController + LIMIT = 80 + + before_action -> { doorkeeper_authorize! :crypto } + before_action :require_user! + before_action :set_current_device + + before_action :set_encrypted_messages, only: :index + after_action :insert_pagination_headers, only: :index + + def index + render json: @encrypted_messages, each_serializer: REST::EncryptedMessageSerializer + end + + def clear + @current_device.encrypted_messages.up_to(params[:up_to_id]).delete_all + render_empty + end + + private + + def set_current_device + @current_device = Device.find_by!(access_token: doorkeeper_token) + end + + def set_encrypted_messages + @encrypted_messages = @current_device.encrypted_messages.to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id)) + end + + def next_path + api_v1_crypto_encrypted_messages_url pagination_params(max_id: pagination_max_id) if records_continue? + end + + def prev_path + api_v1_crypto_encrypted_messages_url pagination_params(min_id: pagination_since_id) unless @encrypted_messages.empty? + end + + def pagination_collection + @encrypted_messages + end + + def records_continue? + @encrypted_messages.size == limit_param(LIMIT) + end +end diff --git a/app/controllers/api/v1/crypto/keys/claims_controller.rb b/app/controllers/api/v1/crypto/keys/claims_controller.rb new file mode 100644 index 0000000000..f9d202d67b --- /dev/null +++ b/app/controllers/api/v1/crypto/keys/claims_controller.rb @@ -0,0 +1,25 @@ +# frozen_string_literal: true + +class Api::V1::Crypto::Keys::ClaimsController < Api::BaseController + before_action -> { doorkeeper_authorize! :crypto } + before_action :require_user! + before_action :set_claim_results + + def create + render json: @claim_results, each_serializer: REST::Keys::ClaimResultSerializer + end + + private + + def set_claim_results + @claim_results = devices.filter_map { |device_params| ::Keys::ClaimService.new.call(current_account, device_params[:account_id], device_params[:device_id]) } + end + + def resource_params + params.permit(device: [:account_id, :device_id]) + end + + def devices + Array(resource_params[:device]) + end +end diff --git a/app/controllers/api/v1/crypto/keys/counts_controller.rb b/app/controllers/api/v1/crypto/keys/counts_controller.rb new file mode 100644 index 0000000000..ffd7151b78 --- /dev/null +++ b/app/controllers/api/v1/crypto/keys/counts_controller.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +class Api::V1::Crypto::Keys::CountsController < Api::BaseController + before_action -> { doorkeeper_authorize! :crypto } + before_action :require_user! + before_action :set_current_device + + def show + render json: { one_time_keys: @current_device.one_time_keys.count } + end + + private + + def set_current_device + @current_device = Device.find_by!(access_token: doorkeeper_token) + end +end diff --git a/app/controllers/api/v1/crypto/keys/queries_controller.rb b/app/controllers/api/v1/crypto/keys/queries_controller.rb new file mode 100644 index 0000000000..e6ce9f9192 --- /dev/null +++ b/app/controllers/api/v1/crypto/keys/queries_controller.rb @@ -0,0 +1,26 @@ +# frozen_string_literal: true + +class Api::V1::Crypto::Keys::QueriesController < Api::BaseController + before_action -> { doorkeeper_authorize! :crypto } + before_action :require_user! + before_action :set_accounts + before_action :set_query_results + + def create + render json: @query_results, each_serializer: REST::Keys::QueryResultSerializer + end + + private + + def set_accounts + @accounts = Account.where(id: account_ids).includes(:devices) + end + + def set_query_results + @query_results = @accounts.filter_map { |account| ::Keys::QueryService.new.call(account) } + end + + def account_ids + Array(params[:id]).map(&:to_i) + end +end diff --git a/app/controllers/api/v1/crypto/keys/uploads_controller.rb b/app/controllers/api/v1/crypto/keys/uploads_controller.rb new file mode 100644 index 0000000000..fc4abf63b3 --- /dev/null +++ b/app/controllers/api/v1/crypto/keys/uploads_controller.rb @@ -0,0 +1,29 @@ +# frozen_string_literal: true + +class Api::V1::Crypto::Keys::UploadsController < Api::BaseController + before_action -> { doorkeeper_authorize! :crypto } + before_action :require_user! + + def create + device = Device.find_or_initialize_by(access_token: doorkeeper_token) + + device.transaction do + device.account = current_account + device.update!(resource_params[:device]) + + if resource_params[:one_time_keys].present? && resource_params[:one_time_keys].is_a?(Enumerable) + resource_params[:one_time_keys].each do |one_time_key_params| + device.one_time_keys.create!(one_time_key_params) + end + end + end + + render json: device, serializer: REST::Keys::DeviceSerializer + end + + private + + def resource_params + params.permit(device: [:device_id, :name, :fingerprint_key, :identity_key], one_time_keys: [:key_id, :key, :signature]) + end +end diff --git a/app/controllers/api/v1/domain_blocks/previews_controller.rb b/app/controllers/api/v1/domain_blocks/previews_controller.rb deleted file mode 100644 index a917bddd98..0000000000 --- a/app/controllers/api/v1/domain_blocks/previews_controller.rb +++ /dev/null @@ -1,27 +0,0 @@ -# frozen_string_literal: true - -class Api::V1::DomainBlocks::PreviewsController < Api::BaseController - before_action -> { doorkeeper_authorize! :follow, :write, :'write:blocks' } - before_action :require_user! - before_action :set_domain - before_action :set_domain_block_preview - - def show - render json: @domain_block_preview, serializer: REST::DomainBlockPreviewSerializer - end - - private - - def set_domain - @domain = TagManager.instance.normalize_domain(params[:domain]) - end - - def set_domain_block_preview - @domain_block_preview = with_read_replica do - DomainBlockPreviewPresenter.new( - following_count: current_account.following.where(domain: @domain).count, - followers_count: current_account.followers.where(domain: @domain).count - ) - end - end -end diff --git a/app/controllers/api/v1/featured_tags/suggestions_controller.rb b/app/controllers/api/v1/featured_tags/suggestions_controller.rb index d533b1af7b..9c72e4380d 100644 --- a/app/controllers/api/v1/featured_tags/suggestions_controller.rb +++ b/app/controllers/api/v1/featured_tags/suggestions_controller.rb @@ -5,8 +5,6 @@ class Api::V1::FeaturedTags::SuggestionsController < Api::BaseController before_action :require_user! before_action :set_recently_used_tags, only: :index - RECENT_TAGS_LIMIT = 10 - def index render json: @recently_used_tags, each_serializer: REST::TagSerializer, relationships: TagRelationshipsPresenter.new(@recently_used_tags, current_user&.account_id) end @@ -14,6 +12,6 @@ class Api::V1::FeaturedTags::SuggestionsController < Api::BaseController private def set_recently_used_tags - @recently_used_tags = Tag.suggestions_for_account(current_account).limit(RECENT_TAGS_LIMIT) + @recently_used_tags = Tag.suggestions_for_account(current_account).limit(10) end end diff --git a/app/controllers/api/v1/filters_controller.rb b/app/controllers/api/v1/filters_controller.rb index f8d91c5f7f..4345b61ac7 100644 --- a/app/controllers/api/v1/filters_controller.rb +++ b/app/controllers/api/v1/filters_controller.rb @@ -1,10 +1,6 @@ # frozen_string_literal: true class Api::V1::FiltersController < Api::BaseController - include DeprecationConcern - - deprecate_api '2022-11-14' - before_action -> { doorkeeper_authorize! :read, :'read:filters' }, only: [:index, :show] before_action -> { doorkeeper_authorize! :write, :'write:filters' }, except: [:index, :show] before_action :require_user! @@ -56,11 +52,11 @@ class Api::V1::FiltersController < Api::BaseController end def resource_params - params.permit(:phrase, :expires_in, :irreversible, :exclude_follows, :exclude_localusers, :with_quote, :with_profile, :whole_word, context: []) + params.permit(:phrase, :expires_in, :irreversible, :exclude_follows, :exclude_localusers, :with_quote, :whole_word, context: []) end def filter_params - resource_params.slice(:phrase, :expires_in, :irreversible, :exclude_follows, :exclude_localusers, :with_quote, :with_profile, :context) + resource_params.slice(:phrase, :expires_in, :irreversible, :exclude_follows, :exclude_localusers, :with_quote, :context) end def keyword_params diff --git a/app/controllers/api/v1/follow_requests_controller.rb b/app/controllers/api/v1/follow_requests_controller.rb index 4b44cfe531..29a09fceef 100644 --- a/app/controllers/api/v1/follow_requests_controller.rb +++ b/app/controllers/api/v1/follow_requests_controller.rb @@ -28,8 +28,8 @@ class Api::V1::FollowRequestsController < Api::BaseController @account ||= Account.find(params[:id]) end - def relationships(**) - AccountRelationshipsPresenter.new([account], current_user.account_id, **) + def relationships(**options) + AccountRelationshipsPresenter.new([account], current_user.account_id, **options) end def load_accounts diff --git a/app/controllers/api/v1/instances/domain_blocks_controller.rb b/app/controllers/api/v1/instances/domain_blocks_controller.rb index bf96fbaaa8..7ec94312f4 100644 --- a/app/controllers/api/v1/instances/domain_blocks_controller.rb +++ b/app/controllers/api/v1/instances/domain_blocks_controller.rb @@ -31,7 +31,7 @@ class Api::V1::Instances::DomainBlocksController < Api::V1::Instances::BaseContr end def show_domain_blocks_to_user? - Setting.show_domain_blocks == 'users' && user_signed_in? && current_user.functional_or_moved? + Setting.show_domain_blocks == 'users' && user_signed_in? end def set_domain_blocks @@ -47,6 +47,6 @@ class Api::V1::Instances::DomainBlocksController < Api::V1::Instances::BaseContr end def show_rationale_for_user? - Setting.show_domain_blocks_rationale == 'users' && user_signed_in? && current_user.functional_or_moved? + Setting.show_domain_blocks_rationale == 'users' && user_signed_in? end end diff --git a/app/controllers/api/v1/instances/terms_of_services_controller.rb b/app/controllers/api/v1/instances/terms_of_services_controller.rb deleted file mode 100644 index 0a861dd7bb..0000000000 --- a/app/controllers/api/v1/instances/terms_of_services_controller.rb +++ /dev/null @@ -1,22 +0,0 @@ -# frozen_string_literal: true - -class Api::V1::Instances::TermsOfServicesController < Api::V1::Instances::BaseController - before_action :set_terms_of_service - - def show - cache_even_if_authenticated! - render json: @terms_of_service, serializer: REST::TermsOfServiceSerializer - end - - private - - def set_terms_of_service - @terms_of_service = begin - if params[:date].present? - TermsOfService.published.find_by!(effective_date: params[:date]) - else - TermsOfService.live.first || TermsOfService.published.first! # For the case when none of the published terms have become effective yet - end - end - end -end diff --git a/app/controllers/api/v1/instances_controller.rb b/app/controllers/api/v1/instances_controller.rb index e01267c000..49da75ed28 100644 --- a/app/controllers/api/v1/instances_controller.rb +++ b/app/controllers/api/v1/instances_controller.rb @@ -1,9 +1,15 @@ # frozen_string_literal: true -class Api::V1::InstancesController < Api::V2::InstancesController - include DeprecationConcern +class Api::V1::InstancesController < Api::BaseController + skip_before_action :require_authenticated_user!, unless: :limited_federation_mode? + skip_around_action :set_locale - deprecate_api '2022-11-14' + vary_by '' + + # Override `current_user` to avoid reading session cookies unless in limited federation mode + def current_user + super if limited_federation_mode? + end def show cache_even_if_authenticated! diff --git a/app/controllers/api/v1/lists/accounts_controller.rb b/app/controllers/api/v1/lists/accounts_controller.rb index 616159f05f..b1c0e609d0 100644 --- a/app/controllers/api/v1/lists/accounts_controller.rb +++ b/app/controllers/api/v1/lists/accounts_controller.rb @@ -15,12 +15,17 @@ class Api::V1::Lists::AccountsController < Api::BaseController end def create - AddAccountsToListService.new.call(@list, Account.find(account_ids)) + ApplicationRecord.transaction do + list_accounts.each do |account| + @list.accounts << account + end + end + render_empty end def destroy - RemoveAccountsFromListService.new.call(@list, Account.where(id: account_ids)) + ListAccount.where(list: @list, account_id: account_ids).destroy_all render_empty end @@ -38,6 +43,10 @@ class Api::V1::Lists::AccountsController < Api::BaseController end end + def list_accounts + Account.find(account_ids) + end + def account_ids Array(resource_params[:account_ids]) end diff --git a/app/controllers/api/v1/lists_controller.rb b/app/controllers/api/v1/lists_controller.rb index b019ab6018..0bacd7fdb0 100644 --- a/app/controllers/api/v1/lists_controller.rb +++ b/app/controllers/api/v1/lists_controller.rb @@ -7,6 +7,10 @@ class Api::V1::ListsController < Api::BaseController before_action :require_user! before_action :set_list, except: [:index, :create] + rescue_from ArgumentError do |e| + render json: { error: e.to_s }, status: 422 + end + def index @lists = List.where(account: current_account).all render json: @lists, each_serializer: REST::ListSerializer @@ -34,16 +38,6 @@ class Api::V1::ListsController < Api::BaseController render_empty end - def favourite - @list.favourite! - render json: @list, serializer: REST::ListSerializer - end - - def unfavourite - @list.unfavourite! - render json: @list, serializer: REST::ListSerializer - end - private def set_list @@ -51,6 +45,6 @@ class Api::V1::ListsController < Api::BaseController end def list_params - params.permit(:title, :replies_policy, :exclusive, :notify, :favourite) + params.permit(:title, :replies_policy, :exclusive, :notify) end end diff --git a/app/controllers/api/v1/media_controller.rb b/app/controllers/api/v1/media_controller.rb index c427e055ea..5ea26d55bd 100644 --- a/app/controllers/api/v1/media_controller.rb +++ b/app/controllers/api/v1/media_controller.rb @@ -3,8 +3,8 @@ class Api::V1::MediaController < Api::BaseController before_action -> { doorkeeper_authorize! :write, :'write:media' } before_action :require_user! - before_action :set_media_attachment, except: [:create, :destroy] - before_action :check_processing, except: [:create, :destroy] + before_action :set_media_attachment, except: [:create] + before_action :check_processing, except: [:create] def show render json: @media_attachment, serializer: REST::MediaAttachmentSerializer, status: status_code_for_media_attachment @@ -25,15 +25,6 @@ class Api::V1::MediaController < Api::BaseController render json: @media_attachment, serializer: REST::MediaAttachmentSerializer, status: status_code_for_media_attachment end - def destroy - @media_attachment = current_account.media_attachments.find(params[:id]) - - return render json: in_usage_error, status: 422 unless @media_attachment.status_id.nil? - - @media_attachment.destroy - render_empty - end - private def status_code_for_media_attachment @@ -63,8 +54,4 @@ class Api::V1::MediaController < Api::BaseController def processing_error { error: 'Error processing thumbnail for uploaded media' } end - - def in_usage_error - { error: 'Media attachment is currently used by a status' } - end end diff --git a/app/controllers/api/v1/notifications/policies_controller.rb b/app/controllers/api/v1/notifications/policies_controller.rb index 9d70c283be..1ec336f9a5 100644 --- a/app/controllers/api/v1/notifications/policies_controller.rb +++ b/app/controllers/api/v1/notifications/policies_controller.rb @@ -8,12 +8,12 @@ class Api::V1::Notifications::PoliciesController < Api::BaseController before_action :set_policy def show - render json: @policy, serializer: REST::V1::NotificationPolicySerializer + render json: @policy, serializer: REST::NotificationPolicySerializer end def update @policy.update!(resource_params) - render json: @policy, serializer: REST::V1::NotificationPolicySerializer + render json: @policy, serializer: REST::NotificationPolicySerializer end private diff --git a/app/controllers/api/v1/notifications/requests_controller.rb b/app/controllers/api/v1/notifications/requests_controller.rb index 3c90f13ce2..0e58379a38 100644 --- a/app/controllers/api/v1/notifications/requests_controller.rb +++ b/app/controllers/api/v1/notifications/requests_controller.rb @@ -1,14 +1,11 @@ # frozen_string_literal: true class Api::V1::Notifications::RequestsController < Api::BaseController - include Redisable - - before_action -> { doorkeeper_authorize! :read, :'read:notifications' }, only: [:index, :show, :merged?] - before_action -> { doorkeeper_authorize! :write, :'write:notifications' }, except: [:index, :show, :merged?] + before_action -> { doorkeeper_authorize! :read, :'read:notifications' }, only: :index + before_action -> { doorkeeper_authorize! :write, :'write:notifications' }, except: :index before_action :require_user! - before_action :set_request, only: [:show, :accept, :dismiss] - before_action :set_requests, only: [:accept_bulk, :dismiss_bulk] + before_action :set_request, except: :index after_action :insert_pagination_headers, only: :index @@ -21,10 +18,6 @@ class Api::V1::Notifications::RequestsController < Api::BaseController render json: @requests, each_serializer: REST::NotificationRequestSerializer, relationships: @relationships end - def merged? - render json: { merged: redis.get("notification_unfilter_jobs:#{current_account.id}").to_i <= 0 } - end - def show render json: @request, serializer: REST::NotificationRequestSerializer end @@ -35,24 +28,14 @@ class Api::V1::Notifications::RequestsController < Api::BaseController end def dismiss - DismissNotificationRequestService.new.call(@request) - render_empty - end - - def accept_bulk - @requests.each { |request| AcceptNotificationRequestService.new.call(request) } - render_empty - end - - def dismiss_bulk - @requests.each(&:destroy!) + @request.update!(dismissed: true) render_empty end private def load_requests - requests = NotificationRequest.where(account: current_account).without_suspended.includes(:last_status, from_account: [:account_stat, :user]).to_a_paginated_by_id( + requests = NotificationRequest.where(account: current_account).where(dismissed: truthy_param?(:dismissed) || false).includes(:last_status, from_account: [:account_stat, :user]).to_a_paginated_by_id( limit_param(DEFAULT_ACCOUNTS_LIMIT), params_slice(:max_id, :since_id, :min_id) ) @@ -70,22 +53,14 @@ class Api::V1::Notifications::RequestsController < Api::BaseController @request = NotificationRequest.where(account: current_account).find(params[:id]) end - def set_requests - @requests = NotificationRequest.where(account: current_account, id: Array(params[:id]).uniq.map(&:to_i)) - end - def next_path - api_v1_notifications_requests_url pagination_params(max_id: pagination_max_id) if records_continue? + api_v1_notifications_requests_url pagination_params(max_id: pagination_max_id) unless @requests.empty? end def prev_path api_v1_notifications_requests_url pagination_params(min_id: pagination_since_id) unless @requests.empty? end - def records_continue? - @requests.size == limit_param(DEFAULT_ACCOUNTS_LIMIT) - end - def pagination_max_id @requests.last.id end @@ -93,4 +68,8 @@ class Api::V1::Notifications::RequestsController < Api::BaseController def pagination_since_id @requests.first.id end + + def pagination_params(core_params) + params.slice(:dismissed).permit(:dismissed).merge(core_params) + end end diff --git a/app/controllers/api/v1/notifications_controller.rb b/app/controllers/api/v1/notifications_controller.rb index 13919b400d..1d0aa10d2e 100644 --- a/app/controllers/api/v1/notifications_controller.rb +++ b/app/controllers/api/v1/notifications_controller.rb @@ -7,8 +7,6 @@ class Api::V1::NotificationsController < Api::BaseController after_action :insert_pagination_headers, only: :index DEFAULT_NOTIFICATIONS_LIMIT = 40 - DEFAULT_NOTIFICATIONS_COUNT_LIMIT = 100 - MAX_NOTIFICATIONS_COUNT_LIMIT = 1_000 def index with_read_replica do @@ -19,14 +17,6 @@ class Api::V1::NotificationsController < Api::BaseController render json: @notifications, each_serializer: REST::NotificationSerializer, relationships: @relationships end - def unread_count - limit = limit_param(DEFAULT_NOTIFICATIONS_COUNT_LIMIT, MAX_NOTIFICATIONS_COUNT_LIMIT) - - with_read_replica do - render json: { count: browserable_account_notifications.paginate_by_min_id(limit, notification_marker&.last_read_id).count } - end - end - def show @notification = current_account.notifications.without_suspended.find(params[:id]) render json: @notification, serializer: REST::NotificationSerializer @@ -64,10 +54,6 @@ class Api::V1::NotificationsController < Api::BaseController ) end - def notification_marker - current_user.markers.find_by(timeline: 'notifications') - end - def target_statuses_from_notifications @notifications.reject { |notification| notification.target_status.nil? }.map(&:target_status) end diff --git a/app/controllers/api/v1/peers/search_controller.rb b/app/controllers/api/v1/peers/search_controller.rb index d9c8232702..1780554c5d 100644 --- a/app/controllers/api/v1/peers/search_controller.rb +++ b/app/controllers/api/v1/peers/search_controller.rb @@ -7,8 +7,6 @@ class Api::V1::Peers::SearchController < Api::BaseController skip_before_action :require_authenticated_user!, unless: :limited_federation_mode? skip_around_action :set_locale - LIMIT = 10 - vary_by '' def index @@ -37,10 +35,10 @@ class Api::V1::Peers::SearchController < Api::BaseController field: 'accounts_count', modifier: 'log2p', }, - }).limit(LIMIT).pluck(:domain) + }).limit(10).pluck(:domain) else domain = normalized_domain - @domains = Instance.searchable.domain_starts_with(domain).limit(LIMIT).pluck(:domain) + @domains = Instance.searchable.domain_starts_with(domain).limit(10).pluck(:domain) end rescue Addressable::URI::InvalidURIError @domains = [] diff --git a/app/controllers/api/v1/polls/votes_controller.rb b/app/controllers/api/v1/polls/votes_controller.rb index 2833687a38..513b937ef2 100644 --- a/app/controllers/api/v1/polls/votes_controller.rb +++ b/app/controllers/api/v1/polls/votes_controller.rb @@ -8,20 +8,20 @@ class Api::V1::Polls::VotesController < Api::BaseController before_action :set_poll def create - VoteService.new.call(current_account, @poll, vote_params) + VoteService.new.call(current_account, @poll, vote_params[:choices]) render json: @poll, serializer: REST::PollSerializer end private def set_poll - @poll = Poll.find(params[:poll_id]) + @poll = Poll.attached.find(params[:poll_id]) authorize @poll.status, :show? rescue Mastodon::NotPermittedError not_found end def vote_params - params.require(:choices) + params.permit(choices: []) end end diff --git a/app/controllers/api/v1/polls_controller.rb b/app/controllers/api/v1/polls_controller.rb index b4c25476e8..ffc70a8496 100644 --- a/app/controllers/api/v1/polls_controller.rb +++ b/app/controllers/api/v1/polls_controller.rb @@ -15,7 +15,7 @@ class Api::V1::PollsController < Api::BaseController private def set_poll - @poll = Poll.find(params[:id]) + @poll = Poll.attached.find(params[:id]) authorize @poll.status, :show? rescue Mastodon::NotPermittedError not_found diff --git a/app/controllers/api/v1/profile/avatars_controller.rb b/app/controllers/api/v1/profile/avatars_controller.rb index e6c954ed63..bc4d01a597 100644 --- a/app/controllers/api/v1/profile/avatars_controller.rb +++ b/app/controllers/api/v1/profile/avatars_controller.rb @@ -7,7 +7,7 @@ class Api::V1::Profile::AvatarsController < Api::BaseController def destroy @account = current_account UpdateAccountService.new.call(@account, { avatar: nil }, raise_error: true) - ActivityPub::UpdateDistributionWorker.perform_in(ActivityPub::UpdateDistributionWorker::DEBOUNCE_DELAY, @account.id) + ActivityPub::UpdateDistributionWorker.perform_async(@account.id) render json: @account, serializer: REST::CredentialAccountSerializer end end diff --git a/app/controllers/api/v1/profile/headers_controller.rb b/app/controllers/api/v1/profile/headers_controller.rb index 4472a01b05..9f4daa2f77 100644 --- a/app/controllers/api/v1/profile/headers_controller.rb +++ b/app/controllers/api/v1/profile/headers_controller.rb @@ -7,7 +7,7 @@ class Api::V1::Profile::HeadersController < Api::BaseController def destroy @account = current_account UpdateAccountService.new.call(@account, { header: nil }, raise_error: true) - ActivityPub::UpdateDistributionWorker.perform_in(ActivityPub::UpdateDistributionWorker::DEBOUNCE_DELAY, @account.id) + ActivityPub::UpdateDistributionWorker.perform_async(@account.id) render json: @account, serializer: REST::CredentialAccountSerializer end end diff --git a/app/controllers/api/v1/push/subscriptions_controller.rb b/app/controllers/api/v1/push/subscriptions_controller.rb index f2c52f2846..e1ad89ee3e 100644 --- a/app/controllers/api/v1/push/subscriptions_controller.rb +++ b/app/controllers/api/v1/push/subscriptions_controller.rb @@ -21,7 +21,6 @@ class Api::V1::Push::SubscriptionsController < Api::BaseController endpoint: subscription_params[:endpoint], key_p256dh: subscription_params[:keys][:p256dh], key_auth: subscription_params[:keys][:auth], - standard: subscription_params[:standard] || false, data: data_params, user_id: current_user.id, access_token_id: doorkeeper_token.id @@ -56,12 +55,12 @@ class Api::V1::Push::SubscriptionsController < Api::BaseController end def subscription_params - params.expect(subscription: [:endpoint, :standard, keys: [:auth, :p256dh]]) + params.require(:subscription).permit(:endpoint, keys: [:auth, :p256dh]) end def data_params return {} if params[:data].blank? - params.expect(data: [:policy, alerts: Notification::TYPES]) + params.require(:data).permit(:policy, alerts: Notification::TYPES) end end diff --git a/app/controllers/api/v1/reports_controller.rb b/app/controllers/api/v1/reports_controller.rb index 72f358bb5b..300c9faa3f 100644 --- a/app/controllers/api/v1/reports_controller.rb +++ b/app/controllers/api/v1/reports_controller.rb @@ -10,7 +10,7 @@ class Api::V1::ReportsController < Api::BaseController @report = ReportService.new.call( current_account, reported_account, - report_params.merge(application: doorkeeper_token.application) + report_params ) render json: @report, serializer: REST::ReportSerializer diff --git a/app/controllers/api/v1/statuses/translations_controller.rb b/app/controllers/api/v1/statuses/translations_controller.rb index bd5cd9bb07..8cf495f78a 100644 --- a/app/controllers/api/v1/statuses/translations_controller.rb +++ b/app/controllers/api/v1/statuses/translations_controller.rb @@ -23,6 +23,6 @@ class Api::V1::Statuses::TranslationsController < Api::V1::Statuses::BaseControl private def set_translation - @translation = TranslateStatusService.new.call(@status, I18n.locale.to_s) + @translation = TranslateStatusService.new.call(@status, content_locale) end end diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb index 1217b70752..534347d019 100644 --- a/app/controllers/api/v1/statuses_controller.rb +++ b/app/controllers/api/v1/statuses_controller.rb @@ -67,8 +67,6 @@ class Api::V1::StatusesController < Api::BaseController statuses = [@status] + @context.ancestors + @context.descendants + @context.references render json: @context, serializer: REST::ContextSerializer, relationships: StatusRelationshipsPresenter.new(statuses, current_user&.account_id) - - ActivityPub::FetchAllRepliesWorker.perform_async(@status.id) if !current_account.nil? && @status.should_fetch_replies? end def create @@ -127,7 +125,7 @@ class Api::V1::StatusesController < Api::BaseController @status.account.statuses_count = @status.account.statuses_count - 1 json = render_to_body json: @status, serializer: REST::StatusSerializer, source_requested: true - RemovalWorker.perform_async(@status.id, { 'redraft' => !truthy_param?(:delete_media) }) + RemovalWorker.perform_async(@status.id, { 'redraft' => true }) render json: json end diff --git a/app/controllers/api/v1/suggestions_controller.rb b/app/controllers/api/v1/suggestions_controller.rb index df9346832f..9ba1cef63c 100644 --- a/app/controllers/api/v1/suggestions_controller.rb +++ b/app/controllers/api/v1/suggestions_controller.rb @@ -2,9 +2,6 @@ class Api::V1::SuggestionsController < Api::BaseController include Authorization - include DeprecationConcern - - deprecate_api '2021-05-16', only: [:index] before_action -> { doorkeeper_authorize! :read, :'read:accounts' }, only: :index before_action -> { doorkeeper_authorize! :write, :'write:accounts' }, except: :index diff --git a/app/controllers/api/v1/trends/tags_controller.rb b/app/controllers/api/v1/trends/tags_controller.rb index ecac3579fc..b15dd50131 100644 --- a/app/controllers/api/v1/trends/tags_controller.rb +++ b/app/controllers/api/v1/trends/tags_controller.rb @@ -1,15 +1,11 @@ # frozen_string_literal: true class Api::V1::Trends::TagsController < Api::BaseController - include DeprecationConcern - before_action :set_tags after_action :insert_pagination_headers - DEFAULT_TAGS_LIMIT = (ENV['MAX_TRENDING_TAGS'] || 10).to_i - - deprecate_api '2022-03-30', only: :index, if: -> { request.path == '/api/v1/trends' } + DEFAULT_TAGS_LIMIT = 10 def index cache_if_unauthenticated! @@ -31,9 +27,7 @@ class Api::V1::Trends::TagsController < Api::BaseController end def tags_from_trends - scope = Trends.tags.query.allowed.in_locale(content_locale) - scope = scope.filtered_for(current_account) if user_signed_in? - scope + Trends.tags.query.allowed end def next_path diff --git a/app/controllers/api/v2/filters_controller.rb b/app/controllers/api/v2/filters_controller.rb index 51e778e1d6..0b63caa36a 100644 --- a/app/controllers/api/v2/filters_controller.rb +++ b/app/controllers/api/v2/filters_controller.rb @@ -43,6 +43,6 @@ class Api::V2::FiltersController < Api::BaseController end def resource_params - params.permit(:title, :expires_in, :filter_action, :exclude_follows, :exclude_localusers, :with_quote, :with_profile, context: [], keywords_attributes: [:id, :keyword, :whole_word, :_destroy]) + params.permit(:title, :expires_in, :filter_action, :exclude_follows, :exclude_localusers, :with_quote, context: [], keywords_attributes: [:id, :keyword, :whole_word, :_destroy]) end end diff --git a/app/controllers/api/v2/instances_controller.rb b/app/controllers/api/v2/instances_controller.rb index 62adf95260..8346e28830 100644 --- a/app/controllers/api/v2/instances_controller.rb +++ b/app/controllers/api/v2/instances_controller.rb @@ -1,16 +1,6 @@ # frozen_string_literal: true -class Api::V2::InstancesController < Api::BaseController - skip_before_action :require_authenticated_user!, unless: :limited_federation_mode? - skip_around_action :set_locale - - vary_by '' - - # Override `current_user` to avoid reading session cookies unless in limited federation mode - def current_user - super if limited_federation_mode? - end - +class Api::V2::InstancesController < Api::V1::InstancesController def show cache_even_if_authenticated! render_with_cache json: InstancePresenter.new, serializer: REST::InstanceSerializer, root: 'instance' diff --git a/app/controllers/api/v2/notifications/accounts_controller.rb b/app/controllers/api/v2/notifications/accounts_controller.rb deleted file mode 100644 index 771e966388..0000000000 --- a/app/controllers/api/v2/notifications/accounts_controller.rb +++ /dev/null @@ -1,50 +0,0 @@ -# frozen_string_literal: true - -class Api::V2::Notifications::AccountsController < Api::BaseController - before_action -> { doorkeeper_authorize! :read, :'read:notifications' } - before_action :require_user! - before_action :set_notifications! - after_action :insert_pagination_headers, only: :index - - def index - @accounts = load_accounts - render json: @accounts, each_serializer: REST::AccountSerializer - end - - private - - def load_accounts - @paginated_notifications.map(&:from_account) - end - - def set_notifications! - @paginated_notifications = begin - current_account - .notifications - .without_suspended - .where(group_key: params[:notification_group_key]) - .includes(from_account: [:account_stat, :user]) - .paginate_by_max_id( - limit_param(DEFAULT_ACCOUNTS_LIMIT), - params[:max_id], - params[:since_id] - ) - end - end - - def next_path - api_v2_notification_accounts_url pagination_params(max_id: pagination_max_id) if records_continue? - end - - def prev_path - api_v2_notification_accounts_url pagination_params(min_id: pagination_since_id) unless @paginated_notifications.empty? - end - - def pagination_collection - @paginated_notifications - end - - def records_continue? - @paginated_notifications.size == limit_param(DEFAULT_ACCOUNTS_LIMIT) - end -end diff --git a/app/controllers/api/v2/notifications/policies_controller.rb b/app/controllers/api/v2/notifications/policies_controller.rb deleted file mode 100644 index 637587967f..0000000000 --- a/app/controllers/api/v2/notifications/policies_controller.rb +++ /dev/null @@ -1,38 +0,0 @@ -# frozen_string_literal: true - -class Api::V2::Notifications::PoliciesController < Api::BaseController - before_action -> { doorkeeper_authorize! :read, :'read:notifications' }, only: :show - before_action -> { doorkeeper_authorize! :write, :'write:notifications' }, only: :update - - before_action :require_user! - before_action :set_policy - - def show - render json: @policy, serializer: REST::NotificationPolicySerializer - end - - def update - @policy.update!(resource_params) - render json: @policy, serializer: REST::NotificationPolicySerializer - end - - private - - def set_policy - @policy = NotificationPolicy.find_or_initialize_by(account: current_account) - - with_read_replica do - @policy.summarize! - end - end - - def resource_params - params.permit( - :for_not_following, - :for_not_followers, - :for_new_accounts, - :for_private_mentions, - :for_limited_accounts - ) - end -end diff --git a/app/controllers/api/v2/notifications_controller.rb b/app/controllers/api/v2/notifications_controller.rb deleted file mode 100644 index 848c361cfc..0000000000 --- a/app/controllers/api/v2/notifications_controller.rb +++ /dev/null @@ -1,154 +0,0 @@ -# frozen_string_literal: true - -class Api::V2::NotificationsController < Api::BaseController - before_action -> { doorkeeper_authorize! :read, :'read:notifications' }, except: [:clear, :dismiss] - before_action -> { doorkeeper_authorize! :write, :'write:notifications' }, only: [:clear, :dismiss] - before_action :require_user! - after_action :insert_pagination_headers, only: :index - - DEFAULT_NOTIFICATIONS_LIMIT = 40 - DEFAULT_NOTIFICATIONS_COUNT_LIMIT = 100 - MAX_NOTIFICATIONS_COUNT_LIMIT = 1_000 - - def index - with_read_replica do - @notifications = load_notifications - @grouped_notifications = load_grouped_notifications - @relationships = StatusRelationshipsPresenter.new(target_statuses_from_notifications, current_user&.account_id) - @presenter = GroupedNotificationsPresenter.new(@grouped_notifications, expand_accounts: expand_accounts_param) - - # Preload associations to avoid N+1s - ActiveRecord::Associations::Preloader.new(records: @presenter.accounts, associations: [:account_stat, { user: :role }]).call - end - - MastodonOTELTracer.in_span('Api::V2::NotificationsController#index rendering') do |span| - statuses = @grouped_notifications.filter_map { |group| group.target_status&.id } - - span.add_attributes( - 'app.notification_grouping.count' => @grouped_notifications.size, - 'app.notification_grouping.account.count' => @presenter.accounts.size, - 'app.notification_grouping.partial_account.count' => @presenter.partial_accounts.size, - 'app.notification_grouping.status.count' => statuses.size, - 'app.notification_grouping.status.unique_count' => statuses.uniq.size, - 'app.notification_grouping.expand_accounts_param' => expand_accounts_param - ) - - render json: @presenter, serializer: REST::DedupNotificationGroupSerializer, relationships: @relationships, expand_accounts: expand_accounts_param - end - end - - def unread_count - limit = limit_param(DEFAULT_NOTIFICATIONS_COUNT_LIMIT, MAX_NOTIFICATIONS_COUNT_LIMIT) - - with_read_replica do - render json: { count: browserable_account_notifications.paginate_groups_by_min_id(limit, min_id: notification_marker&.last_read_id, grouped_types: params[:grouped_types]).count } - end - end - - def show - @notification = current_account.notifications.without_suspended.by_group_key(params[:group_key]).take! - presenter = GroupedNotificationsPresenter.new(NotificationGroup.from_notifications([@notification])) - render json: presenter, serializer: REST::DedupNotificationGroupSerializer - end - - def clear - current_account.notifications.delete_all - render_empty - end - - def dismiss - current_account.notifications.by_group_key(params[:group_key]).destroy_all - render_empty - end - - private - - def load_notifications - MastodonOTELTracer.in_span('Api::V2::NotificationsController#load_notifications') do - notifications = browserable_account_notifications.includes(from_account: [:account_stat, :user]).to_a_grouped_paginated_by_id( - limit_param(DEFAULT_NOTIFICATIONS_LIMIT), - params.slice(:max_id, :since_id, :min_id, :grouped_types).permit(:max_id, :since_id, :min_id, grouped_types: []) - ) - - Notification.preload_cache_collection_target_statuses(notifications) do |target_statuses| - preload_collection(target_statuses, Status) - end - end - end - - def load_grouped_notifications - return [] if @notifications.empty? - - MastodonOTELTracer.in_span('Api::V2::NotificationsController#load_grouped_notifications') do - pagination_range = (@notifications.last.id)..@notifications.first.id - - # If the page is incomplete, we know we are on the last page - if incomplete_page? - if paginating_up? - pagination_range = @notifications.last.id...(params[:max_id]&.to_i) - else - range_start = params[:since_id]&.to_i - range_start += 1 unless range_start.nil? - pagination_range = range_start..(@notifications.first.id) - end - end - - NotificationGroup.from_notifications(@notifications, pagination_range: pagination_range, grouped_types: params[:grouped_types]) - end - end - - def incomplete_page? - @notifications.size < limit_param(DEFAULT_NOTIFICATIONS_LIMIT) - end - - def paginating_up? - params[:min_id].present? - end - - def browserable_account_notifications - current_account.notifications.without_suspended.browserable( - types: Array(browserable_params[:types]), - exclude_types: Array(browserable_params[:exclude_types]), - include_filtered: truthy_param?(:include_filtered) - ) - end - - def notification_marker - current_user.markers.find_by(timeline: 'notifications') - end - - def target_statuses_from_notifications - @notifications.filter_map(&:target_status) - end - - def next_path - api_v2_notifications_url pagination_params(max_id: pagination_max_id) unless @notifications.empty? - end - - def prev_path - api_v2_notifications_url pagination_params(min_id: pagination_since_id) unless @notifications.empty? - end - - def pagination_collection - @notifications - end - - def browserable_params - params.slice(:include_filtered, :types, :exclude_types, :grouped_types).permit(:include_filtered, types: [], exclude_types: [], grouped_types: []) - end - - def pagination_params(core_params) - params.slice(:limit, :include_filtered, :types, :exclude_types, :grouped_types).permit(:limit, :include_filtered, types: [], exclude_types: [], grouped_types: []).merge(core_params) - end - - def expand_accounts_param - case params[:expand_accounts] - when nil, 'full' - 'full' - when 'partial_avatars' - 'partial_avatars' - else - raise Mastodon::InvalidParameterError, "Invalid value for 'expand_accounts': '#{params[:expand_accounts]}', allowed values are 'full' and 'partial_avatars'" - end - end -end diff --git a/app/controllers/api/v2_alpha/notifications_controller.rb b/app/controllers/api/v2_alpha/notifications_controller.rb new file mode 100644 index 0000000000..edba23ab4a --- /dev/null +++ b/app/controllers/api/v2_alpha/notifications_controller.rb @@ -0,0 +1,91 @@ +# frozen_string_literal: true + +class Api::V2Alpha::NotificationsController < Api::BaseController + before_action -> { doorkeeper_authorize! :read, :'read:notifications' }, except: [:clear, :dismiss] + before_action -> { doorkeeper_authorize! :write, :'write:notifications' }, only: [:clear, :dismiss] + before_action :require_user! + after_action :insert_pagination_headers, only: :index + + DEFAULT_NOTIFICATIONS_LIMIT = 40 + + def index + with_read_replica do + @notifications = load_notifications + @group_metadata = load_group_metadata + @relationships = StatusRelationshipsPresenter.new(target_statuses_from_notifications, current_user&.account_id) + end + + render json: @notifications.map { |notification| NotificationGroup.from_notification(notification, max_id: @group_metadata.dig(notification.group_key, :max_id)) }, each_serializer: REST::NotificationGroupSerializer, relationships: @relationships, group_metadata: @group_metadata + end + + def show + @notification = current_account.notifications.without_suspended.find_by!(group_key: params[:id]) + render json: NotificationGroup.from_notification(@notification), serializer: REST::NotificationGroupSerializer + end + + def clear + current_account.notifications.delete_all + render_empty + end + + def dismiss + current_account.notifications.where(group_key: params[:id]).destroy_all + render_empty + end + + private + + def load_notifications + notifications = browserable_account_notifications.includes(from_account: [:account_stat, :user]).to_a_grouped_paginated_by_id( + limit_param(DEFAULT_NOTIFICATIONS_LIMIT), + params_slice(:max_id, :since_id, :min_id) + ) + + Notification.preload_cache_collection_target_statuses(notifications) do |target_statuses| + preload_collection(target_statuses, Status) + end + end + + def load_group_metadata + return {} if @notifications.empty? + + browserable_account_notifications + .where(group_key: @notifications.filter_map(&:group_key)) + .where(id: (@notifications.last.id)..(@notifications.first.id)) + .group(:group_key) + .pluck(:group_key, 'min(notifications.id) as min_id', 'max(notifications.id) as max_id', 'max(notifications.created_at) as latest_notification_at') + .to_h { |group_key, min_id, max_id, latest_notification_at| [group_key, { min_id: min_id, max_id: max_id, latest_notification_at: latest_notification_at }] } + end + + def browserable_account_notifications + current_account.notifications.without_suspended.browserable( + types: Array(browserable_params[:types]), + exclude_types: Array(browserable_params[:exclude_types]), + include_filtered: truthy_param?(:include_filtered) + ) + end + + def target_statuses_from_notifications + @notifications.filter_map(&:target_status) + end + + def next_path + api_v2_alpha_notifications_url pagination_params(max_id: pagination_max_id) unless @notifications.empty? + end + + def prev_path + api_v2_alpha_notifications_url pagination_params(min_id: pagination_since_id) unless @notifications.empty? + end + + def pagination_collection + @notifications + end + + def browserable_params + params.permit(:include_filtered, types: [], exclude_types: []) + end + + def pagination_params(core_params) + params.slice(:limit, :types, :exclude_types, :include_filtered).permit(:limit, :include_filtered, types: [], exclude_types: []).merge(core_params) + end +end diff --git a/app/controllers/api/web/embeds_controller.rb b/app/controllers/api/web/embeds_controller.rb index f82c1c50d7..63c3f2d90a 100644 --- a/app/controllers/api/web/embeds_controller.rb +++ b/app/controllers/api/web/embeds_controller.rb @@ -9,7 +9,7 @@ class Api::Web::EmbedsController < Api::Web::BaseController return not_found if @status.hidden? if @status.local? - render json: @status, serializer: OEmbedSerializer + render json: @status, serializer: OEmbedSerializer, width: 400 else return not_found unless user_signed_in? diff --git a/app/controllers/api/web/push_subscriptions_controller.rb b/app/controllers/api/web/push_subscriptions_controller.rb index 2711071b4a..167d16fc4d 100644 --- a/app/controllers/api/web/push_subscriptions_controller.rb +++ b/app/controllers/api/web/push_subscriptions_controller.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class Api::Web::PushSubscriptionsController < Api::Web::BaseController - before_action :require_user!, except: :destroy + before_action :require_user! before_action :set_push_subscription, only: :update before_action :destroy_previous_subscriptions, only: :create, if: :prior_subscriptions? after_action :update_session_with_subscription, only: :create @@ -17,13 +17,6 @@ class Api::Web::PushSubscriptionsController < Api::Web::BaseController render json: @push_subscription, serializer: REST::WebPushSubscriptionSerializer end - def destroy - push_subscription = ::Web::PushSubscription.find_by_token_for(:unsubscribe, params[:id]) - push_subscription&.destroy - - head 200 - end - private def active_session @@ -66,7 +59,7 @@ class Api::Web::PushSubscriptionsController < Api::Web::BaseController end def subscription_params - @subscription_params ||= params.expect(subscription: [:standard, :endpoint, keys: [:auth, :p256dh]]) + @subscription_params ||= params.require(:subscription).permit(:endpoint, keys: [:auth, :p256dh]) end def web_push_subscription_params @@ -76,12 +69,11 @@ class Api::Web::PushSubscriptionsController < Api::Web::BaseController endpoint: subscription_params[:endpoint], key_auth: subscription_params[:keys][:auth], key_p256dh: subscription_params[:keys][:p256dh], - standard: subscription_params[:standard] || false, user_id: active_session.user_id, } end def data_params - @data_params ||= params.expect(data: [:policy, alerts: Notification::TYPES]) + @data_params ||= params.require(:data).permit(:policy, alerts: Notification::TYPES) end end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 1b071e8655..66e0f7e305 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -20,8 +20,10 @@ class ApplicationController < ActionController::Base helper_method :current_theme helper_method :single_user_mode? helper_method :use_seamless_external_login? + helper_method :omniauth_only? helper_method :sso_account_settings helper_method :limited_federation_mode? + helper_method :body_class_string helper_method :skip_csrf_meta_tags? rescue_from ActionController::ParameterMissing, Paperclip::AdapterRegistry::NoHandlerError, with: :bad_request @@ -31,7 +33,7 @@ class ApplicationController < ActionController::Base rescue_from ActionController::InvalidAuthenticityToken, with: :unprocessable_entity rescue_from Mastodon::RateLimitExceededError, with: :too_many_requests - rescue_from(*Mastodon::HTTP_CONNECTION_ERRORS, with: :internal_server_error) + rescue_from HTTP::Error, OpenSSL::SSL::SSLError, with: :internal_server_error rescue_from Mastodon::RaceConditionError, Stoplight::Error::RedLight, ActiveRecord::SerializationFailure, with: :service_unavailable rescue_from Seahorse::Client::NetworkingError do |e| @@ -70,13 +72,7 @@ class ApplicationController < ActionController::Base end def require_functional! - return if current_user.functional? - - if current_user.confirmed? - redirect_to edit_user_registration_path - else - redirect_to auth_setup_path - end + redirect_to edit_user_registration_path unless current_user.functional? end def skip_csrf_meta_tags? @@ -141,6 +137,10 @@ class ApplicationController < ActionController::Base Devise.pam_authentication || Devise.ldap_authentication end + def omniauth_only? + ENV['OMNIAUTH_ONLY'] == 'true' + end + def sso_account_settings ENV.fetch('SSO_ACCOUNT_SETTINGS', nil) end @@ -163,6 +163,10 @@ class ApplicationController < ActionController::Base current_user.setting_theme end + def body_class_string + @body_classes || '' + end + def respond_with_error(code) respond_to do |format| format.any { render "errors/#{code}", layout: 'error', status: code, formats: [:html] } diff --git a/app/controllers/auth/confirmations_controller.rb b/app/controllers/auth/confirmations_controller.rb index 13c2468eb8..a99dceeb25 100644 --- a/app/controllers/auth/confirmations_controller.rb +++ b/app/controllers/auth/confirmations_controller.rb @@ -6,6 +6,7 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController layout 'auth' + before_action :set_body_classes before_action :set_confirmation_user!, only: [:show, :confirm_captcha] before_action :redirect_confirmed_user, if: :signed_in_confirmed_user? @@ -78,6 +79,10 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController user_signed_in? && current_user.confirmed? && current_user.unconfirmed_email.blank? end + def set_body_classes + @body_classes = 'lighter' + end + def after_resending_confirmation_instructions_path_for(_resource_name) if user_signed_in? if current_user.confirmed? && current_user.approved? diff --git a/app/controllers/auth/passwords_controller.rb b/app/controllers/auth/passwords_controller.rb index 7c1ff59671..de001f062b 100644 --- a/app/controllers/auth/passwords_controller.rb +++ b/app/controllers/auth/passwords_controller.rb @@ -3,6 +3,7 @@ class Auth::PasswordsController < Devise::PasswordsController skip_before_action :check_self_destruct! before_action :redirect_invalid_reset_token, only: :edit, unless: :reset_password_token_is_valid? + before_action :set_body_classes layout 'auth' @@ -23,6 +24,10 @@ class Auth::PasswordsController < Devise::PasswordsController redirect_to new_password_path(resource_name) end + def set_body_classes + @body_classes = 'lighter' + end + def reset_password_token_is_valid? resource_class.with_reset_password_token(params[:reset_password_token]).present? end diff --git a/app/controllers/auth/registrations_controller.rb b/app/controllers/auth/registrations_controller.rb index 0b6f5b3af4..e5a2ac0270 100644 --- a/app/controllers/auth/registrations_controller.rb +++ b/app/controllers/auth/registrations_controller.rb @@ -11,7 +11,9 @@ class Auth::RegistrationsController < Devise::RegistrationsController before_action :configure_sign_up_params, only: [:create] before_action :set_sessions, only: [:edit, :update] before_action :set_strikes, only: [:edit, :update] + before_action :set_body_classes, only: [:new, :create, :edit, :update] before_action :require_not_suspended!, only: [:update] + before_action :set_cache_headers, only: [:edit, :update] before_action :set_rules, only: :new before_action :require_rules_acceptance!, only: :new before_action :set_registration_form_time, only: :new @@ -62,7 +64,7 @@ class Auth::RegistrationsController < Devise::RegistrationsController def configure_sign_up_params devise_parameter_sanitizer.permit(:sign_up) do |user_params| - user_params.permit({ account_attributes: [:username, :display_name], invite_request_attributes: [:text] }, :email, :password, :password_confirmation, :invite_code, :agreement, :website, :confirm_password, :date_of_birth) + user_params.permit({ account_attributes: [:username, :display_name], invite_request_attributes: [:text] }, :email, :password, :password_confirmation, :invite_code, :agreement, :website, :confirm_password) end end @@ -102,6 +104,10 @@ class Auth::RegistrationsController < Devise::RegistrationsController private + def set_body_classes + @body_classes = %w(edit update).include?(action_name) ? 'admin' : 'lighter' + end + def set_invite @invite = begin invite = Invite.find_by(code: invite_code) if invite_code.present? @@ -138,11 +144,7 @@ class Auth::RegistrationsController < Devise::RegistrationsController set_locale { render :rules } end - def is_flashing_format? # rubocop:disable Naming/PredicateName - if params[:action] == 'create' - false # Disable flash messages for sign-up - else - super - end + def set_cache_headers + response.cache_control.replace(private: true, no_store: true) end end diff --git a/app/controllers/auth/sessions_controller.rb b/app/controllers/auth/sessions_controller.rb index 5f9f133659..6ed7b2baac 100644 --- a/app/controllers/auth/sessions_controller.rb +++ b/app/controllers/auth/sessions_controller.rb @@ -16,10 +16,17 @@ class Auth::SessionsController < Devise::SessionsController include Auth::TwoFactorAuthenticationConcern + before_action :set_body_classes + content_security_policy only: :new do |p| p.form_action(false) end + def check_suspicious! + user = find_user + @login_is_suspicious = suspicious_sign_in?(user) unless user.nil? + end + def create super do |resource| # We only need to call this if this hasn't already been @@ -73,11 +80,7 @@ class Auth::SessionsController < Devise::SessionsController end def user_params - params.expect(user: [:email, :password, :otp_attempt, :disable_css, credential: {}]) - end - - def login_page_params - params.permit(:with_options) + params.require(:user).permit(:email, :password, :otp_attempt, credential: {}) end def after_sign_in_path_for(resource) @@ -100,9 +103,8 @@ class Auth::SessionsController < Devise::SessionsController private - def check_suspicious! - user = find_user - @login_is_suspicious = suspicious_sign_in?(user) unless user.nil? + def set_body_classes + @body_classes = 'lighter' end def home_paths(resource) @@ -117,11 +119,6 @@ class Auth::SessionsController < Devise::SessionsController truthy_param?(:continue) end - def with_login_options? - login_page_params[:with_options] == '1' - end - helper_method :with_login_options? - def restart_session clear_attempt_from_session redirect_to new_user_session_path, alert: I18n.t('devise.failure.timeout') @@ -160,8 +157,6 @@ class Auth::SessionsController < Devise::SessionsController sign_in(user) flash.delete(:notice) - disable_custom_css!(user) if disable_custom_css? - LoginActivity.create( user: user, success: true, @@ -173,15 +168,6 @@ class Auth::SessionsController < Devise::SessionsController UserMailer.suspicious_sign_in(user, request.remote_ip, request.user_agent, Time.now.utc).deliver_later! if @login_is_suspicious end - def disable_custom_css? - user_params[:disable_css].present? && user_params[:disable_css] == '1' - end - - def disable_custom_css!(user) - user.settings['web.use_custom_css'] = false - user.save! - end - def suspicious_sign_in?(user) SuspiciousSignInDetector.new(user).suspicious?(request) end @@ -207,15 +193,4 @@ class Auth::SessionsController < Devise::SessionsController def second_factor_attempts_key(user) "2fa_auth_attempts:#{user.id}:#{Time.now.utc.hour}" end - - def respond_to_on_destroy - respond_to do |format| - format.json do - render json: { - redirect_to: after_sign_out_path_for(resource_name), - }, status: 200 - end - format.all { super } - end - end end diff --git a/app/controllers/auth/setup_controller.rb b/app/controllers/auth/setup_controller.rb index 5e7b14646a..40916d2887 100644 --- a/app/controllers/auth/setup_controller.rb +++ b/app/controllers/auth/setup_controller.rb @@ -5,6 +5,7 @@ class Auth::SetupController < ApplicationController before_action :authenticate_user! before_action :require_unconfirmed_or_pending! + before_action :set_body_classes before_action :set_user skip_before_action :require_functional! @@ -18,7 +19,7 @@ class Auth::SetupController < ApplicationController if @user.update(user_params) @user.resend_confirmation_instructions unless @user.confirmed? - redirect_to auth_setup_path, notice: t('auth.setup.new_confirmation_instructions_sent') + redirect_to auth_setup_path, notice: I18n.t('auth.setup.new_confirmation_instructions_sent') else render :show end @@ -34,7 +35,11 @@ class Auth::SetupController < ApplicationController @user = current_user end + def set_body_classes + @body_classes = 'lighter' + end + def user_params - params.expect(user: [:email]) + params.require(:user).permit(:email) end end diff --git a/app/controllers/backups_controller.rb b/app/controllers/backups_controller.rb index 076d19874b..5df1af5f2f 100644 --- a/app/controllers/backups_controller.rb +++ b/app/controllers/backups_controller.rb @@ -9,15 +9,13 @@ class BackupsController < ApplicationController before_action :authenticate_user! before_action :set_backup - BACKUP_LINK_TIMEOUT = 1.hour.freeze - def download case Paperclip::Attachment.default_options[:storage] when :s3, :azure - redirect_to @backup.dump.expiring_url(BACKUP_LINK_TIMEOUT.to_i), allow_other_host: true + redirect_to @backup.dump.expiring_url(10), allow_other_host: true when :fog if Paperclip::Attachment.default_options.dig(:fog_credentials, :openstack_temp_url_key).present? - redirect_to @backup.dump.expiring_url(BACKUP_LINK_TIMEOUT.from_now), allow_other_host: true + redirect_to @backup.dump.expiring_url(Time.now.utc + 10), allow_other_host: true else redirect_to full_asset_url(@backup.dump.url), allow_other_host: true end diff --git a/app/controllers/concerns/account_controller_concern.rb b/app/controllers/concerns/account_controller_concern.rb index b75f3e3581..d63bcc85c9 100644 --- a/app/controllers/concerns/account_controller_concern.rb +++ b/app/controllers/concerns/account_controller_concern.rb @@ -20,7 +20,7 @@ module AccountControllerConcern webfinger_account_link, actor_url_link, ] - ).to_s + ) end def webfinger_account_link diff --git a/app/controllers/concerns/admin/export_controller_concern.rb b/app/controllers/concerns/admin/export_controller_concern.rb index ce03b2a24a..6228ae67fe 100644 --- a/app/controllers/concerns/admin/export_controller_concern.rb +++ b/app/controllers/concerns/admin/export_controller_concern.rb @@ -24,6 +24,6 @@ module Admin::ExportControllerConcern end def import_params - params.expect(admin_import: [:data]) + params.require(:admin_import).permit(:data) end end diff --git a/app/controllers/concerns/api/error_handling.rb b/app/controllers/concerns/api/error_handling.rb index 9ce4795b02..ad559fe2d7 100644 --- a/app/controllers/concerns/api/error_handling.rb +++ b/app/controllers/concerns/api/error_handling.rb @@ -20,7 +20,7 @@ module Api::ErrorHandling render json: { error: 'Record not found' }, status: 404 end - rescue_from(*Mastodon::HTTP_CONNECTION_ERRORS, Mastodon::UnexpectedResponseError) do + rescue_from HTTP::Error, Mastodon::UnexpectedResponseError do render json: { error: 'Remote data could not be fetched' }, status: 503 end diff --git a/app/controllers/concerns/api/pagination.rb b/app/controllers/concerns/api/pagination.rb index b0b4ae4603..7f06dc0202 100644 --- a/app/controllers/concerns/api/pagination.rb +++ b/app/controllers/concerns/api/pagination.rb @@ -19,7 +19,7 @@ module Api::Pagination links = [] links << [next_path, [%w(rel next)]] if next_path links << [prev_path, [%w(rel prev)]] if prev_path - response.headers['Link'] = LinkHeader.new(links).to_s unless links.empty? + response.headers['Link'] = LinkHeader.new(links) unless links.empty? end def require_valid_pagination_options! diff --git a/app/controllers/concerns/auth/captcha_concern.rb b/app/controllers/concerns/auth/captcha_concern.rb index c01da21249..cfd93978ce 100644 --- a/app/controllers/concerns/auth/captcha_concern.rb +++ b/app/controllers/concerns/auth/captcha_concern.rb @@ -10,7 +10,7 @@ module Auth::CaptchaConcern end def captcha_available? - Rails.configuration.x.captcha.secret_key.present? && Rails.configuration.x.captcha.site_key.present? + ENV['HCAPTCHA_SECRET_KEY'].present? && ENV['HCAPTCHA_SITE_KEY'].present? end def captcha_enabled? diff --git a/app/controllers/concerns/auth/two_factor_authentication_concern.rb b/app/controllers/concerns/auth/two_factor_authentication_concern.rb index 0fb11428dc..404164751a 100644 --- a/app/controllers/concerns/auth/two_factor_authentication_concern.rb +++ b/app/controllers/concerns/auth/two_factor_authentication_concern.rb @@ -83,6 +83,7 @@ module Auth::TwoFactorAuthenticationConcern def prompt_for_two_factor(user) register_attempt_in_session(user) + @body_classes = 'lighter' @webauthn_enabled = user.webauthn_enabled? @scheme_type = if user.webauthn_enabled? && user_params[:otp_attempt].blank? 'webauthn' diff --git a/app/controllers/concerns/cache_concern.rb b/app/controllers/concerns/cache_concern.rb index 1cdd4d7cf0..3dc0ea840a 100644 --- a/app/controllers/concerns/cache_concern.rb +++ b/app/controllers/concerns/cache_concern.rb @@ -38,7 +38,7 @@ module CacheConcern return render(options) end - key = options.delete(:key) || [[params[:controller], params[:action]].join('/'), options[:json].respond_to?(:cache_key) ? options[:json].cache_key : nil, options[:fields]&.join(',')].compact.join(':') + key = options.delete(:key) || [[params[:controller], params[:action]].join('/'), options[:json].respond_to?(:cache_key) ? options[:json].cache_key : nil, options[:fields].nil? ? nil : options[:fields].join(',')].compact.join(':') expires_in = options.delete(:expires_in) || 3.minutes body = Rails.cache.read(key, raw: true) diff --git a/app/controllers/concerns/challengable_concern.rb b/app/controllers/concerns/challengable_concern.rb index 7fbc469bdf..09874fb405 100644 --- a/app/controllers/concerns/challengable_concern.rb +++ b/app/controllers/concerns/challengable_concern.rb @@ -42,6 +42,7 @@ module ChallengableConcern end def render_challenge + @body_classes = 'lighter' render 'auth/challenges/new', layout: 'auth' end @@ -58,6 +59,6 @@ module ChallengableConcern end def challenge_params - params.expect(form_challenge: [:current_password, :return_to]) + params.require(:form_challenge).permit(:current_password, :return_to) end end diff --git a/app/controllers/concerns/deprecation_concern.rb b/app/controllers/concerns/deprecation_concern.rb deleted file mode 100644 index ad8de724a1..0000000000 --- a/app/controllers/concerns/deprecation_concern.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -module DeprecationConcern - extend ActiveSupport::Concern - - class_methods do - def deprecate_api(date, sunset: nil, **kwargs) - deprecation_timestamp = "@#{date.to_datetime.to_i}" - sunset = sunset&.to_date&.httpdate - - before_action(**kwargs) do - response.headers['Deprecation'] = deprecation_timestamp - response.headers['Sunset'] = sunset if sunset - end - end - end -end diff --git a/app/controllers/concerns/localized.rb b/app/controllers/concerns/localized.rb index 14742e3b5c..ede299d5a4 100644 --- a/app/controllers/concerns/localized.rb +++ b/app/controllers/concerns/localized.rb @@ -25,7 +25,7 @@ module Localized end def available_locale_or_nil(locale_name) - locale_name.to_sym if locale_name.respond_to?(:to_sym) && I18n.available_locales.include?(locale_name.to_sym) + locale_name.to_sym if locale_name.present? && I18n.available_locales.include?(locale_name.to_sym) end def content_locale diff --git a/app/controllers/concerns/signature_verification.rb b/app/controllers/concerns/signature_verification.rb index ffe612f468..68f09ee023 100644 --- a/app/controllers/concerns/signature_verification.rb +++ b/app/controllers/concerns/signature_verification.rb @@ -10,6 +10,8 @@ module SignatureVerification EXPIRATION_WINDOW_LIMIT = 12.hours CLOCK_SKEW_MARGIN = 1.hour + class SignatureVerificationError < StandardError; end + def require_account_signature! render json: signature_verification_failure_reason, status: signature_verification_failure_code unless signed_request_account end @@ -32,7 +34,7 @@ module SignatureVerification def signature_key_id signature_params['keyId'] - rescue Mastodon::SignatureVerificationError + rescue SignatureVerificationError nil end @@ -43,17 +45,17 @@ module SignatureVerification def signed_request_actor return @signed_request_actor if defined?(@signed_request_actor) - raise Mastodon::SignatureVerificationError, 'Request not signed' unless signed_request? - raise Mastodon::SignatureVerificationError, 'Incompatible request signature. keyId and signature are required' if missing_required_signature_parameters? - raise Mastodon::SignatureVerificationError, 'Unsupported signature algorithm (only rsa-sha256 and hs2019 are supported)' unless %w(rsa-sha256 hs2019).include?(signature_algorithm) - raise Mastodon::SignatureVerificationError, 'Signed request date outside acceptable time window' unless matches_time_window? + raise SignatureVerificationError, 'Request not signed' unless signed_request? + raise SignatureVerificationError, 'Incompatible request signature. keyId and signature are required' if missing_required_signature_parameters? + raise SignatureVerificationError, 'Unsupported signature algorithm (only rsa-sha256 and hs2019 are supported)' unless %w(rsa-sha256 hs2019).include?(signature_algorithm) + raise SignatureVerificationError, 'Signed request date outside acceptable time window' unless matches_time_window? verify_signature_strength! verify_body_digest! actor = actor_from_key_id(signature_params['keyId']) - raise Mastodon::SignatureVerificationError, "Public key not found for key #{signature_params['keyId']}" if actor.nil? + raise SignatureVerificationError, "Public key not found for key #{signature_params['keyId']}" if actor.nil? signature = Base64.decode64(signature_params['signature']) compare_signed_string = build_signed_string(include_query_string: true) @@ -66,7 +68,7 @@ module SignatureVerification actor = stoplight_wrapper.run { actor_refresh_key!(actor) } - raise Mastodon::SignatureVerificationError, "Could not refresh public key #{signature_params['keyId']}" if actor.nil? + raise SignatureVerificationError, "Could not refresh public key #{signature_params['keyId']}" if actor.nil? compare_signed_string = build_signed_string(include_query_string: true) return actor unless verify_signature(actor, signature, compare_signed_string).nil? @@ -76,9 +78,9 @@ module SignatureVerification return actor unless verify_signature(actor, signature, compare_signed_string).nil? fail_with! "Verification failed for #{actor.to_log_human_identifier} #{actor.uri} using rsa-sha256 (RSASSA-PKCS1-v1_5 with SHA-256)", signed_string: compare_signed_string, signature: signature_params['signature'] - rescue Mastodon::SignatureVerificationError => e + rescue SignatureVerificationError => e fail_with! e.message - rescue *Mastodon::HTTP_CONNECTION_ERRORS => e + rescue HTTP::Error, OpenSSL::SSL::SSLError => e fail_with! "Failed to fetch remote data: #{e.message}" rescue Mastodon::UnexpectedResponseError fail_with! 'Failed to fetch remote data (got unexpected reply from server)' @@ -102,7 +104,7 @@ module SignatureVerification def signature_params @signature_params ||= SignatureParser.parse(request.headers['Signature']) rescue SignatureParser::ParsingError - raise Mastodon::SignatureVerificationError, 'Error parsing signature parameters' + raise SignatureVerificationError, 'Error parsing signature parameters' end def signature_algorithm @@ -114,31 +116,31 @@ module SignatureVerification end def verify_signature_strength! - raise Mastodon::SignatureVerificationError, 'Mastodon requires the Date header or (created) pseudo-header to be signed' unless signed_headers.include?('date') || signed_headers.include?('(created)') - raise Mastodon::SignatureVerificationError, 'Mastodon requires the Digest header or (request-target) pseudo-header to be signed' unless signed_headers.include?(HttpSignatureDraft::REQUEST_TARGET) || signed_headers.include?('digest') - raise Mastodon::SignatureVerificationError, 'Mastodon requires the Host header to be signed when doing a GET request' if request.get? && !signed_headers.include?('host') - raise Mastodon::SignatureVerificationError, 'Mastodon requires the Digest header to be signed when doing a POST request' if request.post? && !signed_headers.include?('digest') + raise SignatureVerificationError, 'Mastodon requires the Date header or (created) pseudo-header to be signed' unless signed_headers.include?('date') || signed_headers.include?('(created)') + raise SignatureVerificationError, 'Mastodon requires the Digest header or (request-target) pseudo-header to be signed' unless signed_headers.include?(Request::REQUEST_TARGET) || signed_headers.include?('digest') + raise SignatureVerificationError, 'Mastodon requires the Host header to be signed when doing a GET request' if request.get? && !signed_headers.include?('host') + raise SignatureVerificationError, 'Mastodon requires the Digest header to be signed when doing a POST request' if request.post? && !signed_headers.include?('digest') end def verify_body_digest! return unless signed_headers.include?('digest') - raise Mastodon::SignatureVerificationError, 'Digest header missing' unless request.headers.key?('Digest') + raise SignatureVerificationError, 'Digest header missing' unless request.headers.key?('Digest') digests = request.headers['Digest'].split(',').map { |digest| digest.split('=', 2) }.map { |key, value| [key.downcase, value] } sha256 = digests.assoc('sha-256') - raise Mastodon::SignatureVerificationError, "Mastodon only supports SHA-256 in Digest header. Offered algorithms: #{digests.map(&:first).join(', ')}" if sha256.nil? + raise SignatureVerificationError, "Mastodon only supports SHA-256 in Digest header. Offered algorithms: #{digests.map(&:first).join(', ')}" if sha256.nil? return if body_digest == sha256[1] digest_size = begin Base64.strict_decode64(sha256[1].strip).length rescue ArgumentError - raise Mastodon::SignatureVerificationError, "Invalid Digest value. The provided Digest value is not a valid base64 string. Given digest: #{sha256[1]}" + raise SignatureVerificationError, "Invalid Digest value. The provided Digest value is not a valid base64 string. Given digest: #{sha256[1]}" end - raise Mastodon::SignatureVerificationError, "Invalid Digest value. The provided Digest value is not a SHA-256 digest. Given digest: #{sha256[1]}" if digest_size != 32 + raise SignatureVerificationError, "Invalid Digest value. The provided Digest value is not a SHA-256 digest. Given digest: #{sha256[1]}" if digest_size != 32 - raise Mastodon::SignatureVerificationError, "Invalid Digest value. Computed SHA-256 digest: #{body_digest}; given: #{sha256[1]}" + raise SignatureVerificationError, "Invalid Digest value. Computed SHA-256 digest: #{body_digest}; given: #{sha256[1]}" end def verify_signature(actor, signature, compare_signed_string) @@ -153,23 +155,23 @@ module SignatureVerification def build_signed_string(include_query_string: true) signed_headers.map do |signed_header| case signed_header - when HttpSignatureDraft::REQUEST_TARGET + when Request::REQUEST_TARGET if include_query_string - "#{HttpSignatureDraft::REQUEST_TARGET}: #{request.method.downcase} #{request.original_fullpath}" + "#{Request::REQUEST_TARGET}: #{request.method.downcase} #{request.original_fullpath}" else # Current versions of Mastodon incorrectly omit the query string from the (request-target) pseudo-header. # Therefore, temporarily support such incorrect signatures for compatibility. # TODO: remove eventually some time after release of the fixed version - "#{HttpSignatureDraft::REQUEST_TARGET}: #{request.method.downcase} #{request.path}" + "#{Request::REQUEST_TARGET}: #{request.method.downcase} #{request.path}" end when '(created)' - raise Mastodon::SignatureVerificationError, 'Invalid pseudo-header (created) for rsa-sha256' unless signature_algorithm == 'hs2019' - raise Mastodon::SignatureVerificationError, 'Pseudo-header (created) used but corresponding argument missing' if signature_params['created'].blank? + raise SignatureVerificationError, 'Invalid pseudo-header (created) for rsa-sha256' unless signature_algorithm == 'hs2019' + raise SignatureVerificationError, 'Pseudo-header (created) used but corresponding argument missing' if signature_params['created'].blank? "(created): #{signature_params['created']}" when '(expires)' - raise Mastodon::SignatureVerificationError, 'Invalid pseudo-header (expires) for rsa-sha256' unless signature_algorithm == 'hs2019' - raise Mastodon::SignatureVerificationError, 'Pseudo-header (expires) used but corresponding argument missing' if signature_params['expires'].blank? + raise SignatureVerificationError, 'Invalid pseudo-header (expires) for rsa-sha256' unless signature_algorithm == 'hs2019' + raise SignatureVerificationError, 'Pseudo-header (expires) used but corresponding argument missing' if signature_params['expires'].blank? "(expires): #{signature_params['expires']}" else @@ -191,7 +193,7 @@ module SignatureVerification expires_time = Time.at(signature_params['expires'].to_i).utc if signature_params['expires'].present? rescue ArgumentError => e - raise Mastodon::SignatureVerificationError, "Invalid Date header: #{e.message}" + raise SignatureVerificationError, "Invalid Date header: #{e.message}" end expires_time ||= created_time + 5.minutes unless created_time.nil? @@ -231,9 +233,9 @@ module SignatureVerification account end rescue Mastodon::PrivateNetworkAddressError => e - raise Mastodon::SignatureVerificationError, "Requests to private network addresses are disallowed (tried to query #{e.host})" + raise SignatureVerificationError, "Requests to private network addresses are disallowed (tried to query #{e.host})" rescue Mastodon::HostValidationError, ActivityPub::FetchRemoteActorService::Error, ActivityPub::FetchRemoteKeyService::Error, Webfinger::Error => e - raise Mastodon::SignatureVerificationError, e.message + raise SignatureVerificationError, e.message end def stoplight_wrapper @@ -249,8 +251,8 @@ module SignatureVerification ActivityPub::FetchRemoteActorService.new.call(actor.uri, only_key: true, suppress_errors: false) rescue Mastodon::PrivateNetworkAddressError => e - raise Mastodon::SignatureVerificationError, "Requests to private network addresses are disallowed (tried to query #{e.host})" + raise SignatureVerificationError, "Requests to private network addresses are disallowed (tried to query #{e.host})" rescue Mastodon::HostValidationError, ActivityPub::FetchRemoteActorService::Error, Webfinger::Error => e - raise Mastodon::SignatureVerificationError, e.message + raise SignatureVerificationError, e.message end end diff --git a/app/controllers/concerns/web_app_controller_concern.rb b/app/controllers/concerns/web_app_controller_concern.rb index ec2256aa9c..b8c909877b 100644 --- a/app/controllers/concerns/web_app_controller_concern.rb +++ b/app/controllers/concerns/web_app_controller_concern.rb @@ -7,27 +7,21 @@ module WebAppControllerConcern vary_by 'Accept, Accept-Language, Cookie' before_action :redirect_unauthenticated_to_permalinks! - before_action :set_referer_header - - content_security_policy do |p| - policy = ContentSecurityPolicy.new - - if policy.sso_host.present? - p.form_action policy.sso_host, -> { "https://#{request.host}/auth/auth/" } - else - p.form_action :none - end - end + before_action :set_app_body_class end def skip_csrf_meta_tags? !(ENV['ONE_CLICK_SSO_LOGIN'] == 'true' && ENV['OMNIAUTH_ONLY'] == 'true' && Devise.omniauth_providers.length == 1) && current_user.nil? end + def set_app_body_class + @body_classes = 'app-body' + end + def redirect_unauthenticated_to_permalinks! return if user_signed_in? && current_account.moved_to_account_id.nil? - permalink_redirector = PermalinkRedirector.new(request.original_fullpath) + permalink_redirector = PermalinkRedirector.new(request.path) return if permalink_redirector.redirect_path.blank? expires_in(15.seconds, public: true, stale_while_revalidate: 30.seconds, stale_if_error: 1.day) unless user_signed_in? @@ -42,10 +36,4 @@ module WebAppControllerConcern end end end - - protected - - def set_referer_header - response.set_header('Referrer-Policy', Setting.allow_referrer_origin ? 'strict-origin-when-cross-origin' : 'same-origin') - end end diff --git a/app/controllers/custom_css_controller.rb b/app/controllers/custom_css_controller.rb index 5b98914114..eb6417698a 100644 --- a/app/controllers/custom_css_controller.rb +++ b/app/controllers/custom_css_controller.rb @@ -1,8 +1,10 @@ # frozen_string_literal: true class CustomCssController < ActionController::Base # rubocop:disable Rails/ApplicationController + before_action :set_user_roles + def show - expires_in 1.month, public: true + expires_in 3.minutes, public: true render content_type: 'text/css' end @@ -12,4 +14,8 @@ class CustomCssController < ActionController::Base # rubocop:disable Rails/Appli Setting.custom_css end helper_method :custom_css_styles + + def set_user_roles + @user_roles = UserRole.providing_styles + end end diff --git a/app/controllers/disputes/appeals_controller.rb b/app/controllers/disputes/appeals_controller.rb index 797f31cf78..98b58d2117 100644 --- a/app/controllers/disputes/appeals_controller.rb +++ b/app/controllers/disputes/appeals_controller.rb @@ -21,6 +21,6 @@ class Disputes::AppealsController < Disputes::BaseController end def appeal_params - params.expect(appeal: [:text]) + params.require(:appeal).permit(:text) end end diff --git a/app/controllers/disputes/base_controller.rb b/app/controllers/disputes/base_controller.rb index 07677fd3f3..1054f3db80 100644 --- a/app/controllers/disputes/base_controller.rb +++ b/app/controllers/disputes/base_controller.rb @@ -7,5 +7,17 @@ class Disputes::BaseController < ApplicationController skip_before_action :require_functional! + before_action :set_body_classes before_action :authenticate_user! + before_action :set_cache_headers + + private + + def set_body_classes + @body_classes = 'admin' + end + + def set_cache_headers + response.cache_control.replace(private: true, no_store: true) + end end diff --git a/app/controllers/filters/statuses_controller.rb b/app/controllers/filters/statuses_controller.rb index d85b017aaa..94993f938b 100644 --- a/app/controllers/filters/statuses_controller.rb +++ b/app/controllers/filters/statuses_controller.rb @@ -6,6 +6,8 @@ class Filters::StatusesController < ApplicationController before_action :authenticate_user! before_action :set_filter before_action :set_status_filters + before_action :set_body_classes + before_action :set_cache_headers PER_PAGE = 20 @@ -33,10 +35,18 @@ class Filters::StatusesController < ApplicationController end def status_filter_batch_action_params - params.expect(form_status_filter_batch_action: [status_filter_ids: []]) + params.require(:form_status_filter_batch_action).permit(status_filter_ids: []) end def action_from_button 'remove' if params[:remove] end + + def set_body_classes + @body_classes = 'admin' + end + + def set_cache_headers + response.cache_control.replace(private: true, no_store: true) + end end diff --git a/app/controllers/filters_controller.rb b/app/controllers/filters_controller.rb index 20b8135908..0b7f9f9e68 100644 --- a/app/controllers/filters_controller.rb +++ b/app/controllers/filters_controller.rb @@ -5,6 +5,8 @@ class FiltersController < ApplicationController before_action :authenticate_user! before_action :set_filter, only: [:edit, :update, :destroy] + before_action :set_body_classes + before_action :set_cache_headers def index @filters = current_account.custom_filters.includes(:keywords, :statuses).order(:phrase) @@ -47,6 +49,14 @@ class FiltersController < ApplicationController end def resource_params - params.expect(custom_filter: [:title, :expires_in, :filter_action, :exclude_follows, :exclude_localusers, :exclude_quote, :exclude_profile, context: [], keywords_attributes: [[:id, :keyword, :whole_word, :_destroy]]]) + params.require(:custom_filter).permit(:title, :expires_in, :filter_action, :exclude_follows, :exclude_localusers, :exclude_quote, context: [], keywords_attributes: [:id, :keyword, :whole_word, :_destroy]) + end + + def set_body_classes + @body_classes = 'admin' + end + + def set_cache_headers + response.cache_control.replace(private: true, no_store: true) end end diff --git a/app/controllers/follower_accounts_controller.rb b/app/controllers/follower_accounts_controller.rb index 85f6ccc5e4..44d90ec671 100644 --- a/app/controllers/follower_accounts_controller.rb +++ b/app/controllers/follower_accounts_controller.rb @@ -46,7 +46,7 @@ class FollowerAccountsController < ApplicationController end def page_url(page) - ActivityPub::TagManager.instance.followers_uri_for(@account, page: page) unless page.nil? + account_followers_url(@account, page: page) unless page.nil? end def next_page_url diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb index fc65333ac4..9bc5164d59 100644 --- a/app/controllers/invites_controller.rb +++ b/app/controllers/invites_controller.rb @@ -6,6 +6,8 @@ class InvitesController < ApplicationController layout 'admin' before_action :authenticate_user! + before_action :set_body_classes + before_action :set_cache_headers def index authorize :invite, :create? @@ -42,6 +44,14 @@ class InvitesController < ApplicationController end def resource_params - params.expect(invite: [:max_uses, :expires_in, :autofollow, :comment]) + params.require(:invite).permit(:max_uses, :expires_in, :autofollow, :comment) + end + + def set_body_classes + @body_classes = 'admin' + end + + def set_cache_headers + response.cache_control.replace(private: true, no_store: true) end end diff --git a/app/controllers/mail_subscriptions_controller.rb b/app/controllers/mail_subscriptions_controller.rb index 34df75f63a..1caeaaacf4 100644 --- a/app/controllers/mail_subscriptions_controller.rb +++ b/app/controllers/mail_subscriptions_controller.rb @@ -5,6 +5,7 @@ class MailSubscriptionsController < ApplicationController skip_before_action :require_functional! + before_action :set_body_classes before_action :set_user before_action :set_type @@ -24,6 +25,10 @@ class MailSubscriptionsController < ApplicationController not_found unless @user end + def set_body_classes + @body_classes = 'lighter' + end + def set_type @type = email_type_from_param end diff --git a/app/controllers/media_controller.rb b/app/controllers/media_controller.rb index 9d10468e69..53eee40012 100644 --- a/app/controllers/media_controller.rb +++ b/app/controllers/media_controller.rb @@ -19,7 +19,9 @@ class MediaController < ApplicationController redirect_to @media_attachment.file.url(:original) end - def player; end + def player + @body_classes = 'player' + end private diff --git a/app/controllers/media_proxy_controller.rb b/app/controllers/media_proxy_controller.rb index f68d85e44e..c4230d62c3 100644 --- a/app/controllers/media_proxy_controller.rb +++ b/app/controllers/media_proxy_controller.rb @@ -13,7 +13,7 @@ class MediaProxyController < ApplicationController rescue_from ActiveRecord::RecordInvalid, with: :not_found rescue_from Mastodon::UnexpectedResponseError, with: :not_found rescue_from Mastodon::NotPermittedError, with: :not_found - rescue_from(*Mastodon::HTTP_CONNECTION_ERRORS, with: :internal_server_error) + rescue_from HTTP::TimeoutError, HTTP::ConnectionError, OpenSSL::SSL::SSLError, with: :internal_server_error def show with_redis_lock("media_download:#{params[:id]}") do diff --git a/app/controllers/oauth/authorizations_controller.rb b/app/controllers/oauth/authorizations_controller.rb index deafedeaef..66e774425d 100644 --- a/app/controllers/oauth/authorizations_controller.rb +++ b/app/controllers/oauth/authorizations_controller.rb @@ -5,6 +5,7 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController before_action :store_current_location before_action :authenticate_resource_owner! + before_action :set_cache_headers content_security_policy do |p| p.form_action(false) @@ -31,4 +32,8 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController def truthy_param?(key) ActiveModel::Type::Boolean.new.cast(params[key]) end + + def set_cache_headers + response.cache_control.replace(private: true, no_store: true) + end end diff --git a/app/controllers/oauth/authorized_applications_controller.rb b/app/controllers/oauth/authorized_applications_controller.rb index 8b11a519ea..7bb22453ca 100644 --- a/app/controllers/oauth/authorized_applications_controller.rb +++ b/app/controllers/oauth/authorized_applications_controller.rb @@ -6,6 +6,8 @@ class Oauth::AuthorizedApplicationsController < Doorkeeper::AuthorizedApplicatio before_action :store_current_location before_action :authenticate_resource_owner! before_action :require_not_suspended!, only: :destroy + before_action :set_body_classes + before_action :set_cache_headers before_action :set_last_used_at_by_app, only: :index, unless: -> { request.format == :json } @@ -21,6 +23,10 @@ class Oauth::AuthorizedApplicationsController < Doorkeeper::AuthorizedApplicatio private + def set_body_classes + @body_classes = 'admin' + end + def store_current_location store_location_for(:user, request.url) end @@ -29,7 +35,17 @@ class Oauth::AuthorizedApplicationsController < Doorkeeper::AuthorizedApplicatio forbidden if current_account.unavailable? end + def set_cache_headers + response.cache_control.replace(private: true, no_store: true) + end + def set_last_used_at_by_app - @last_used_at_by_app = current_resource_owner.applications_last_used + @last_used_at_by_app = Doorkeeper::AccessToken + .select('DISTINCT ON (application_id) application_id, last_used_at') + .where(resource_owner_id: current_resource_owner.id) + .where.not(last_used_at: nil) + .order(application_id: :desc, last_used_at: :desc) + .pluck(:application_id, :last_used_at) + .to_h end end diff --git a/app/controllers/oauth/userinfo_controller.rb b/app/controllers/oauth/userinfo_controller.rb deleted file mode 100644 index e268b70dcc..0000000000 --- a/app/controllers/oauth/userinfo_controller.rb +++ /dev/null @@ -1,11 +0,0 @@ -# frozen_string_literal: true - -class Oauth::UserinfoController < Api::BaseController - before_action -> { doorkeeper_authorize! :profile }, only: [:show] - before_action :require_user! - - def show - @account = current_account - render json: @account, serializer: OauthUserinfoSerializer - end -end diff --git a/app/controllers/redirect/base_controller.rb b/app/controllers/redirect/base_controller.rb index 34558a4126..90894ec1ed 100644 --- a/app/controllers/redirect/base_controller.rb +++ b/app/controllers/redirect/base_controller.rb @@ -4,6 +4,7 @@ class Redirect::BaseController < ApplicationController vary_by 'Accept-Language' before_action :set_resource + before_action :set_app_body_class def show @redirect_path = ActivityPub::TagManager.instance.url_for(@resource) @@ -13,6 +14,10 @@ class Redirect::BaseController < ApplicationController private + def set_app_body_class + @body_classes = 'app-body' + end + def set_resource raise NotImplementedError end diff --git a/app/controllers/relationships_controller.rb b/app/controllers/relationships_controller.rb index 7e793fc734..dd794f3199 100644 --- a/app/controllers/relationships_controller.rb +++ b/app/controllers/relationships_controller.rb @@ -6,6 +6,8 @@ class RelationshipsController < ApplicationController before_action :authenticate_user! before_action :set_accounts, only: :show before_action :set_relationships, only: :show + before_action :set_body_classes + before_action :set_cache_headers helper_method :following_relationship?, :followed_by_relationship?, :mutual_relationship? @@ -35,7 +37,7 @@ class RelationshipsController < ApplicationController end def form_account_batch_params - params.expect(form_account_batch: [:action, account_ids: []]) + params.require(:form_account_batch).permit(:action, account_ids: []) end def following_relationship? @@ -65,4 +67,12 @@ class RelationshipsController < ApplicationController 'remove_domains_from_followers' end end + + def set_body_classes + @body_classes = 'admin' + end + + def set_cache_headers + response.cache_control.replace(private: true, no_store: true) + end end diff --git a/app/controllers/settings/aliases_controller.rb b/app/controllers/settings/aliases_controller.rb index c21d43eeb3..a421b8ede3 100644 --- a/app/controllers/settings/aliases_controller.rb +++ b/app/controllers/settings/aliases_controller.rb @@ -30,7 +30,7 @@ class Settings::AliasesController < Settings::BaseController private def resource_params - params.expect(account_alias: [:acct]) + params.require(:account_alias).permit(:acct) end def set_alias diff --git a/app/controllers/settings/applications_controller.rb b/app/controllers/settings/applications_controller.rb index 8e39741f89..d6573f9b49 100644 --- a/app/controllers/settings/applications_controller.rb +++ b/app/controllers/settings/applications_controller.rb @@ -2,6 +2,7 @@ class Settings::ApplicationsController < Settings::BaseController before_action :set_application, only: [:show, :update, :destroy, :regenerate] + before_action :prepare_scopes, only: [:create, :update] def index @applications = current_user.applications.order(id: :desc).page(params[:page]) @@ -59,6 +60,16 @@ class Settings::ApplicationsController < Settings::BaseController end def application_params - params.expect(doorkeeper_application: [:name, :redirect_uri, :website, scopes: []]) + params.require(:doorkeeper_application).permit( + :name, + :redirect_uri, + :scopes, + :website + ) + end + + def prepare_scopes + scopes = params.fetch(:doorkeeper_application, {}).fetch(:scopes, nil) + params[:doorkeeper_application][:scopes] = scopes.join(' ') if scopes.is_a? Array end end diff --git a/app/controllers/settings/base_controller.rb b/app/controllers/settings/base_controller.rb index 7f2279aa8f..f15140aa2b 100644 --- a/app/controllers/settings/base_controller.rb +++ b/app/controllers/settings/base_controller.rb @@ -4,9 +4,19 @@ class Settings::BaseController < ApplicationController layout 'admin' before_action :authenticate_user! + before_action :set_body_classes + before_action :set_cache_headers private + def set_body_classes + @body_classes = 'admin' + end + + def set_cache_headers + response.cache_control.replace(private: true, no_store: true) + end + def require_not_suspended! forbidden if current_account.unavailable? end diff --git a/app/controllers/settings/deletes_controller.rb b/app/controllers/settings/deletes_controller.rb index 815d95ad83..16c201b6b3 100644 --- a/app/controllers/settings/deletes_controller.rb +++ b/app/controllers/settings/deletes_controller.rb @@ -21,7 +21,7 @@ class Settings::DeletesController < Settings::BaseController private def resource_params - params.expect(form_delete_confirmation: [:password, :username]) + params.require(:form_delete_confirmation).permit(:password, :username) end def require_not_suspended! diff --git a/app/controllers/settings/exports_controller.rb b/app/controllers/settings/exports_controller.rb index 263d20eaea..076ed5dadb 100644 --- a/app/controllers/settings/exports_controller.rb +++ b/app/controllers/settings/exports_controller.rb @@ -9,7 +9,7 @@ class Settings::ExportsController < Settings::BaseController skip_before_action :require_functional! def show - @export_summary = ExportSummary.new(preloaded_account) + @export = Export.new(current_account) @backups = current_user.backups end @@ -25,15 +25,4 @@ class Settings::ExportsController < Settings::BaseController redirect_to settings_export_path end - - private - - def preloaded_account - current_account.tap do |account| - ActiveRecord::Associations::Preloader.new( - records: [account], - associations: :account_stat - ).call - end - end end diff --git a/app/controllers/settings/featured_tags_controller.rb b/app/controllers/settings/featured_tags_controller.rb index 0f352e1913..90c112e219 100644 --- a/app/controllers/settings/featured_tags_controller.rb +++ b/app/controllers/settings/featured_tags_controller.rb @@ -5,8 +5,6 @@ class Settings::FeaturedTagsController < Settings::BaseController before_action :set_featured_tag, except: [:index, :create] before_action :set_recently_used_tags, only: :index - RECENT_TAGS_LIMIT = 10 - def index @featured_tag = FeaturedTag.new end @@ -40,10 +38,10 @@ class Settings::FeaturedTagsController < Settings::BaseController end def set_recently_used_tags - @recently_used_tags = Tag.suggestions_for_account(current_account).limit(RECENT_TAGS_LIMIT) + @recently_used_tags = Tag.suggestions_for_account(current_account).limit(10) end def featured_tag_params - params.expect(featured_tag: [:name]) + params.require(:featured_tag).permit(:name) end end diff --git a/app/controllers/settings/imports_controller.rb b/app/controllers/settings/imports_controller.rb index be1699315f..569aa07c53 100644 --- a/app/controllers/settings/imports_controller.rb +++ b/app/controllers/settings/imports_controller.rb @@ -24,8 +24,6 @@ class Settings::ImportsController < Settings::BaseController lists: false, }.freeze - RECENT_IMPORTS_LIMIT = 10 - def index @import = Form::Import.new(current_account: current_account) end @@ -90,7 +88,7 @@ class Settings::ImportsController < Settings::BaseController private def import_params - params.expect(form_import: [:data, :type, :mode]) + params.require(:form_import).permit(:data, :type, :mode) end def set_bulk_import @@ -98,6 +96,6 @@ class Settings::ImportsController < Settings::BaseController end def set_recent_imports - @recent_imports = current_account.bulk_imports.reorder(id: :desc).limit(RECENT_IMPORTS_LIMIT) + @recent_imports = current_account.bulk_imports.reorder(id: :desc).limit(10) end end diff --git a/app/controllers/settings/migration/redirects_controller.rb b/app/controllers/settings/migration/redirects_controller.rb index d850e05e94..6d469f3842 100644 --- a/app/controllers/settings/migration/redirects_controller.rb +++ b/app/controllers/settings/migration/redirects_controller.rb @@ -33,6 +33,6 @@ class Settings::Migration::RedirectsController < Settings::BaseController private def resource_params - params.expect(form_redirect: [:acct, :current_password, :current_username]) + params.require(:form_redirect).permit(:acct, :current_password, :current_username) end end diff --git a/app/controllers/settings/migrations_controller.rb b/app/controllers/settings/migrations_controller.rb index 92e3611fd9..62603aba81 100644 --- a/app/controllers/settings/migrations_controller.rb +++ b/app/controllers/settings/migrations_controller.rb @@ -27,7 +27,7 @@ class Settings::MigrationsController < Settings::BaseController private def resource_params - params.expect(account_migration: [:acct, :current_password, :current_username]) + params.require(:account_migration).permit(:acct, :current_password, :current_username) end def set_migrations diff --git a/app/controllers/settings/pictures_controller.rb b/app/controllers/settings/pictures_controller.rb index 7e61e6d580..58a4325307 100644 --- a/app/controllers/settings/pictures_controller.rb +++ b/app/controllers/settings/pictures_controller.rb @@ -8,7 +8,7 @@ module Settings def destroy if valid_picture? if UpdateAccountService.new.call(@account, { @picture => nil, "#{@picture}_remote_url" => '' }) - ActivityPub::UpdateDistributionWorker.perform_in(ActivityPub::UpdateDistributionWorker::DEBOUNCE_DELAY, @account.id) + ActivityPub::UpdateDistributionWorker.perform_async(@account.id) redirect_to settings_profile_path, notice: I18n.t('generic.changes_saved_msg'), status: 303 else redirect_to settings_profile_path diff --git a/app/controllers/settings/preferences/base_controller.rb b/app/controllers/settings/preferences/base_controller.rb index c2e705da3c..ce6e2bba44 100644 --- a/app/controllers/settings/preferences/base_controller.rb +++ b/app/controllers/settings/preferences/base_controller.rb @@ -25,10 +25,10 @@ class Settings::Preferences::BaseController < Settings::BaseController end def original_user_params - params.expect(user: [:locale, :time_zone, :custom_css_text, chosen_languages: [], settings_attributes: UserSettings.keys]) + params.require(:user).permit(:locale, :time_zone, chosen_languages: [], settings_attributes: UserSettings.keys) end def disabled_visibilities_params - params.expect(user: [settings_attributes: { enabled_visibilities: [] }]) + params.require(:user).permit(settings_attributes: { enabled_visibilities: [] }) end end diff --git a/app/controllers/settings/preferences/custom_css_controller.rb b/app/controllers/settings/preferences/custom_css_controller.rb deleted file mode 100644 index 6a7369ec49..0000000000 --- a/app/controllers/settings/preferences/custom_css_controller.rb +++ /dev/null @@ -1,9 +0,0 @@ -# frozen_string_literal: true - -class Settings::Preferences::CustomCssController < Settings::Preferences::BaseController - private - - def after_update_redirect_path - settings_preferences_custom_css_path - end -end diff --git a/app/controllers/settings/privacy_controller.rb b/app/controllers/settings/privacy_controller.rb index 96efa03ccf..1102c89fad 100644 --- a/app/controllers/settings/privacy_controller.rb +++ b/app/controllers/settings/privacy_controller.rb @@ -8,7 +8,7 @@ class Settings::PrivacyController < Settings::BaseController def update if UpdateAccountService.new.call(@account, account_params.except(:settings)) current_user.update!(settings_attributes: account_params[:settings]) - ActivityPub::UpdateDistributionWorker.perform_in(ActivityPub::UpdateDistributionWorker::DEBOUNCE_DELAY, @account.id) + ActivityPub::UpdateDistributionWorker.perform_async(@account.id) redirect_to settings_privacy_path, notice: I18n.t('generic.changes_saved_msg') else render :show @@ -18,7 +18,7 @@ class Settings::PrivacyController < Settings::BaseController private def account_params - params.expect(account: [:discoverable, :unlocked, :indexable, :show_collections, settings: UserSettings.keys]) + params.require(:account).permit(:discoverable, :unlocked, :indexable, :show_collections, settings: UserSettings.keys) end def set_account diff --git a/app/controllers/settings/privacy_extra_controller.rb b/app/controllers/settings/privacy_extra_controller.rb index f1292e644c..49c71d5071 100644 --- a/app/controllers/settings/privacy_extra_controller.rb +++ b/app/controllers/settings/privacy_extra_controller.rb @@ -18,7 +18,7 @@ class Settings::PrivacyExtraController < Settings::BaseController private def account_params - params.expect(account: [settings: UserSettings.keys]) + params.require(:account).permit(:subscription_policy, settings: UserSettings.keys) end def set_account diff --git a/app/controllers/settings/profiles_controller.rb b/app/controllers/settings/profiles_controller.rb index 04a10fbfb9..a023b073b3 100644 --- a/app/controllers/settings/profiles_controller.rb +++ b/app/controllers/settings/profiles_controller.rb @@ -9,7 +9,7 @@ class Settings::ProfilesController < Settings::BaseController def update if UpdateAccountService.new.call(@account, account_params) - ActivityPub::UpdateDistributionWorker.perform_in(ActivityPub::UpdateDistributionWorker::DEBOUNCE_DELAY, @account.id) + ActivityPub::UpdateDistributionWorker.perform_async(@account.id) redirect_to settings_profile_path, notice: I18n.t('generic.changes_saved_msg') else @account.build_fields @@ -20,7 +20,8 @@ class Settings::ProfilesController < Settings::BaseController private def account_params - params.expect(account: [:display_name, :note, :bio_markdown, :avatar, :header, :bot, :my_actor_type, fields_attributes: [[:name, :value]]]) + # params.require(:account).permit(:display_name, :note, :bio_markdown, :avatar, :header, :locked, :my_actor_type, :searchability, :dissubscribable, :discoverable, :discoverable_local, :hide_collections, fields_attributes: [:name, :value]) + params.require(:account).permit(:display_name, :note, :bio_markdown, :avatar, :header, :bot, :my_actor_type, :dissubscribable, fields_attributes: [:name, :value]) end def set_account diff --git a/app/controllers/settings/two_factor_authentication/confirmations_controller.rb b/app/controllers/settings/two_factor_authentication/confirmations_controller.rb index eae990e79b..1a0afe58b0 100644 --- a/app/controllers/settings/two_factor_authentication/confirmations_controller.rb +++ b/app/controllers/settings/two_factor_authentication/confirmations_controller.rb @@ -38,7 +38,7 @@ module Settings private def confirmation_params - params.expect(form_two_factor_confirmation: [:otp_attempt]) + params.require(:form_two_factor_confirmation).permit(:otp_attempt) end def prepare_two_factor_form diff --git a/app/controllers/settings/two_factor_authentication/otp_authentication_controller.rb b/app/controllers/settings/two_factor_authentication/otp_authentication_controller.rb index ca8d46afe4..0bff01ec27 100644 --- a/app/controllers/settings/two_factor_authentication/otp_authentication_controller.rb +++ b/app/controllers/settings/two_factor_authentication/otp_authentication_controller.rb @@ -15,7 +15,7 @@ module Settings end def create - session[:new_otp_secret] = User.generate_otp_secret + session[:new_otp_secret] = User.generate_otp_secret(32) redirect_to new_settings_two_factor_authentication_confirmation_path end diff --git a/app/controllers/settings/verifications_controller.rb b/app/controllers/settings/verifications_controller.rb index 4b949ca72d..fc4f23bb18 100644 --- a/app/controllers/settings/verifications_controller.rb +++ b/app/controllers/settings/verifications_controller.rb @@ -2,32 +2,14 @@ class Settings::VerificationsController < Settings::BaseController before_action :set_account - before_action :set_verified_links - def show; end - - def update - if UpdateAccountService.new.call(@account, account_params) - ActivityPub::UpdateDistributionWorker.perform_in(ActivityPub::UpdateDistributionWorker::DEBOUNCE_DELAY, @account.id) - redirect_to settings_verification_path, notice: I18n.t('generic.changes_saved_msg') - else - render :show - end + def show + @verified_links = @account.fields.select(&:verified?) end private - def account_params - params.expect(account: [:attribution_domains]).tap do |params| - params[:attribution_domains] = params[:attribution_domains].split if params[:attribution_domains] - end - end - def set_account @account = current_account end - - def set_verified_links - @verified_links = @account.fields.select(&:verified?) - end end diff --git a/app/controllers/severed_relationships_controller.rb b/app/controllers/severed_relationships_controller.rb index 817abebf62..168e85e3fe 100644 --- a/app/controllers/severed_relationships_controller.rb +++ b/app/controllers/severed_relationships_controller.rb @@ -4,6 +4,8 @@ class SeveredRelationshipsController < ApplicationController layout 'admin' before_action :authenticate_user! + before_action :set_body_classes + before_action :set_cache_headers before_action :set_event, only: [:following, :followers] @@ -48,4 +50,12 @@ class SeveredRelationshipsController < ApplicationController def acct(account) account.local? ? account.local_username_and_domain : account.acct end + + def set_body_classes + @body_classes = 'admin' + end + + def set_cache_headers + response.cache_control.replace(private: true, no_store: true) + end end diff --git a/app/controllers/shares_controller.rb b/app/controllers/shares_controller.rb index 1aa0ce5a0d..6546b84978 100644 --- a/app/controllers/shares_controller.rb +++ b/app/controllers/shares_controller.rb @@ -4,6 +4,13 @@ class SharesController < ApplicationController layout 'modal' before_action :authenticate_user! + before_action :set_body_classes def show; end + + private + + def set_body_classes + @body_classes = 'modal-layout compose-standalone' + end end diff --git a/app/controllers/statuses_cleanup_controller.rb b/app/controllers/statuses_cleanup_controller.rb index a25e544392..04c3c0e05c 100644 --- a/app/controllers/statuses_cleanup_controller.rb +++ b/app/controllers/statuses_cleanup_controller.rb @@ -5,6 +5,8 @@ class StatusesCleanupController < ApplicationController before_action :authenticate_user! before_action :set_policy + before_action :set_body_classes + before_action :set_cache_headers def show; end @@ -14,6 +16,8 @@ class StatusesCleanupController < ApplicationController else render :show end + rescue ActionController::ParameterMissing + # Do nothing end def require_functional! @@ -27,6 +31,14 @@ class StatusesCleanupController < ApplicationController end def resource_params - params.expect(account_statuses_cleanup_policy: [:enabled, :min_status_age, :keep_direct, :keep_pinned, :keep_polls, :keep_media, :keep_self_fav, :keep_self_bookmark, :keep_self_emoji, :min_favs, :min_reblogs, :min_emojis]) + params.require(:account_statuses_cleanup_policy).permit(:enabled, :min_status_age, :keep_direct, :keep_pinned, :keep_polls, :keep_media, :keep_self_fav, :keep_self_bookmark, :keep_self_emoji, :min_favs, :min_reblogs, :min_emojis) + end + + def set_body_classes + @body_classes = 'admin' + end + + def set_cache_headers + response.cache_control.replace(private: true, no_store: true) end end diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb index 4779f79c5a..be87161cc8 100644 --- a/app/controllers/statuses_controller.rb +++ b/app/controllers/statuses_controller.rb @@ -11,6 +11,7 @@ class StatusesController < ApplicationController before_action :require_account_signature!, only: [:show, :activity], if: -> { request.format == :json && authorized_fetch_mode? } before_action :set_status before_action :redirect_to_original, only: :show + before_action :set_body_classes, only: :embed after_action :set_link_headers @@ -50,10 +51,12 @@ class StatusesController < ApplicationController private + def set_body_classes + @body_classes = 'with-modals' + end + def set_link_headers - response.headers['Link'] = LinkHeader.new( - [[ActivityPub::TagManager.instance.uri_for(@status), [%w(rel alternate), %w(type application/activity+json)]]] - ).to_s + response.headers['Link'] = LinkHeader.new([[ActivityPub::TagManager.instance.uri_for(@status), [%w(rel alternate), %w(type application/activity+json)]]]) end def set_status @@ -76,9 +79,13 @@ class StatusesController < ApplicationController @misskey_software = false return false if !@status.local? || signed_request_account&.domain.blank? || !@status.sending_maybe_compromised_privacy? + return @misskey_software = true if DomainBlock.detect_invalid_subscription?(signed_request_account.domain) - @misskey_software = InstanceInfo.invalid_subscription_software?(signed_request_account.domain) + info = InstanceInfo.find_by(domain: signed_request_account.domain) + return false if info.nil? + + @misskey_software = %w(misskey calckey cherrypick sharkey).include?(info.software) end def status_activity_serializer diff --git a/app/controllers/system_css_controller.rb b/app/controllers/system_css_controller.rb deleted file mode 100644 index dd90491894..0000000000 --- a/app/controllers/system_css_controller.rb +++ /dev/null @@ -1,8 +0,0 @@ -# frozen_string_literal: true - -class SystemCssController < ActionController::Base # rubocop:disable Rails/ApplicationController - def show - expires_in 3.minutes, public: true - render content_type: 'text/css' - end -end diff --git a/app/controllers/terms_of_service_controller.rb b/app/controllers/terms_of_service_controller.rb deleted file mode 100644 index 672fb07915..0000000000 --- a/app/controllers/terms_of_service_controller.rb +++ /dev/null @@ -1,11 +0,0 @@ -# frozen_string_literal: true - -class TermsOfServiceController < ApplicationController - include WebAppControllerConcern - - skip_before_action :require_functional! - - def show - expires_in(15.seconds, public: true, stale_while_revalidate: 30.seconds, stale_if_error: 1.day) unless user_signed_in? - end -end diff --git a/app/controllers/user_custom_css_controller.rb b/app/controllers/user_custom_css_controller.rb deleted file mode 100644 index 2535e07c03..0000000000 --- a/app/controllers/user_custom_css_controller.rb +++ /dev/null @@ -1,16 +0,0 @@ -# frozen_string_literal: true - -class UserCustomCssController < ActionController::Base # rubocop:disable Rails/ApplicationController - before_action :authenticate_user! - - def show - render content_type: 'text/css' - end - - private - - def user_custom_css - current_user.custom_css_text - end - helper_method :user_custom_css -end diff --git a/app/controllers/well_known/host_meta_controller.rb b/app/controllers/well_known/host_meta_controller.rb index 6dee587baf..201da9fbc3 100644 --- a/app/controllers/well_known/host_meta_controller.rb +++ b/app/controllers/well_known/host_meta_controller.rb @@ -7,23 +7,7 @@ module WellKnown def show @webfinger_template = "#{webfinger_url}?resource={uri}" expires_in 3.days, public: true - - respond_to do |format| - format.any do - render content_type: 'application/xrd+xml', formats: [:xml] - end - - format.json do - render json: { - links: [ - { - rel: 'lrdd', - template: @webfinger_template, - }, - ], - } - end - end + render content_type: 'application/xrd+xml', formats: [:xml] end end end diff --git a/app/helpers/accounts_helper.rb b/app/helpers/accounts_helper.rb index bdb6ca979c..6136c82ce7 100644 --- a/app/helpers/accounts_helper.rb +++ b/app/helpers/accounts_helper.rb @@ -19,6 +19,14 @@ module AccountsHelper end end + def account_action_button(account) + return if account.memorial? || account.moved? + + link_to ActivityPub::TagManager.instance.url_for(account), class: 'button logo-button', target: '_new' do + safe_join([logo_as_symbol, t('accounts.follow')]) + end + end + def account_formatted_stat(value) number_to_human(value, precision: 3, strip_insignificant_zeros: true) end diff --git a/app/helpers/admin/account_moderation_notes_helper.rb b/app/helpers/admin/account_moderation_notes_helper.rb index 7c931c1157..2a3d954a35 100644 --- a/app/helpers/admin/account_moderation_notes_helper.rb +++ b/app/helpers/admin/account_moderation_notes_helper.rb @@ -12,12 +12,12 @@ module Admin::AccountModerationNotesHelper ) end - def admin_account_inline_link_to(account, path: nil) + def admin_account_inline_link_to(account) return if account.nil? link_to( account_inline_text(account), - path || admin_account_path(account.id), + admin_account_path(account.id), class: class_names('inline-name-tag', suspended: suspended_account?(account)), title: account.acct ) diff --git a/app/helpers/admin/action_logs_helper.rb b/app/helpers/admin/action_logs_helper.rb index 07381cc6ad..f3bf60d830 100644 --- a/app/helpers/admin/action_logs_helper.rb +++ b/app/helpers/admin/action_logs_helper.rb @@ -35,15 +35,6 @@ module Admin::ActionLogsHelper else I18n.t('admin.action_logs.deleted_account') end - when 'Relay' - link_to log.human_identifier, admin_relays_path end end - - def sorted_action_log_types - Admin::ActionLogFilter::ACTION_TYPE_MAP - .keys - .map { |key| [I18n.t("admin.action_logs.action_types.#{key}"), key] } - .sort_by(&:first) - end end diff --git a/app/helpers/admin/dashboard_helper.rb b/app/helpers/admin/dashboard_helper.rb index f87fdad708..6096ff1381 100644 --- a/app/helpers/admin/dashboard_helper.rb +++ b/app/helpers/admin/dashboard_helper.rb @@ -18,11 +18,6 @@ module Admin::DashboardHelper end end - def date_range(range) - [l(range.first), l(range.last)] - .join(' - ') - end - def relevant_account_timestamp(account) timestamp, exact = if account.user_current_sign_in_at && account.user_current_sign_in_at < 24.hours.ago [account.user_current_sign_in_at, true] @@ -30,8 +25,6 @@ module Admin::DashboardHelper [account.user_current_sign_in_at, false] elsif account.user_pending? [account.user_created_at, true] - elsif account.suspended_at.present? && account.local? && account.user.nil? - [account.suspended_at, true] elsif account.last_status_at.present? [account.last_status_at, true] else diff --git a/app/helpers/admin/filter_helper.rb b/app/helpers/admin/filter_helper.rb index 40806a4515..140fc73ede 100644 --- a/app/helpers/admin/filter_helper.rb +++ b/app/helpers/admin/filter_helper.rb @@ -25,7 +25,7 @@ module Admin::FilterHelper end def table_link_to(icon, text, path, **options) - link_to safe_join([material_symbol(icon), text]), path, options.merge(class: 'table-action-link') + link_to safe_join([fa_icon(icon), text]), path, options.merge(class: 'table-action-link') end def selected?(more_params) diff --git a/app/helpers/admin/settings_helper.rb b/app/helpers/admin/settings_helper.rb index 9b950d5a63..6937331e1a 100644 --- a/app/helpers/admin/settings_helper.rb +++ b/app/helpers/admin/settings_helper.rb @@ -2,7 +2,7 @@ module Admin::SettingsHelper def captcha_available? - Rails.configuration.x.captcha.secret_key.present? && Rails.configuration.x.captcha.site_key.present? + ENV['HCAPTCHA_SECRET_KEY'].present? && ENV['HCAPTCHA_SITE_KEY'].present? end def login_activity_title(activity) diff --git a/app/helpers/admin/tags_helper.rb b/app/helpers/admin/tags_helper.rb deleted file mode 100644 index eb928a6db2..0000000000 --- a/app/helpers/admin/tags_helper.rb +++ /dev/null @@ -1,15 +0,0 @@ -# frozen_string_literal: true - -module Admin::TagsHelper - def admin_tags_moderation_options - [ - [t('admin.tags.moderation.reviewed'), 'reviewed'], - [t('admin.tags.moderation.review_requested'), 'review_requested'], - [t('admin.tags.moderation.unreviewed'), 'unreviewed'], - [t('admin.tags.moderation.trendable'), 'trendable'], - [t('admin.tags.moderation.not_trendable'), 'not_trendable'], - [t('admin.tags.moderation.usable'), 'usable'], - [t('admin.tags.moderation.not_usable'), 'not_usable'], - ] - end -end diff --git a/app/helpers/admin/trends/statuses_helper.rb b/app/helpers/admin/trends/statuses_helper.rb index 33da1f7216..79fee44dc4 100644 --- a/app/helpers/admin/trends/statuses_helper.rb +++ b/app/helpers/admin/trends/statuses_helper.rb @@ -2,18 +2,11 @@ module Admin::Trends::StatusesHelper def one_line_preview(status) - text = begin - if status.local? - status.text.split("\n").first - else - Nokogiri::HTML5(status.text).css('html > body > *').first&.text - end - rescue ArgumentError - # This can happen if one of the Nokogumbo limits is encountered - # Unfortunately, it does not use a more precise error class - # nor allows more graceful handling - '' - end + text = if status.local? + status.text.split("\n").first + else + Nokogiri::HTML(status.text).css('html > body > *').first&.text + end return '' if text.blank? diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 0d7d0e8117..b75c995864 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -3,6 +3,12 @@ module ApplicationHelper include RegistrationLimitationHelper + DANGEROUS_SCOPES = %w( + read + write + follow + ).freeze + RTL_LOCALES = %i( ar ckb @@ -81,8 +87,8 @@ module ApplicationHelper def html_title safe_join( - [content_for(:page_title), title] - .compact_blank, + [content_for(:page_title).to_s.chomp, title] + .select(&:present?), ' - ' ) end @@ -91,11 +97,8 @@ module ApplicationHelper Rails.env.production? ? site_title : "#{site_title} (Dev)" end - def label_for_scope(scope) - safe_join [ - tag.samp(scope, class: { 'scope-danger' => SessionActivation::DEFAULT_SCOPES.include?(scope.to_s) }), - tag.span(t("doorkeeper.scopes.#{scope}"), class: :hint), - ] + def class_for_scope(scope) + 'scope-danger' if DANGEROUS_SCOPES.include?(scope.to_s) end def can?(action, record) @@ -104,17 +107,19 @@ module ApplicationHelper policy(record).public_send(:"#{action}?") end + def fa_icon(icon, attributes = {}) + class_names = attributes[:class]&.split || [] + class_names << 'fa' + class_names += icon.split.map { |cl| "fa-#{cl}" } + + content_tag(:i, nil, attributes.merge(class: class_names.join(' '))) + end + def material_symbol(icon, attributes = {}) - safe_join( - [ - inline_svg_tag( - "400-24px/#{icon}.svg", - class: ['icon', "material-#{icon}"].concat(attributes[:class].to_s.split), - role: :img, - data: attributes[:data] - ), - ' ', - ] + inline_svg_tag( + "400-24px/#{icon}.svg", + class: %w(icon).concat(attributes[:class].to_s.split), + role: :img ) end @@ -122,13 +127,29 @@ module ApplicationHelper inline_svg_tag 'check.svg' end + def visibility_icon(status) + if status.public_visibility? + fa_icon('globe', title: I18n.t('statuses.visibilities.public')) + elsif status.unlisted_visibility? + fa_icon('unlock', title: I18n.t('statuses.visibilities.unlisted')) + elsif status.public_unlisted_visibility? + fa_icon('cloud', title: I18n.t('statuses.visibilities.public_unlisted')) + elsif status.login_visibility? + fa_icon('key', title: I18n.t('statuses.visibilities.login')) + elsif status.private_visibility? || status.limited_visibility? + fa_icon('lock', title: I18n.t('statuses.visibilities.private')) + elsif status.direct_visibility? + fa_icon('at', title: I18n.t('statuses.visibilities.direct')) + end + end + def interrelationships_icon(relationships, account_id) if relationships.following[account_id] && relationships.followed_by[account_id] - material_symbol('sync_alt', title: I18n.t('relationships.mutual'), class: 'active passive') + fa_icon('exchange', title: I18n.t('relationships.mutual'), class: 'fa-fw active passive') elsif relationships.following[account_id] - material_symbol(locale_direction == 'ltr' ? 'arrow_right_alt' : 'arrow_left_alt', title: I18n.t('relationships.following'), class: 'active') + fa_icon(locale_direction == 'ltr' ? 'arrow-right' : 'arrow-left', title: I18n.t('relationships.following'), class: 'fa-fw active') elsif relationships.followed_by[account_id] - material_symbol(locale_direction == 'ltr' ? 'arrow_left_alt' : 'arrow_right_alt', title: I18n.t('relationships.followers'), class: 'passive') + fa_icon(locale_direction == 'ltr' ? 'arrow-left' : 'arrow-right', title: I18n.t('relationships.followers'), class: 'fa-fw passive') end end @@ -145,14 +166,11 @@ module ApplicationHelper end def body_classes - output = [] - output << content_for(:body_classes) + output = body_class_string.split output << "theme-#{current_theme.parameterize}" output << 'system-font' if current_account&.user&.setting_system_font_ui - output << 'custom-scrollbars' unless current_account&.user&.setting_system_scrollbars_ui output << (current_account&.user&.setting_reduce_motion ? 'reduce-motion' : 'no-reduce-motion') output << 'rtl' if locale_direction == 'rtl' - output << "content-font-size__#{current_account&.user&.setting_content_font_size}" output.compact_blank.join(' ') end @@ -232,43 +250,28 @@ module ApplicationHelper EmojiFormatter.new(html, custom_emojis, other_options.merge(animate: prefers_autoplay?)).to_s end + def prerender_custom_emojis_from_hash(html, custom_emojis_hash) + prerender_custom_emojis(html, JSON.parse([custom_emojis_hash].to_json, object_class: OpenStruct)) # rubocop:disable Style/OpenStructUse + end + def mascot_url full_asset_url(instance_presenter.mascot&.file&.url || frontend_asset_path('images/elephant_ui_plane.svg')) end - def server_css? - return true if current_account&.user.nil? - - current_account.user.setting_use_server_css + def instance_presenter + @instance_presenter ||= InstancePresenter.new end - def user_custom_css? - return false if current_account&.user.nil? - - current_account.user.setting_use_custom_css && current_account.user.custom_css_text.present? + def favicon_path(size = '48') + instance_presenter.favicon&.file&.url(size) end - def user_custom_css_version - return '0' if current_account&.user&.custom_css.nil? - - current_account&.user&.custom_css&.updated_at.to_s + def app_icon_path(size = '48') + instance_presenter.app_icon&.file&.url(size) end - def copyable_input(options = {}) - tag.input(type: :text, maxlength: 999, spellcheck: false, readonly: true, **options) - end - - def recent_tag_usage(tag) - people = tag.history.aggregate(2.days.ago.to_date..Time.zone.today).accounts - I18n.t 'user_mailer.welcome.hashtags_recent_count', people: number_with_delimiter(people), count: people - end - - def app_store_url_ios - 'https://apps.apple.com/app/mastodon-for-iphone-and-ipad/id1571998974' - end - - def app_store_url_android - 'https://play.google.com/store/apps/details?id=org.joinmastodon.android' + def use_mask_icon? + instance_presenter.app_icon.blank? end private diff --git a/app/helpers/context_helper.rb b/app/helpers/context_helper.rb index 077c5272a5..804c48c7b0 100644 --- a/app/helpers/context_helper.rb +++ b/app/helpers/context_helper.rb @@ -32,9 +32,24 @@ module ContextHelper quote_uri: { 'fedibird' => 'http://fedibird.com/ns#', 'quoteUri' => 'fedibird:quoteUri' }, keywords: { 'schema' => 'http://schema.org#', 'keywords' => 'schema:keywords' }, license: { 'schema' => 'http://schema.org#', 'license' => 'schema:license' }, + olm: { + 'toot' => 'http://joinmastodon.org/ns#', + 'Device' => 'toot:Device', + 'Ed25519Signature' => 'toot:Ed25519Signature', + 'Ed25519Key' => 'toot:Ed25519Key', + 'Curve25519Key' => 'toot:Curve25519Key', + 'EncryptedMessage' => 'toot:EncryptedMessage', + 'publicKeyBase64' => 'toot:publicKeyBase64', + 'deviceId' => 'toot:deviceId', + 'claim' => { '@type' => '@id', '@id' => 'toot:claim' }, + 'fingerprintKey' => { '@type' => '@id', '@id' => 'toot:fingerprintKey' }, + 'identityKey' => { '@type' => '@id', '@id' => 'toot:identityKey' }, + 'devices' => { '@type' => '@id', '@id' => 'toot:devices' }, + 'messageFranking' => 'toot:messageFranking', + 'messageType' => 'toot:messageType', + 'cipherText' => 'toot:cipherText', + }, suspended: { 'toot' => 'http://joinmastodon.org/ns#', 'suspended' => 'toot:suspended' }, - attribution_domains: { 'toot' => 'http://joinmastodon.org/ns#', 'attributionDomains' => { '@id' => 'toot:attributionDomains', '@type' => '@id' } }, - misskey_license: { 'misskey' => 'https://misskey-hub.net/ns#', '_misskey_license' => 'misskey:_misskey_license' }, }.freeze def full_context diff --git a/app/helpers/follow_helper.rb b/app/helpers/follow_helper.rb index a02e2a8832..d7d7ff35e9 100644 --- a/app/helpers/follow_helper.rb +++ b/app/helpers/follow_helper.rb @@ -27,6 +27,9 @@ module FollowHelper def proxyable_software?(account) return false if account.local? - InstanceInfo.proxy_account_software?(account.domain) + info = InstanceInfo.find_by(domain: account.domain) + return false if info.nil? + + %w(misskey calckey firefish meisskey cherrypick sharkey).include?(info.software) end end diff --git a/app/helpers/formatting_helper.rb b/app/helpers/formatting_helper.rb index dc7442ac33..f0faf69b43 100644 --- a/app/helpers/formatting_helper.rb +++ b/app/helpers/formatting_helper.rb @@ -1,14 +1,6 @@ # frozen_string_literal: true module FormattingHelper - SYNDICATED_EMOJI_STYLES = <<~CSS.squish - height: 1.1em; - margin: -.2ex .15em .2ex; - object-fit: contain; - vertical-align: middle; - width: 1.1em; - CSS - def html_aware_format(text, local, options = {}) HtmlAwareFormatter.new(text, local, options).to_s end @@ -31,33 +23,46 @@ module FormattingHelper end def status_content_format(status) - MastodonOTELTracer.in_span('HtmlAwareFormatter rendering') do |span| - span.add_attributes( - 'app.formatter.content.type' => 'status', - 'app.formatter.content.origin' => status.local? ? 'local' : 'remote' - ) + html_aware_format(status.text, status.local?, markdown: status.markdown, preloaded_accounts: [status.account] + (status.respond_to?(:active_mentions) ? status.active_mentions.map(&:account) : [])) + end - html_aware_format(status.text, status.local?, markdown: status.markdown, preloaded_accounts: [status.account] + (status.respond_to?(:active_mentions) ? status.active_mentions.map(&:account) : [])) - end + def emoji_name_format(emoji_reaction, status) + html_aware_format(emoji_reaction['url'].present? ? ":#{emoji_reaction['name']}:" : emoji_reaction['name'], status.local?, markdown: status.markdown) end def rss_status_content_format(status) + html = status_content_format(status) + + before_html = if status.spoiler_text? + tag.p do + tag.strong do + I18n.t('rss.content_warning', locale: available_locale_or_nil(status.language) || I18n.default_locale) + end + + status.spoiler_text + end + tag.hr + end + + after_html = if status.preloadable_poll + tag.p do + safe_join( + status.preloadable_poll.options.map do |o| + tag.send(status.preloadable_poll.multiple? ? 'checkbox' : 'radio', o, disabled: true) + end, + tag.br + ) + end + end + prerender_custom_emojis( - wrapped_status_content_format(status), + safe_join([before_html, html, after_html]), status.emojis, - style: SYNDICATED_EMOJI_STYLES + style: 'min-width: 1.1em; height: 1.1em; object-fit: contain; vertical-align: middle; margin: -.2ex .15em .2ex' ).to_str end def account_bio_format(account) - MastodonOTELTracer.in_span('HtmlAwareFormatter rendering') do |span| - span.add_attributes( - 'app.formatter.content.type' => 'account_bio', - 'app.formatter.content.origin' => account.local? ? 'local' : 'remote' - ) - - html_aware_format(account.note, account.local?, markdown: account.user&.setting_bio_markdown) - end + html_aware_format(account.note, account.local?, markdown: account.user&.setting_bio_markdown) end def account_field_value_format(field, with_rel_me: true) @@ -67,51 +72,4 @@ module FormattingHelper html_aware_format(field.value, field.account.local?, markdown: false, with_rel_me: with_rel_me, with_domains: true, multiline: false) end end - - def markdown(text) - Redcarpet::Markdown.new(Redcarpet::Render::HTML, escape_html: true, no_images: true).render(text).html_safe # rubocop:disable Rails/OutputSafety - end - - private - - def wrapped_status_content_format(status) - safe_join [ - rss_content_preroll(status), - status_content_format(status), - rss_content_postroll(status), - ] - end - - def rss_content_preroll(status) - if status.spoiler_text? - safe_join [ - tag.p { spoiler_with_warning(status) }, - tag.hr, - ] - end - end - - def spoiler_with_warning(status) - safe_join [ - tag.strong { I18n.t('rss.content_warning', locale: available_locale_or_nil(status.language) || I18n.default_locale) }, - status.spoiler_text, - ] - end - - def rss_content_postroll(status) - if status.preloadable_poll - tag.p do - poll_option_tags(status) - end - end - end - - def poll_option_tags(status) - safe_join( - status.preloadable_poll.options.map do |option| - tag.send(status.preloadable_poll.multiple? ? 'checkbox' : 'radio', option, disabled: true) - end, - tag.br - ) - end end diff --git a/app/helpers/instance_helper.rb b/app/helpers/instance_helper.rb index 018c69e620..893afdd51f 100644 --- a/app/helpers/instance_helper.rb +++ b/app/helpers/instance_helper.rb @@ -13,22 +13,6 @@ module InstanceHelper safe_join([description_prefix(invite), I18n.t('auth.description.suffix')], ' ') end - def instance_presenter - @instance_presenter ||= InstancePresenter.new - end - - def favicon_path(size = '48') - instance_presenter.favicon&.file&.url(size) - end - - def app_icon_path(size = '48') - instance_presenter.app_icon&.file&.url(size) - end - - def use_mask_icon? - instance_presenter.app_icon.blank? - end - private def description_prefix(invite) diff --git a/app/helpers/json_ld_helper.rb b/app/helpers/jsonld_helper.rb similarity index 84% rename from app/helpers/json_ld_helper.rb rename to app/helpers/jsonld_helper.rb index 693cdf730f..d16f4c1e57 100644 --- a/app/helpers/json_ld_helper.rb +++ b/app/helpers/jsonld_helper.rb @@ -163,49 +163,24 @@ module JsonLdHelper end end - # Fetch the resource given by uri. - # @param uri [String] - # @param id_is_known [Boolean] - # @param on_behalf_of [nil, Account] - # @param raise_on_error [Symbol<:all, :temporary, :none>] See {#fetch_resource_without_id_validation} for possible values - def fetch_resource(uri, id_is_known, on_behalf_of = nil, raise_on_error: :none, request_options: {}) + def fetch_resource(uri, id_is_known, on_behalf_of = nil, request_options: {}) unless id_is_known - json = fetch_resource_without_id_validation(uri, on_behalf_of, raise_on_error: raise_on_error) + json = fetch_resource_without_id_validation(uri, on_behalf_of) return if !json.is_a?(Hash) || unsupported_uri_scheme?(json['id']) uri = json['id'] end - json = fetch_resource_without_id_validation(uri, on_behalf_of, raise_on_error: raise_on_error, request_options: request_options) + json = fetch_resource_without_id_validation(uri, on_behalf_of, request_options: request_options) json.present? && json['id'] == uri ? json : nil end - # Fetch the resource given by uri - # - # If an error is raised, it contains the response and can be captured for handling like - # - # begin - # fetch_resource_without_id_validation(uri, nil, true) - # rescue Mastodon::UnexpectedResponseError => e - # e.response - # end - # - # @param uri [String] - # @param on_behalf_of [nil, Account] - # @param raise_on_error [Symbol<:all, :temporary, :none>] - # - +:all+ - raise if response code is not in the 2xx range - # - +:temporary+ - raise if the response code is not an "unsalvageable error" like a 404 - # (see {#response_error_unsalvageable} ) - # - +:none+ - do not raise, return +nil+ - def fetch_resource_without_id_validation(uri, on_behalf_of = nil, raise_on_error: :none, request_options: {}) + def fetch_resource_without_id_validation(uri, on_behalf_of = nil, raise_on_temporary_error = false, request_options: {}) on_behalf_of ||= Account.representative build_request(uri, on_behalf_of, options: request_options).perform do |response| - raise Mastodon::UnexpectedResponseError, response if !response_successful?(response) && ( - raise_on_error == :all || - (!response_error_unsalvageable?(response) && raise_on_error == :temporary) - ) + raise Mastodon::UnexpectedResponseError, response unless response_successful?(response) || response_error_unsalvageable?(response) || !raise_on_temporary_error body_to_json(response.body_with_limit) if response.code == 200 && valid_activitypub_content_type?(response) end @@ -233,6 +208,14 @@ module JsonLdHelper nil end + def merge_context(context, new_context) + if context.is_a?(Array) + context << new_context + else + [context, new_context] + end + end + def response_successful?(response) (200...300).cover?(response.code) end diff --git a/app/helpers/kmyblue_capabilities_helper.rb b/app/helpers/kmyblue_capabilities_helper.rb index 279505bec8..075869ee60 100644 --- a/app/helpers/kmyblue_capabilities_helper.rb +++ b/app/helpers/kmyblue_capabilities_helper.rb @@ -20,8 +20,6 @@ module KmyblueCapabilitiesHelper kmyblue_circle_history kmyblue_list_notification kmyblue_server_features - favourite_list - kmyblue_favourite_antenna ) capabilities << :full_text_search if Chewy.enabled? diff --git a/app/helpers/languages_helper.rb b/app/helpers/languages_helper.rb index 0a8ebcde54..9e1c0a7db1 100644 --- a/app/helpers/languages_helper.rb +++ b/app/helpers/languages_helper.rb @@ -162,7 +162,7 @@ module LanguagesHelper th: ['Thai', 'ไทย'].freeze, ti: ['Tigrinya', 'ትግርኛ'].freeze, tk: ['Turkmen', 'Türkmen'].freeze, - tl: ['Tagalog', 'Tagalog'].freeze, + tl: ['Tagalog', 'Wikang Tagalog'].freeze, tn: ['Tswana', 'Setswana'].freeze, to: ['Tonga', 'faka Tonga'].freeze, tr: ['Turkish', 'Türkçe'].freeze, @@ -193,7 +193,6 @@ module LanguagesHelper ckb: ['Sorani (Kurdish)', 'سۆرانی'].freeze, cnr: ['Montenegrin', 'crnogorski'].freeze, csb: ['Kashubian', 'Kaszëbsczi'].freeze, - gsw: ['Swiss German', 'Schwiizertütsch'].freeze, jbo: ['Lojban', 'la .lojban.'].freeze, kab: ['Kabyle', 'Taqbaylit'].freeze, ldn: ['Láadan', 'Láadan'].freeze, @@ -239,7 +238,9 @@ module LanguagesHelper # Helper for self.sorted_locale_keys private_class_method def self.locale_name_for_sorting(locale) - if (supported_locale = SUPPORTED_LOCALES[locale.to_sym]) + if locale.blank? || locale == 'und' + '000' + elsif (supported_locale = SUPPORTED_LOCALES[locale.to_sym]) ASCIIFolding.new.fold(supported_locale[1]).downcase elsif (regional_locale = REGIONAL_LOCALE_NAMES[locale.to_sym]) ASCIIFolding.new.fold(regional_locale).downcase diff --git a/app/helpers/media_component_helper.rb b/app/helpers/media_component_helper.rb index 269566528a..fa8f34fb4d 100644 --- a/app/helpers/media_component_helper.rb +++ b/app/helpers/media_component_helper.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module MediaComponentHelper - def render_video_component(status, **) + def render_video_component(status, **options) video = status.ordered_media_attachments.first meta = video.file.meta || {} @@ -18,14 +18,14 @@ module MediaComponentHelper media: [ serialize_media_attachment(video), ].as_json, - }.merge(**) + }.merge(**options) react_component :video, component_params do render partial: 'statuses/attachment_list', locals: { attachments: status.ordered_media_attachments } end end - def render_audio_component(status, **) + def render_audio_component(status, **options) audio = status.ordered_media_attachments.first meta = audio.file.meta || {} @@ -38,25 +38,45 @@ module MediaComponentHelper foregroundColor: meta.dig('colors', 'foreground'), accentColor: meta.dig('colors', 'accent'), duration: meta.dig('original', 'duration'), - }.merge(**) + }.merge(**options) react_component :audio, component_params do render partial: 'statuses/attachment_list', locals: { attachments: status.ordered_media_attachments } end end - def render_media_gallery_component(status, **) + def render_media_gallery_component(status, **options) component_params = { sensitive: sensitive_viewer?(status, current_account), autoplay: prefers_autoplay?, media: status.ordered_media_attachments.map { |a| serialize_media_attachment(a).as_json }, - }.merge(**) + }.merge(**options) react_component :media_gallery, component_params do render partial: 'statuses/attachment_list', locals: { attachments: status.ordered_media_attachments } end end + def render_card_component(status, **options) + component_params = { + sensitive: sensitive_viewer?(status, current_account), + card: serialize_status_card(status).as_json, + }.merge(**options) + + react_component :card, component_params + end + + def render_poll_component(status, **options) + component_params = { + disabled: true, + poll: serialize_status_poll(status).as_json, + }.merge(**options) + + react_component :poll, component_params do + render partial: 'statuses/poll', locals: { status: status, poll: status.preloadable_poll, autoplay: prefers_autoplay? } + end + end + private def serialize_media_attachment(attachment) @@ -66,6 +86,22 @@ module MediaComponentHelper ) end + def serialize_status_card(status) + ActiveModelSerializers::SerializableResource.new( + status.preview_card, + serializer: REST::PreviewCardSerializer + ) + end + + def serialize_status_poll(status) + ActiveModelSerializers::SerializableResource.new( + status.preloadable_poll, + serializer: REST::PollSerializer, + scope: current_user, + scope_name: :current_user + ) + end + def sensitive_viewer?(status, account) if !account.nil? && account.id == status.account_id status.sensitive diff --git a/app/helpers/registration_helper.rb b/app/helpers/registration_helper.rb index f387a48309..c3db46c027 100644 --- a/app/helpers/registration_helper.rb +++ b/app/helpers/registration_helper.rb @@ -18,6 +18,6 @@ module RegistrationHelper end def ip_blocked?(remote_ip) - IpBlock.severity_sign_up_block.containing(remote_ip.to_s).exists? + IpBlock.where(severity: :sign_up_block).exists?(['ip >>= ?', remote_ip.to_s]) end end diff --git a/app/helpers/routing_helper.rb b/app/helpers/routing_helper.rb index 22efc5f092..15d988f64d 100644 --- a/app/helpers/routing_helper.rb +++ b/app/helpers/routing_helper.rb @@ -14,8 +14,8 @@ module RoutingHelper end end - def full_asset_url(source, **) - source = ActionController::Base.helpers.asset_url(source, **) unless use_storage? + def full_asset_url(source, **options) + source = ActionController::Base.helpers.asset_url(source, **options) unless use_storage? URI.join(asset_host, source).to_s end @@ -24,12 +24,12 @@ module RoutingHelper Rails.configuration.action_controller.asset_host || root_url end - def frontend_asset_path(source, **) - asset_pack_path("media/#{source}", **) + def frontend_asset_path(source, **options) + asset_pack_path("media/#{source}", **options) end - def frontend_asset_url(source, **) - full_asset_url(frontend_asset_path(source, **)) + def frontend_asset_url(source, **options) + full_asset_url(frontend_asset_path(source, **options)) end def use_storage? diff --git a/app/helpers/self_destruct_helper.rb b/app/helpers/self_destruct_helper.rb index f1927b1e04..78557c25e5 100644 --- a/app/helpers/self_destruct_helper.rb +++ b/app/helpers/self_destruct_helper.rb @@ -1,11 +1,9 @@ # frozen_string_literal: true module SelfDestructHelper - VERIFY_PURPOSE = 'self-destruct' - def self.self_destruct? - value = Rails.configuration.x.mastodon.self_destruct_value - value.present? && Rails.application.message_verifier(VERIFY_PURPOSE).verify(value) == ENV['LOCAL_DOMAIN'] + value = ENV.fetch('SELF_DESTRUCT', nil) + value.present? && Rails.application.message_verifier('self-destruct').verify(value) == ENV['LOCAL_DOMAIN'] rescue ActiveSupport::MessageVerifier::InvalidSignature false end diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb index fd631ce92e..10863a316c 100644 --- a/app/helpers/settings_helper.rb +++ b/app/helpers/settings_helper.rb @@ -10,28 +10,27 @@ module SettingsHelper end def featured_tags_hint(recently_used_tags) - recently_used_tags.present? && - safe_join( - [ - t('simple_form.hints.featured_tag.name'), - safe_join( - links_for_featured_tags(recently_used_tags), - ', ' - ), - ], - ' ' - ) + safe_join( + [ + t('simple_form.hints.featured_tag.name'), + safe_join( + links_for_featured_tags(recently_used_tags), + ', ' + ), + ], + ' ' + ) end def session_device_icon(session) device = session.detection.device if device.mobile? - 'smartphone' + 'mobile' elsif device.tablet? 'tablet' else - 'desktop_mac' + 'desktop' end end diff --git a/app/helpers/statuses_helper.rb b/app/helpers/statuses_helper.rb index 7e42dd4623..8ded11e03d 100644 --- a/app/helpers/statuses_helper.rb +++ b/app/helpers/statuses_helper.rb @@ -1,18 +1,11 @@ # frozen_string_literal: true module StatusesHelper - VISIBLITY_ICONS = { - public: 'globe', - unlisted: 'lock_open', - private: 'lock', - direct: 'alternate_email', - public_unlisted: 'cloud', - login: 'key', - limited: 'shield', - }.freeze + EMBEDDED_CONTROLLER = 'statuses' + EMBEDDED_ACTION = 'embed' def nothing_here(extra_classes = '') - tag.div(class: ['nothing-here', extra_classes]) do + content_tag(:div, class: "nothing-here #{extra_classes}") do t('accounts.nothing_here') end end @@ -60,8 +53,31 @@ module StatusesHelper components.compact_blank.join("\n\n") end - def visibility_icon(status) - VISIBLITY_ICONS[status.visibility.to_sym] + def stream_link_target + embedded_view? ? '_blank' : nil + end + + def fa_visibility_icon(status) + case status.visibility + when 'public' + fa_icon 'globe fw' + when 'unlisted' + fa_icon 'unlock fw' + when 'public_unlisted' + fa_icon 'cloud fw' + when 'login' + fa_icon 'key fw' + when 'private' + fa_icon 'lock fw' + when 'limited' + fa_icon 'get-pocket fw' + when 'direct' + fa_icon 'at fw' + end + end + + def embedded_view? + params[:controller] == EMBEDDED_CONTROLLER && params[:action] == EMBEDDED_ACTION end def prefers_autoplay? diff --git a/app/helpers/theme_helper.rb b/app/helpers/theme_helper.rb index f4d88a1ef0..d15259851c 100644 --- a/app/helpers/theme_helper.rb +++ b/app/helpers/theme_helper.rb @@ -3,10 +3,8 @@ module ThemeHelper def theme_style_tags(theme) if theme == 'system' - ''.html_safe.tap do |tags| - tags << stylesheet_pack_tag('mastodon-light', media: 'not all and (prefers-color-scheme: dark)', crossorigin: 'anonymous') - tags << stylesheet_pack_tag('default', media: '(prefers-color-scheme: dark)', crossorigin: 'anonymous') - end + stylesheet_pack_tag('mastodon-light', media: 'not all and (prefers-color-scheme: dark)', crossorigin: 'anonymous') + + stylesheet_pack_tag('default', media: '(prefers-color-scheme: dark)', crossorigin: 'anonymous') else stylesheet_pack_tag theme, media: 'all', crossorigin: 'anonymous' end @@ -14,60 +12,15 @@ module ThemeHelper def theme_color_tags(theme) if theme == 'system' - ''.html_safe.tap do |tags| - tags << tag.meta(name: 'theme-color', content: Themes::THEME_COLORS[:dark], media: '(prefers-color-scheme: dark)') - tags << tag.meta(name: 'theme-color', content: Themes::THEME_COLORS[:light], media: '(prefers-color-scheme: light)') - end + tag.meta(name: 'theme-color', content: Themes::THEME_COLORS[:dark], media: '(prefers-color-scheme: dark)') + + tag.meta(name: 'theme-color', content: Themes::THEME_COLORS[:light], media: '(prefers-color-scheme: light)') else tag.meta name: 'theme-color', content: theme_color_for(theme) end end - def custom_stylesheet - if active_custom_stylesheet.present? - stylesheet_link_tag( - custom_css_path(active_custom_stylesheet), - host: root_url, - media: :all, - skip_pipeline: true - ) - end - end - - def system_stylesheet - stylesheet_link_tag( - system_css_path, - host: root_url, - media: :all, - skip_pipeline: true - ) - end - - def user_custom_stylesheet - stylesheet_link_tag( - user_custom_css_path({ version: user_custom_css_version }), - host: root_url, - media: :all, - skip_pipeline: true - ) - end - private - def active_custom_stylesheet - if cached_custom_css_digest.present? - [:custom, cached_custom_css_digest.to_s.first(8)] - .compact_blank - .join('-') - end - end - - def cached_custom_css_digest - Rails.cache.fetch(:setting_digest_custom_css) do - Setting.custom_css&.then { |content| Digest::SHA256.hexdigest(content) } - end - end - def theme_color_for(theme) theme == 'mastodon-light' ? Themes::THEME_COLORS[:light] : Themes::THEME_COLORS[:dark] end diff --git a/app/helpers/webfinger_helper.rb b/app/helpers/webfinger_helper.rb new file mode 100644 index 0000000000..482f4e19ea --- /dev/null +++ b/app/helpers/webfinger_helper.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +module WebfingerHelper + def webfinger!(uri) + Webfinger.new(uri).perform + end +end diff --git a/app/inputs/date_of_birth_input.rb b/app/inputs/date_of_birth_input.rb deleted file mode 100644 index 131234b02e..0000000000 --- a/app/inputs/date_of_birth_input.rb +++ /dev/null @@ -1,31 +0,0 @@ -# frozen_string_literal: true - -class DateOfBirthInput < SimpleForm::Inputs::Base - OPTIONS = [ - { autocomplete: 'bday-day', maxlength: 2, pattern: '[0-9]+', placeholder: 'DD' }.freeze, - { autocomplete: 'bday-month', maxlength: 2, pattern: '[0-9]+', placeholder: 'MM' }.freeze, - { autocomplete: 'bday-year', maxlength: 4, pattern: '[0-9]+', placeholder: 'YYYY' }.freeze, - ].freeze - - def input(wrapper_options = nil) - merged_input_options = merge_wrapper_options(input_html_options, wrapper_options) - merged_input_options[:inputmode] = 'numeric' - - values = (object.public_send(attribute_name) || '').split('.') - - safe_join(Array.new(3) do |index| - options = merged_input_options.merge(OPTIONS[index]).merge id: generate_id(index), 'aria-label': I18n.t("simple_form.labels.user.date_of_birth_#{index + 1}i"), value: values[index] - @builder.text_field("#{attribute_name}(#{index + 1}i)", options) - end) - end - - def label_target - "#{attribute_name}_1i" - end - - private - - def generate_id(index) - "#{object_name}_#{attribute_name}_#{index + 1}i" - end -end diff --git a/app/javascript/entrypoints/embed.tsx b/app/javascript/entrypoints/embed.tsx deleted file mode 100644 index 6c091e4d07..0000000000 --- a/app/javascript/entrypoints/embed.tsx +++ /dev/null @@ -1,78 +0,0 @@ -import './public-path'; -import { createRoot } from 'react-dom/client'; - -import { afterInitialRender } from 'mastodon/hooks/useRenderSignal'; - -import { start } from '../mastodon/common'; -import { Status } from '../mastodon/features/standalone/status'; -import { loadPolyfills } from '../mastodon/polyfills'; -import ready from '../mastodon/ready'; - -start(); - -function loaded() { - const mountNode = document.getElementById('mastodon-status'); - - if (mountNode) { - const attr = mountNode.getAttribute('data-props'); - - if (!attr) return; - - const props = JSON.parse(attr) as { id: string; locale: string }; - const root = createRoot(mountNode); - - root.render(); - } -} - -function main() { - ready(loaded).catch((error: unknown) => { - console.error(error); - }); -} - -loadPolyfills() - .then(main) - .catch((error: unknown) => { - console.error(error); - }); - -interface SetHeightMessage { - type: 'setHeight'; - id: string; - height: number; -} - -function isSetHeightMessage(data: unknown): data is SetHeightMessage { - if ( - data && - typeof data === 'object' && - 'type' in data && - data.type === 'setHeight' - ) - return true; - else return false; -} - -window.addEventListener('message', (e) => { - // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- typings are not correct, it can be null in very rare cases - if (!e.data || !isSetHeightMessage(e.data) || !window.parent) return; - - const data = e.data; - - // Only set overflow to `hidden` once we got the expected `message` so the post can still be scrolled if - // embedded without parent Javascript support - document.body.style.overflow = 'hidden'; - - // We use a timeout to allow for the React page to render before calculating the height - afterInitialRender(() => { - window.parent.postMessage( - { - type: 'setHeight', - id: data.id, - height: document.getElementsByTagName('html')[0]?.scrollHeight, - }, - '*', - ); - }); -}); diff --git a/app/javascript/entrypoints/public.tsx b/app/javascript/entrypoints/public.tsx index 9374d6b2d1..40a9b7c0ca 100644 --- a/app/javascript/entrypoints/public.tsx +++ b/app/javascript/entrypoints/public.tsx @@ -37,6 +37,43 @@ const messages = defineMessages({ }, }); +interface SetHeightMessage { + type: 'setHeight'; + id: string; + height: number; +} + +function isSetHeightMessage(data: unknown): data is SetHeightMessage { + if ( + data && + typeof data === 'object' && + 'type' in data && + data.type === 'setHeight' + ) + return true; + else return false; +} + +window.addEventListener('message', (e) => { + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- typings are not correct, it can be null in very rare cases + if (!e.data || !isSetHeightMessage(e.data) || !window.parent) return; + + const data = e.data; + + ready(() => { + window.parent.postMessage( + { + type: 'setHeight', + id: data.id, + height: document.getElementsByTagName('html')[0]?.scrollHeight, + }, + '*', + ); + }).catch((e: unknown) => { + console.error('Error in setHeightMessage postMessage', e); + }); +}); + function loaded() { const { messages: localeData } = getLocale(); @@ -68,7 +105,7 @@ function loaded() { if (id) message = localeData[id]; - message ??= defaultMessage as string; + if (!message) message = defaultMessage as string; const messageFormat = new IntlMessageFormat(message, locale); return messageFormat.format(values) as string; @@ -119,11 +156,7 @@ function loaded() { formattedContent = dateFormat.format(datetime); } - const timeGiven = content.dateTime.includes('T'); - content.title = timeGiven - ? dateTimeFormat.format(datetime) - : dateFormat.format(datetime); - + content.title = formattedContent; content.textContent = formattedContent; }); @@ -234,6 +267,62 @@ function loaded() { } }, ); + + Rails.delegate( + document, + 'button.status__content__spoiler-link', + 'click', + function () { + if (!(this instanceof HTMLButtonElement)) return; + + const statusEl = this.parentNode?.parentNode; + + if ( + !( + statusEl instanceof HTMLDivElement && + statusEl.classList.contains('.status__content') + ) + ) + return; + + if (statusEl.dataset.spoiler === 'expanded') { + statusEl.dataset.spoiler = 'folded'; + this.textContent = new IntlMessageFormat( + localeData['status.show_more'] ?? 'Show more', + locale, + ).format() as string; + } else { + statusEl.dataset.spoiler = 'expanded'; + this.textContent = new IntlMessageFormat( + localeData['status.show_less'] ?? 'Show less', + locale, + ).format() as string; + } + }, + ); + + document + .querySelectorAll('button.status__content__spoiler-link') + .forEach((spoilerLink) => { + const statusEl = spoilerLink.parentNode?.parentNode; + + if ( + !( + statusEl instanceof HTMLDivElement && + statusEl.classList.contains('.status__content') + ) + ) + return; + + const message = + statusEl.dataset.spoiler === 'expanded' + ? localeData['status.show_less'] ?? 'Show less' + : localeData['status.show_more'] ?? 'Show more'; + spoilerLink.textContent = new IntlMessageFormat( + message, + locale, + ).format() as string; + }); } Rails.delegate( @@ -275,24 +364,31 @@ Rails.delegate(document, '.input-copy button', 'click', ({ target }) => { if (!input) return; - navigator.clipboard - .writeText(input.value) - .then(() => { + const oldReadOnly = input.readOnly; + + input.readOnly = false; + input.focus(); + input.select(); + input.setSelectionRange(0, input.value.length); + + try { + if (document.execCommand('copy')) { + input.blur(); + const parent = target.parentElement; - if (parent) { - parent.classList.add('copied'); + if (!parent) return; + parent.classList.add('copied'); - setTimeout(() => { - parent.classList.remove('copied'); - }, 700); - } + setTimeout(() => { + parent.classList.remove('copied'); + }, 700); + } + } catch (err) { + console.error(err); + } - return true; - }) - .catch((error: unknown) => { - console.error(error); - }); + input.readOnly = oldReadOnly; }); const toggleSidebar = () => { @@ -335,42 +431,6 @@ Rails.delegate(document, 'img.custom-emoji', 'mouseout', ({ target }) => { target.src = target.dataset.static; }); -const setInputDisabled = ( - input: HTMLInputElement | HTMLSelectElement, - disabled: boolean, -) => { - input.disabled = disabled; - - const wrapper = input.closest('.with_label'); - if (wrapper) { - wrapper.classList.toggle('disabled', input.disabled); - - const hidden = - input.type === 'checkbox' && - wrapper.querySelector('input[type=hidden][value="0"]'); - if (hidden) { - hidden.disabled = input.disabled; - } - } -}; - -Rails.delegate( - document, - '#account_statuses_cleanup_policy_enabled', - 'change', - ({ target }) => { - if (!(target instanceof HTMLInputElement) || !target.form) return; - - target.form - .querySelectorAll< - HTMLInputElement | HTMLSelectElement - >('input:not([type=hidden], #account_statuses_cleanup_policy_enabled), select') - .forEach((input) => { - setInputDisabled(input, !target.checked); - }); - }, -); - // Empty the honeypot fields in JS in case something like an extension // automatically filled them. Rails.delegate(document, '#registration_new_user,#new_user', 'submit', () => { @@ -387,24 +447,6 @@ Rails.delegate(document, '#registration_new_user,#new_user', 'submit', () => { }); }); -Rails.delegate(document, '.rules-list button', 'click', ({ target }) => { - if (!(target instanceof HTMLElement)) { - return; - } - - const button = target.closest('button'); - - if (!button) { - return; - } - - if (button.ariaExpanded === 'true') { - button.ariaExpanded = 'false'; - } else { - button.ariaExpanded = 'true'; - } -}); - function main() { ready(loaded).catch((error: unknown) => { console.error(error); diff --git a/app/javascript/mastodon/hooks/useHovering.ts b/app/javascript/hooks/useHovering.ts similarity index 100% rename from app/javascript/mastodon/hooks/useHovering.ts rename to app/javascript/hooks/useHovering.ts diff --git a/app/javascript/mastodon/hooks/useLinks.ts b/app/javascript/hooks/useLinks.ts similarity index 53% rename from app/javascript/mastodon/hooks/useLinks.ts rename to app/javascript/hooks/useLinks.ts index abaa108f6b..f08b9500da 100644 --- a/app/javascript/mastodon/hooks/useLinks.ts +++ b/app/javascript/hooks/useLinks.ts @@ -2,8 +2,6 @@ import { useCallback } from 'react'; import { useHistory } from 'react-router-dom'; -import { isFulfilled, isRejected } from '@reduxjs/toolkit'; - import { openURL } from 'mastodon/actions/search'; import { useAppDispatch } from 'mastodon/store'; @@ -14,9 +12,6 @@ const isHashtagClick = (element: HTMLAnchorElement) => element.textContent?.[0] === '#' || element.previousSibling?.textContent?.endsWith('#'); -const isFeaturedHashtagClick = (element: HTMLAnchorElement) => - isHashtagClick(element) && element.href.includes('/tagged/'); - export const useLinks = () => { const history = useHistory(); const dispatch = useAppDispatch(); @@ -32,36 +27,13 @@ export const useLinks = () => { [history], ); - const handleFeaturedHashtagClick = useCallback( - (element: HTMLAnchorElement) => { - const { textContent, href } = element; - - if (!textContent) return; - - const url = new URL(href); - - history.push(url.pathname); - }, - [history], - ); - const handleMentionClick = useCallback( - async (element: HTMLAnchorElement) => { - const result = await dispatch(openURL({ url: element.href })); - - if (isFulfilled(result)) { - if (result.payload.accounts[0]) { - history.push(`/@${result.payload.accounts[0].acct}`); - } else if (result.payload.statuses[0]) { - history.push( - `/@${result.payload.statuses[0].account.acct}/${result.payload.statuses[0].id}`, - ); - } else { + (element: HTMLAnchorElement) => { + dispatch( + openURL(element.href, history, () => { window.location.href = element.href; - } - } else if (isRejected(result)) { - window.location.href = element.href; - } + }), + ); }, [dispatch, history], ); @@ -76,16 +48,13 @@ export const useLinks = () => { if (isMentionClick(target)) { e.preventDefault(); - void handleMentionClick(target); - } else if (isFeaturedHashtagClick(target)) { - e.preventDefault(); - handleFeaturedHashtagClick(target); + handleMentionClick(target); } else if (isHashtagClick(target)) { e.preventDefault(); handleHashtagClick(target); } }, - [handleMentionClick, handleFeaturedHashtagClick, handleHashtagClick], + [handleMentionClick, handleHashtagClick], ); return handleClick; diff --git a/app/javascript/mastodon/hooks/useTimeout.ts b/app/javascript/hooks/useTimeout.ts similarity index 100% rename from app/javascript/mastodon/hooks/useTimeout.ts rename to app/javascript/hooks/useTimeout.ts diff --git a/app/javascript/icons/android-chrome-144x144.png b/app/javascript/icons/android-chrome-144x144.png old mode 100644 new mode 100755 index 698fb4a260..d636e94c43 Binary files a/app/javascript/icons/android-chrome-144x144.png and b/app/javascript/icons/android-chrome-144x144.png differ diff --git a/app/javascript/icons/android-chrome-192x192.png b/app/javascript/icons/android-chrome-192x192.png old mode 100644 new mode 100755 index 2b6b632648..4a2681ffb9 Binary files a/app/javascript/icons/android-chrome-192x192.png and b/app/javascript/icons/android-chrome-192x192.png differ diff --git a/app/javascript/icons/android-chrome-256x256.png b/app/javascript/icons/android-chrome-256x256.png old mode 100644 new mode 100755 index 51e3849a26..8fab493ede Binary files a/app/javascript/icons/android-chrome-256x256.png and b/app/javascript/icons/android-chrome-256x256.png differ diff --git a/app/javascript/icons/android-chrome-36x36.png b/app/javascript/icons/android-chrome-36x36.png old mode 100644 new mode 100755 index 925f69c4fc..335d012db1 Binary files a/app/javascript/icons/android-chrome-36x36.png and b/app/javascript/icons/android-chrome-36x36.png differ diff --git a/app/javascript/icons/android-chrome-384x384.png b/app/javascript/icons/android-chrome-384x384.png old mode 100644 new mode 100755 index 9d256a83cb..02b1e6fced Binary files a/app/javascript/icons/android-chrome-384x384.png and b/app/javascript/icons/android-chrome-384x384.png differ diff --git a/app/javascript/icons/android-chrome-48x48.png b/app/javascript/icons/android-chrome-48x48.png old mode 100644 new mode 100755 index bcfe7475d0..43cf411b8c Binary files a/app/javascript/icons/android-chrome-48x48.png and b/app/javascript/icons/android-chrome-48x48.png differ diff --git a/app/javascript/icons/android-chrome-512x512.png b/app/javascript/icons/android-chrome-512x512.png old mode 100644 new mode 100755 index bffacfb699..1856b80c7c Binary files a/app/javascript/icons/android-chrome-512x512.png and b/app/javascript/icons/android-chrome-512x512.png differ diff --git a/app/javascript/icons/android-chrome-72x72.png b/app/javascript/icons/android-chrome-72x72.png old mode 100644 new mode 100755 index 16679d5731..335008bf85 Binary files a/app/javascript/icons/android-chrome-72x72.png and b/app/javascript/icons/android-chrome-72x72.png differ diff --git a/app/javascript/icons/android-chrome-96x96.png b/app/javascript/icons/android-chrome-96x96.png old mode 100644 new mode 100755 index 9ade87cf32..d1cb095822 Binary files a/app/javascript/icons/android-chrome-96x96.png and b/app/javascript/icons/android-chrome-96x96.png differ diff --git a/app/javascript/icons/apple-touch-icon-1024x1024.png b/app/javascript/icons/apple-touch-icon-1024x1024.png old mode 100644 new mode 100755 index 8ec371eb27..c2a2d516ef Binary files a/app/javascript/icons/apple-touch-icon-1024x1024.png and b/app/javascript/icons/apple-touch-icon-1024x1024.png differ diff --git a/app/javascript/icons/apple-touch-icon-114x114.png b/app/javascript/icons/apple-touch-icon-114x114.png old mode 100644 new mode 100755 index e1563f51e5..218b415439 Binary files a/app/javascript/icons/apple-touch-icon-114x114.png and b/app/javascript/icons/apple-touch-icon-114x114.png differ diff --git a/app/javascript/icons/apple-touch-icon-120x120.png b/app/javascript/icons/apple-touch-icon-120x120.png old mode 100644 new mode 100755 index e9a5f5b0e5..be53bc7c10 Binary files a/app/javascript/icons/apple-touch-icon-120x120.png and b/app/javascript/icons/apple-touch-icon-120x120.png differ diff --git a/app/javascript/icons/apple-touch-icon-144x144.png b/app/javascript/icons/apple-touch-icon-144x144.png old mode 100644 new mode 100755 index 698fb4a260..cbb055732f Binary files a/app/javascript/icons/apple-touch-icon-144x144.png and b/app/javascript/icons/apple-touch-icon-144x144.png differ diff --git a/app/javascript/icons/apple-touch-icon-152x152.png b/app/javascript/icons/apple-touch-icon-152x152.png old mode 100644 new mode 100755 index 0cc93cc288..3a7975c054 Binary files a/app/javascript/icons/apple-touch-icon-152x152.png and b/app/javascript/icons/apple-touch-icon-152x152.png differ diff --git a/app/javascript/icons/apple-touch-icon-167x167.png b/app/javascript/icons/apple-touch-icon-167x167.png old mode 100644 new mode 100755 index 9bbbf53120..25be4eb5f5 Binary files a/app/javascript/icons/apple-touch-icon-167x167.png and b/app/javascript/icons/apple-touch-icon-167x167.png differ diff --git a/app/javascript/icons/apple-touch-icon-180x180.png b/app/javascript/icons/apple-touch-icon-180x180.png old mode 100644 new mode 100755 index 329b803b91..dc0e9bc20b Binary files a/app/javascript/icons/apple-touch-icon-180x180.png and b/app/javascript/icons/apple-touch-icon-180x180.png differ diff --git a/app/javascript/icons/apple-touch-icon-192x192.png b/app/javascript/icons/apple-touch-icon-192x192.png deleted file mode 100644 index 2b6b632648..0000000000 Binary files a/app/javascript/icons/apple-touch-icon-192x192.png and /dev/null differ diff --git a/app/javascript/icons/apple-touch-icon-256x256.png b/app/javascript/icons/apple-touch-icon-256x256.png deleted file mode 100644 index 51e3849a26..0000000000 Binary files a/app/javascript/icons/apple-touch-icon-256x256.png and /dev/null differ diff --git a/app/javascript/icons/apple-touch-icon-36x36.png b/app/javascript/icons/apple-touch-icon-36x36.png deleted file mode 100644 index 925f69c4fc..0000000000 Binary files a/app/javascript/icons/apple-touch-icon-36x36.png and /dev/null differ diff --git a/app/javascript/icons/apple-touch-icon-384x384.png b/app/javascript/icons/apple-touch-icon-384x384.png deleted file mode 100644 index 9d256a83cb..0000000000 Binary files a/app/javascript/icons/apple-touch-icon-384x384.png and /dev/null differ diff --git a/app/javascript/icons/apple-touch-icon-48x48.png b/app/javascript/icons/apple-touch-icon-48x48.png deleted file mode 100644 index bcfe7475d0..0000000000 Binary files a/app/javascript/icons/apple-touch-icon-48x48.png and /dev/null differ diff --git a/app/javascript/icons/apple-touch-icon-512x512.png b/app/javascript/icons/apple-touch-icon-512x512.png deleted file mode 100644 index bffacfb699..0000000000 Binary files a/app/javascript/icons/apple-touch-icon-512x512.png and /dev/null differ diff --git a/app/javascript/icons/apple-touch-icon-57x57.png b/app/javascript/icons/apple-touch-icon-57x57.png old mode 100644 new mode 100755 index e00e142c64..bb0dc957cd Binary files a/app/javascript/icons/apple-touch-icon-57x57.png and b/app/javascript/icons/apple-touch-icon-57x57.png differ diff --git a/app/javascript/icons/apple-touch-icon-60x60.png b/app/javascript/icons/apple-touch-icon-60x60.png old mode 100644 new mode 100755 index 011285b564..9143a0bf07 Binary files a/app/javascript/icons/apple-touch-icon-60x60.png and b/app/javascript/icons/apple-touch-icon-60x60.png differ diff --git a/app/javascript/icons/apple-touch-icon-72x72.png b/app/javascript/icons/apple-touch-icon-72x72.png old mode 100644 new mode 100755 index 16679d5731..2b7d19484c Binary files a/app/javascript/icons/apple-touch-icon-72x72.png and b/app/javascript/icons/apple-touch-icon-72x72.png differ diff --git a/app/javascript/icons/apple-touch-icon-76x76.png b/app/javascript/icons/apple-touch-icon-76x76.png old mode 100644 new mode 100755 index 83c8748876..0985e33bcb Binary files a/app/javascript/icons/apple-touch-icon-76x76.png and b/app/javascript/icons/apple-touch-icon-76x76.png differ diff --git a/app/javascript/icons/apple-touch-icon-96x96.png b/app/javascript/icons/apple-touch-icon-96x96.png deleted file mode 100644 index 9ade87cf32..0000000000 Binary files a/app/javascript/icons/apple-touch-icon-96x96.png and /dev/null differ diff --git a/app/javascript/icons/favicon-16x16.png b/app/javascript/icons/favicon-16x16.png old mode 100644 new mode 100755 index 7f865cfe96..1326ba0462 Binary files a/app/javascript/icons/favicon-16x16.png and b/app/javascript/icons/favicon-16x16.png differ diff --git a/app/javascript/icons/favicon-32x32.png b/app/javascript/icons/favicon-32x32.png old mode 100644 new mode 100755 index 7f865cfe96..f5058cb0a5 Binary files a/app/javascript/icons/favicon-32x32.png and b/app/javascript/icons/favicon-32x32.png differ diff --git a/app/javascript/icons/favicon-48x48.png b/app/javascript/icons/favicon-48x48.png old mode 100644 new mode 100755 index 7f865cfe96..6253d054c7 Binary files a/app/javascript/icons/favicon-48x48.png and b/app/javascript/icons/favicon-48x48.png differ diff --git a/app/javascript/images/archetypes/booster.png b/app/javascript/images/archetypes/booster.png deleted file mode 100755 index df2a0226f8..0000000000 Binary files a/app/javascript/images/archetypes/booster.png and /dev/null differ diff --git a/app/javascript/images/archetypes/lurker.png b/app/javascript/images/archetypes/lurker.png deleted file mode 100755 index e37f98aab2..0000000000 Binary files a/app/javascript/images/archetypes/lurker.png and /dev/null differ diff --git a/app/javascript/images/archetypes/oracle.png b/app/javascript/images/archetypes/oracle.png deleted file mode 100755 index 9d4e2177c5..0000000000 Binary files a/app/javascript/images/archetypes/oracle.png and /dev/null differ diff --git a/app/javascript/images/archetypes/pollster.png b/app/javascript/images/archetypes/pollster.png deleted file mode 100755 index 9fe6281af0..0000000000 Binary files a/app/javascript/images/archetypes/pollster.png and /dev/null differ diff --git a/app/javascript/images/archetypes/replier.png b/app/javascript/images/archetypes/replier.png deleted file mode 100755 index 6c6325b9f1..0000000000 Binary files a/app/javascript/images/archetypes/replier.png and /dev/null differ diff --git a/app/javascript/images/filter-stripes.svg b/app/javascript/images/filter-stripes.svg deleted file mode 100755 index 4c1b58cb74..0000000000 --- a/app/javascript/images/filter-stripes.svg +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/javascript/images/logo_full.svg b/app/javascript/images/logo_full.svg new file mode 100644 index 0000000000..03bcf93e39 --- /dev/null +++ b/app/javascript/images/logo_full.svg @@ -0,0 +1 @@ + diff --git a/app/javascript/images/logo_transparent.svg b/app/javascript/images/logo_transparent.svg new file mode 100644 index 0000000000..a1e7b403e0 --- /dev/null +++ b/app/javascript/images/logo_transparent.svg @@ -0,0 +1 @@ + diff --git a/app/javascript/images/quote-stripes.svg b/app/javascript/images/quote-stripes.svg deleted file mode 100755 index 1234d4d0a6..0000000000 --- a/app/javascript/images/quote-stripes.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/app/javascript/images/quote.svg b/app/javascript/images/quote.svg deleted file mode 100644 index ae6fbbe04a..0000000000 --- a/app/javascript/images/quote.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/app/javascript/images/reticle.png b/app/javascript/images/reticle.png new file mode 100644 index 0000000000..a724ac0bcd Binary files /dev/null and b/app/javascript/images/reticle.png differ diff --git a/app/javascript/mastodon/actions/account_notes.ts b/app/javascript/mastodon/actions/account_notes.ts index 9e7d199dc9..c2ebaf54a4 100644 --- a/app/javascript/mastodon/actions/account_notes.ts +++ b/app/javascript/mastodon/actions/account_notes.ts @@ -6,4 +6,5 @@ export const submitAccountNote = createDataLoadingThunk( ({ accountId, note }: { accountId: string; note: string }) => apiSubmitAccountNote(accountId, note), (relationship) => ({ relationship }), + { skipLoading: true }, ); diff --git a/app/javascript/mastodon/actions/accounts.js b/app/javascript/mastodon/actions/accounts.js index d821381ce0..cea915e5f1 100644 --- a/app/javascript/mastodon/actions/accounts.js +++ b/app/javascript/mastodon/actions/accounts.js @@ -1,6 +1,3 @@ -import { browserHistory } from 'mastodon/components/router'; -import { debounceWithDispatchAndArguments } from 'mastodon/utils/debounce'; - import api, { getLinks } from '../api'; import { @@ -142,13 +139,6 @@ export function fetchAccountFail(id, error) { }; } -/** - * @param {string} id - * @param {Object} options - * @param {boolean} [options.reblogs] - * @param {boolean} [options.notify] - * @returns {function(): void} - */ export function followAccount(id, options = { reblogs: true }) { return (dispatch, getState) => { const alreadyFollowing = getState().getIn(['relationships', id, 'following']); @@ -457,20 +447,6 @@ export function expandFollowingFail(id, error) { }; } -const debouncedFetchRelationships = debounceWithDispatchAndArguments((dispatch, ...newAccountIds) => { - if (newAccountIds.length === 0) { - return; - } - - dispatch(fetchRelationshipsRequest(newAccountIds)); - - api().get(`/api/v1/accounts/relationships?with_suspended=true&${newAccountIds.map(id => `id[]=${id}`).join('&')}`).then(response => { - dispatch(fetchRelationshipsSuccess({ relationships: response.data })); - }).catch(error => { - dispatch(fetchRelationshipsFail(error)); - }); -}, { delay: 500 }); - export function fetchRelationships(accountIds) { return (dispatch, getState) => { const state = getState(); @@ -482,7 +458,13 @@ export function fetchRelationships(accountIds) { return; } - debouncedFetchRelationships(dispatch, ...newAccountIds); + dispatch(fetchRelationshipsRequest(newAccountIds)); + + api().get(`/api/v1/accounts/relationships?with_suspended=true&${newAccountIds.map(id => `id[]=${id}`).join('&')}`).then(response => { + dispatch(fetchRelationshipsSuccess({ relationships: response.data })); + }).catch(error => { + dispatch(fetchRelationshipsFail(error)); + }); }; } @@ -694,13 +676,3 @@ export const updateAccount = ({ displayName, note, avatar, header, discoverable, dispatch(importFetchedAccount(response.data)); }); }; - -export const navigateToProfile = (accountId) => { - return (_dispatch, getState) => { - const acct = getState().accounts.getIn([accountId, 'acct']); - - if (acct) { - browserHistory.push(`/@${acct}`); - } - }; -}; diff --git a/app/javascript/mastodon/actions/alerts.js b/app/javascript/mastodon/actions/alerts.js new file mode 100644 index 0000000000..42834146bf --- /dev/null +++ b/app/javascript/mastodon/actions/alerts.js @@ -0,0 +1,59 @@ +import { defineMessages } from 'react-intl'; + +const messages = defineMessages({ + unexpectedTitle: { id: 'alert.unexpected.title', defaultMessage: 'Oops!' }, + unexpectedMessage: { id: 'alert.unexpected.message', defaultMessage: 'An unexpected error occurred.' }, + rateLimitedTitle: { id: 'alert.rate_limited.title', defaultMessage: 'Rate limited' }, + rateLimitedMessage: { id: 'alert.rate_limited.message', defaultMessage: 'Please retry after {retry_time, time, medium}.' }, +}); + +export const ALERT_SHOW = 'ALERT_SHOW'; +export const ALERT_DISMISS = 'ALERT_DISMISS'; +export const ALERT_CLEAR = 'ALERT_CLEAR'; +export const ALERT_NOOP = 'ALERT_NOOP'; + +export const dismissAlert = alert => ({ + type: ALERT_DISMISS, + alert, +}); + +export const clearAlert = () => ({ + type: ALERT_CLEAR, +}); + +export const showAlert = alert => ({ + type: ALERT_SHOW, + alert, +}); + +export const showAlertForError = (error, skipNotFound = false) => { + if (error.response) { + const { data, status, statusText, headers } = error.response; + + // Skip these errors as they are reflected in the UI + if (skipNotFound && (status === 404 || status === 410)) { + return { type: ALERT_NOOP }; + } + + // Rate limit errors + if (status === 429 && headers['x-ratelimit-reset']) { + return showAlert({ + title: messages.rateLimitedTitle, + message: messages.rateLimitedMessage, + values: { 'retry_time': new Date(headers['x-ratelimit-reset']) }, + }); + } + + return showAlert({ + title: `${status}`, + message: data.error || statusText, + }); + } + + console.error(error); + + return showAlert({ + title: messages.unexpectedTitle, + message: messages.unexpectedMessage, + }); +}; diff --git a/app/javascript/mastodon/actions/alerts.ts b/app/javascript/mastodon/actions/alerts.ts deleted file mode 100644 index 4fd293e252..0000000000 --- a/app/javascript/mastodon/actions/alerts.ts +++ /dev/null @@ -1,76 +0,0 @@ -import { defineMessages } from 'react-intl'; - -import { createAction } from '@reduxjs/toolkit'; - -import { AxiosError } from 'axios'; -import type { AxiosResponse } from 'axios'; - -import type { Alert } from 'mastodon/models/alert'; - -interface ApiErrorResponse { - error?: string; -} - -const messages = defineMessages({ - unexpectedTitle: { id: 'alert.unexpected.title', defaultMessage: 'Oops!' }, - unexpectedMessage: { - id: 'alert.unexpected.message', - defaultMessage: 'An unexpected error occurred.', - }, - rateLimitedTitle: { - id: 'alert.rate_limited.title', - defaultMessage: 'Rate limited', - }, - rateLimitedMessage: { - id: 'alert.rate_limited.message', - defaultMessage: 'Please retry after {retry_time, time, medium}.', - }, -}); - -export const dismissAlert = createAction<{ key: number }>('alerts/dismiss'); - -export const clearAlerts = createAction('alerts/clear'); - -export const showAlert = createAction>('alerts/show'); - -const ignoreAlert = createAction('alerts/ignore'); - -export const showAlertForError = (error: unknown, skipNotFound = false) => { - if (error instanceof AxiosError && error.response) { - const { status, statusText, headers } = error.response; - const { data } = error.response as AxiosResponse; - - // Skip these errors as they are reflected in the UI - if (skipNotFound && (status === 404 || status === 410)) { - return ignoreAlert(); - } - - // Rate limit errors - if (status === 429 && headers['x-ratelimit-reset']) { - return showAlert({ - title: messages.rateLimitedTitle, - message: messages.rateLimitedMessage, - values: { - retry_time: new Date(headers['x-ratelimit-reset'] as string), - }, - }); - } - - return showAlert({ - title: `${status}`, - message: data.error ?? statusText, - }); - } - - // An aborted request, e.g. due to reloading the browser window, is not really an error - if (error instanceof AxiosError && error.code === AxiosError.ECONNABORTED) { - return ignoreAlert(); - } - - console.error(error); - - return showAlert({ - title: messages.unexpectedTitle, - message: messages.unexpectedMessage, - }); -}; diff --git a/app/javascript/mastodon/actions/antennas.js b/app/javascript/mastodon/actions/antennas.js index 30dc2d42c6..4716897586 100644 --- a/app/javascript/mastodon/actions/antennas.js +++ b/app/javascript/mastodon/actions/antennas.js @@ -1,5 +1,8 @@ import api from '../api'; +import { showAlertForError } from './alerts'; +import { importFetchedAccounts } from './importer'; + export const ANTENNA_FETCH_REQUEST = 'ANTENNA_FETCH_REQUEST'; export const ANTENNA_FETCH_SUCCESS = 'ANTENNA_FETCH_SUCCESS'; export const ANTENNA_FETCH_FAIL = 'ANTENNA_FETCH_FAIL'; @@ -8,10 +11,121 @@ export const ANTENNAS_FETCH_REQUEST = 'ANTENNAS_FETCH_REQUEST'; export const ANTENNAS_FETCH_SUCCESS = 'ANTENNAS_FETCH_SUCCESS'; export const ANTENNAS_FETCH_FAIL = 'ANTENNAS_FETCH_FAIL'; +export const ANTENNA_EDITOR_TITLE_CHANGE = 'ANTENNA_EDITOR_TITLE_CHANGE'; +export const ANTENNA_EDITOR_RESET = 'ANTENNA_EDITOR_RESET'; +export const ANTENNA_EDITOR_SETUP = 'ANTENNA_EDITOR_SETUP'; + +export const ANTENNA_CREATE_REQUEST = 'ANTENNA_CREATE_REQUEST'; +export const ANTENNA_CREATE_SUCCESS = 'ANTENNA_CREATE_SUCCESS'; +export const ANTENNA_CREATE_FAIL = 'ANTENNA_CREATE_FAIL'; + +export const ANTENNA_UPDATE_REQUEST = 'ANTENNA_UPDATE_REQUEST'; +export const ANTENNA_UPDATE_SUCCESS = 'ANTENNA_UPDATE_SUCCESS'; +export const ANTENNA_UPDATE_FAIL = 'ANTENNA_UPDATE_FAIL'; + export const ANTENNA_DELETE_REQUEST = 'ANTENNA_DELETE_REQUEST'; export const ANTENNA_DELETE_SUCCESS = 'ANTENNA_DELETE_SUCCESS'; export const ANTENNA_DELETE_FAIL = 'ANTENNA_DELETE_FAIL'; +export const ANTENNA_ACCOUNTS_FETCH_REQUEST = 'ANTENNA_ACCOUNTS_FETCH_REQUEST'; +export const ANTENNA_ACCOUNTS_FETCH_SUCCESS = 'ANTENNA_ACCOUNTS_FETCH_SUCCESS'; +export const ANTENNA_ACCOUNTS_FETCH_FAIL = 'ANTENNA_ACCOUNTS_FETCH_FAIL'; + +export const ANTENNA_EDITOR_SUGGESTIONS_CHANGE = 'ANTENNA_EDITOR_SUGGESTIONS_CHANGE'; +export const ANTENNA_EDITOR_SUGGESTIONS_READY = 'ANTENNA_EDITOR_SUGGESTIONS_READY'; +export const ANTENNA_EDITOR_SUGGESTIONS_CLEAR = 'ANTENNA_EDITOR_SUGGESTIONS_CLEAR'; + +export const ANTENNA_EDITOR_ADD_REQUEST = 'ANTENNA_EDITOR_ADD_REQUEST'; +export const ANTENNA_EDITOR_ADD_SUCCESS = 'ANTENNA_EDITOR_ADD_SUCCESS'; +export const ANTENNA_EDITOR_ADD_FAIL = 'ANTENNA_EDITOR_ADD_FAIL'; + +export const ANTENNA_EDITOR_REMOVE_REQUEST = 'ANTENNA_EDITOR_REMOVE_REQUEST'; +export const ANTENNA_EDITOR_REMOVE_SUCCESS = 'ANTENNA_EDITOR_REMOVE_SUCCESS'; +export const ANTENNA_EDITOR_REMOVE_FAIL = 'ANTENNA_EDITOR_REMOVE_FAIL'; + +export const ANTENNA_EXCLUDE_ACCOUNTS_FETCH_REQUEST = 'ANTENNA_EXCLUDE_ACCOUNTS_FETCH_REQUEST'; +export const ANTENNA_EXCLUDE_ACCOUNTS_FETCH_SUCCESS = 'ANTENNA_EXCLUDE_ACCOUNTS_FETCH_SUCCESS'; +export const ANTENNA_EXCLUDE_ACCOUNTS_FETCH_FAIL = 'ANTENNA_EXCLUDE_ACCOUNTS_FETCH_FAIL'; + +export const ANTENNA_EDITOR_ADD_EXCLUDE_REQUEST = 'ANTENNA_EDITOR_ADD_EXCLUDE_REQUEST'; +export const ANTENNA_EDITOR_ADD_EXCLUDE_SUCCESS = 'ANTENNA_EDITOR_ADD_EXCLUDE_SUCCESS'; +export const ANTENNA_EDITOR_ADD_EXCLUDE_FAIL = 'ANTENNA_EDITOR_ADD_EXCLUDE_FAIL'; + +export const ANTENNA_EDITOR_REMOVE_EXCLUDE_REQUEST = 'ANTENNA_EDITOR_REMOVE_EXCLUDE_REQUEST'; +export const ANTENNA_EDITOR_REMOVE_EXCLUDE_SUCCESS = 'ANTENNA_EDITOR_REMOVE_EXCLUDE_SUCCESS'; +export const ANTENNA_EDITOR_REMOVE_EXCLUDE_FAIL = 'ANTENNA_EDITOR_REMOVE_EXCLUDE_FAIL'; + +export const ANTENNA_EDITOR_FETCH_DOMAINS_REQUEST = 'ANTENNA_EDITOR_FETCH_DOMAINS_REQUEST'; +export const ANTENNA_EDITOR_FETCH_DOMAINS_SUCCESS = 'ANTENNA_EDITOR_FETCH_DOMAINS_SUCCESS'; +export const ANTENNA_EDITOR_FETCH_DOMAINS_FAIL = 'ANTENNA_EDITOR_FETCH_DOMAINS_FAIL'; + +export const ANTENNA_EDITOR_ADD_DOMAIN_REQUEST = 'ANTENNA_EDITOR_ADD_DOMAIN_REQUEST'; +export const ANTENNA_EDITOR_ADD_DOMAIN_SUCCESS = 'ANTENNA_EDITOR_ADD_DOMAIN_SUCCESS'; +export const ANTENNA_EDITOR_ADD_DOMAIN_FAIL = 'ANTENNA_EDITOR_ADD_DOMAIN_FAIL'; + +export const ANTENNA_EDITOR_ADD_EXCLUDE_DOMAIN_REQUEST = 'ANTENNA_EDITOR_ADD_EXCLUDEDOMAIN_REQUEST'; +export const ANTENNA_EDITOR_ADD_EXCLUDE_DOMAIN_SUCCESS = 'ANTENNA_EDITOR_ADD_EXCLUDE_DOMAIN_SUCCESS'; +export const ANTENNA_EDITOR_ADD_EXCLUDE_DOMAIN_FAIL = 'ANTENNA_EDITOR_ADD_EXCLUDE_DOMAIN_FAIL'; + +export const ANTENNA_EDITOR_REMOVE_DOMAIN_REQUEST = 'ANTENNA_EDITOR_REMOVE_DOMAIN_REQUEST'; +export const ANTENNA_EDITOR_REMOVE_DOMAIN_SUCCESS = 'ANTENNA_EDITOR_REMOVE_DOMAIN_SUCCESS'; +export const ANTENNA_EDITOR_REMOVE_DOMAIN_FAIL = 'ANTENNA_EDITOR_REMOVE_DOMAIN_FAIL'; + +export const ANTENNA_EDITOR_REMOVE_EXCLUDE_DOMAIN_REQUEST = 'ANTENNA_EDITOR_REMOVE_EXCLUDE_DOMAIN_REQUEST'; +export const ANTENNA_EDITOR_REMOVE_EXCLUDE_DOMAIN_SUCCESS = 'ANTENNA_EDITOR_REMOVE_EXCLUDE_DOMAIN_SUCCESS'; +export const ANTENNA_EDITOR_REMOVE_EXCLUDE_DOMAIN_FAIL = 'ANTENNA_EDITOR_REMOVE_EXCLUDE_DOMAIN_FAIL'; + +export const ANTENNA_EDITOR_FETCH_KEYWORDS_REQUEST = 'ANTENNA_EDITOR_FETCH_KEYWORDS_REQUEST'; +export const ANTENNA_EDITOR_FETCH_KEYWORDS_SUCCESS = 'ANTENNA_EDITOR_FETCH_KEYWORDS_SUCCESS'; +export const ANTENNA_EDITOR_FETCH_KEYWORDS_FAIL = 'ANTENNA_EDITOR_FETCH_KEYWORDS_FAIL'; + +export const ANTENNA_EDITOR_ADD_KEYWORD_REQUEST = 'ANTENNA_EDITOR_ADD_KEYWORD_REQUEST'; +export const ANTENNA_EDITOR_ADD_KEYWORD_SUCCESS = 'ANTENNA_EDITOR_ADD_KEYWORD_SUCCESS'; +export const ANTENNA_EDITOR_ADD_KEYWORD_FAIL = 'ANTENNA_EDITOR_ADD_KEYWORD_FAIL'; + +export const ANTENNA_EDITOR_ADD_EXCLUDE_KEYWORD_REQUEST = 'ANTENNA_EDITOR_ADD_EXCLUDE_KEYWORD_REQUEST'; +export const ANTENNA_EDITOR_ADD_EXCLUDE_KEYWORD_SUCCESS = 'ANTENNA_EDITOR_ADD_EXCLUDE_KEYWORD_SUCCESS'; +export const ANTENNA_EDITOR_ADD_EXCLUDE_KEYWORD_FAIL = 'ANTENNA_EDITOR_ADD_EXCLUDE_KEYWORD_FAIL'; + +export const ANTENNA_EDITOR_REMOVE_KEYWORD_REQUEST = 'ANTENNA_EDITOR_REMOVE_KEYWORD_REQUEST'; +export const ANTENNA_EDITOR_REMOVE_KEYWORD_SUCCESS = 'ANTENNA_EDITOR_REMOVE_KEYWORD_SUCCESS'; +export const ANTENNA_EDITOR_REMOVE_KEYWORD_FAIL = 'ANTENNA_EDITOR_REMOVE_KEYWORD_FAIL'; + +export const ANTENNA_EDITOR_REMOVE_EXCLUDE_KEYWORD_REQUEST = 'ANTENNA_EDITOR_REMOVE_EXCLUDE_KEYWORD_REQUEST'; +export const ANTENNA_EDITOR_REMOVE_EXCLUDE_KEYWORD_SUCCESS = 'ANTENNA_EDITOR_REMOVE_EXCLUDE_KEYWORD_SUCCESS'; +export const ANTENNA_EDITOR_REMOVE_EXCLUDE_KEYWORD_FAIL = 'ANTENNA_EDITOR_REMOVE_EXCLUDE_KEYWORD_FAIL'; + +export const ANTENNA_EDITOR_FETCH_TAGS_REQUEST = 'ANTENNA_EDITOR_FETCH_TAGS_REQUEST'; +export const ANTENNA_EDITOR_FETCH_TAGS_SUCCESS = 'ANTENNA_EDITOR_FETCH_TAGS_SUCCESS'; +export const ANTENNA_EDITOR_FETCH_TAGS_FAIL = 'ANTENNA_EDITOR_FETCH_TAGS_FAIL'; + +export const ANTENNA_EDITOR_ADD_TAG_REQUEST = 'ANTENNA_EDITOR_ADD_TAG_REQUEST'; +export const ANTENNA_EDITOR_ADD_TAG_SUCCESS = 'ANTENNA_EDITOR_ADD_TAG_SUCCESS'; +export const ANTENNA_EDITOR_ADD_TAG_FAIL = 'ANTENNA_EDITOR_ADD_TAG_FAIL'; + +export const ANTENNA_EDITOR_ADD_EXCLUDE_TAG_REQUEST = 'ANTENNA_EDITOR_ADD_EXCLUDE_TAG_REQUEST'; +export const ANTENNA_EDITOR_ADD_EXCLUDE_TAG_SUCCESS = 'ANTENNA_EDITOR_ADD_EXCLUDE_TAG_SUCCESS'; +export const ANTENNA_EDITOR_ADD_EXCLUDE_TAG_FAIL = 'ANTENNA_EDITOR_ADD_EXCLUDE_TAG_FAIL'; + +export const ANTENNA_EDITOR_REMOVE_TAG_REQUEST = 'ANTENNA_EDITOR_REMOVE_TAG_REQUEST'; +export const ANTENNA_EDITOR_REMOVE_TAG_SUCCESS = 'ANTENNA_EDITOR_REMOVE_TAG_SUCCESS'; +export const ANTENNA_EDITOR_REMOVE_TAG_FAIL = 'ANTENNA_EDITOR_REMOVE_TAG_FAIL'; + +export const ANTENNA_EDITOR_REMOVE_EXCLUDE_TAG_REQUEST = 'ANTENNA_EDITOR_REMOVE_EXCLUDE_TAG_REQUEST'; +export const ANTENNA_EDITOR_REMOVE_EXCLUDE_TAG_SUCCESS = 'ANTENNA_EDITOR_REMOVE_EXCLUDE_TAG_SUCCESS'; +export const ANTENNA_EDITOR_REMOVE_EXCLUDE_TAG_FAIL = 'ANTENNA_EDITOR_REMOVE_EXCLUDE_TAG_FAIL'; + +export const ANTENNA_ADDER_RESET = 'ANTENNA_ADDER_RESET'; +export const ANTENNA_ADDER_SETUP = 'ANTENNA_ADDER_SETUP'; + +export const ANTENNA_ADDER_ANTENNAS_FETCH_REQUEST = 'ANTENNA_ADDER_ANTENNAS_FETCH_REQUEST'; +export const ANTENNA_ADDER_ANTENNAS_FETCH_SUCCESS = 'ANTENNA_ADDER_ANTENNAS_FETCH_SUCCESS'; +export const ANTENNA_ADDER_ANTENNAS_FETCH_FAIL = 'ANTENNA_ADDER_ANTENNAS_FETCH_FAIL'; + +export const ANTENNA_ADDER_EXCLUDE_ANTENNAS_FETCH_REQUEST = 'ANTENNA_ADDER_EXCLUDE_ANTENNAS_FETCH_REQUEST'; +export const ANTENNA_ADDER_EXCLUDE_ANTENNAS_FETCH_SUCCESS = 'ANTENNA_ADDER_EXCLUDE_ANTENNAS_FETCH_SUCCESS'; +export const ANTENNA_ADDER_EXCLUDE_ANTENNAS_FETCH_FAIL = 'ANTENNA_ADDER_EXCLUDE_ANTENNAS_FETCH_FAIL'; + export const fetchAntenna = id => (dispatch, getState) => { if (getState().getIn(['antennas', id])) { return; @@ -62,6 +176,98 @@ export const fetchAntennasFail = error => ({ error, }); +export const submitAntennaEditor = shouldReset => (dispatch, getState) => { + const antennaId = getState().getIn(['antennaEditor', 'antennaId']); + const title = getState().getIn(['antennaEditor', 'title']); + + if (antennaId === null) { + dispatch(createAntenna(title, shouldReset)); + } else { + dispatch(updateAntenna(antennaId, title, shouldReset)); + } +}; + +export const setupAntennaEditor = antennaId => (dispatch, getState) => { + dispatch({ + type: ANTENNA_EDITOR_SETUP, + antenna: getState().getIn(['antennas', antennaId]), + }); + + dispatch(fetchAntennaAccounts(antennaId)); +}; + +export const setupExcludeAntennaEditor = antennaId => (dispatch, getState) => { + dispatch({ + type: ANTENNA_EDITOR_SETUP, + antenna: getState().getIn(['antennas', antennaId]), + }); + + dispatch(fetchAntennaExcludeAccounts(antennaId)); +}; + +export const changeAntennaEditorTitle = value => ({ + type: ANTENNA_EDITOR_TITLE_CHANGE, + value, +}); + +export const createAntenna = (title, shouldReset) => (dispatch, getState) => { + dispatch(createAntennaRequest()); + + api(getState).post('/api/v1/antennas', { title }).then(({ data }) => { + dispatch(createAntennaSuccess(data)); + + if (shouldReset) { + dispatch(resetAntennaEditor()); + } + }).catch(err => dispatch(createAntennaFail(err))); +}; + +export const createAntennaRequest = () => ({ + type: ANTENNA_CREATE_REQUEST, +}); + +export const createAntennaSuccess = antenna => ({ + type: ANTENNA_CREATE_SUCCESS, + antenna, +}); + +export const createAntennaFail = error => ({ + type: ANTENNA_CREATE_FAIL, + error, +}); + +export const updateAntenna = (id, title, shouldReset, list_id, stl, ltl, with_media_only, ignore_reblog, insert_feeds) => (dispatch, getState) => { + dispatch(updateAntennaRequest(id)); + + api(getState).put(`/api/v1/antennas/${id}`, { title, list_id, stl, ltl, with_media_only, ignore_reblog, insert_feeds }).then(({ data }) => { + dispatch(updateAntennaSuccess(data)); + + if (shouldReset) { + dispatch(resetAntennaEditor()); + } + }).catch(err => dispatch(updateAntennaFail(id, err))); +}; + +export const updateAntennaRequest = id => ({ + type: ANTENNA_UPDATE_REQUEST, + id, +}); + +export const updateAntennaSuccess = antenna => ({ + type: ANTENNA_UPDATE_SUCCESS, + antenna, +}); + +export const updateAntennaFail = (id, error) => ({ + type: ANTENNA_UPDATE_FAIL, + id, + error, +}); + +export const resetAntennaEditor = () => ({ + type: ANTENNA_EDITOR_RESET, +}); + export const deleteAntenna = id => (dispatch, getState) => { dispatch(deleteAntennaRequest(id)); @@ -85,3 +291,696 @@ export const deleteAntennaFail = (id, error) => ({ id, error, }); + +export const fetchAntennaAccounts = antennaId => (dispatch, getState) => { + dispatch(fetchAntennaAccountsRequest(antennaId)); + + api(getState).get(`/api/v1/antennas/${antennaId}/accounts`, { params: { limit: 0 } }).then(({ data }) => { + dispatch(importFetchedAccounts(data)); + dispatch(fetchAntennaAccountsSuccess(antennaId, data)); + }).catch(err => dispatch(fetchAntennaAccountsFail(antennaId, err))); +}; + +export const fetchAntennaAccountsRequest = id => ({ + type: ANTENNA_ACCOUNTS_FETCH_REQUEST, + id, +}); + +export const fetchAntennaAccountsSuccess = (id, accounts, next) => ({ + type: ANTENNA_ACCOUNTS_FETCH_SUCCESS, + id, + accounts, + next, +}); + +export const fetchAntennaAccountsFail = (id, error) => ({ + type: ANTENNA_ACCOUNTS_FETCH_FAIL, + id, + error, +}); + +export const fetchAntennaExcludeAccounts = antennaId => (dispatch, getState) => { + dispatch(fetchAntennaExcludeAccountsRequest(antennaId)); + + api(getState).get(`/api/v1/antennas/${antennaId}/exclude_accounts`, { params: { limit: 0 } }).then(({ data }) => { + dispatch(importFetchedAccounts(data)); + dispatch(fetchAntennaExcludeAccountsSuccess(antennaId, data)); + }).catch(err => dispatch(fetchAntennaExcludeAccountsFail(antennaId, err))); +}; + +export const fetchAntennaExcludeAccountsRequest = id => ({ + type: ANTENNA_EXCLUDE_ACCOUNTS_FETCH_REQUEST, + id, +}); + +export const fetchAntennaExcludeAccountsSuccess = (id, accounts, next) => ({ + type: ANTENNA_EXCLUDE_ACCOUNTS_FETCH_SUCCESS, + id, + accounts, + next, +}); + +export const fetchAntennaExcludeAccountsFail = (id, error) => ({ + type: ANTENNA_EXCLUDE_ACCOUNTS_FETCH_FAIL, + id, + error, +}); + +export const fetchAntennaSuggestions = q => (dispatch, getState) => { + const params = { + q, + resolve: false, + }; + + api(getState).get('/api/v1/accounts/search', { params }).then(({ data }) => { + dispatch(importFetchedAccounts(data)); + dispatch(fetchAntennaSuggestionsReady(q, data)); + }).catch(error => dispatch(showAlertForError(error))); +}; + +export const fetchAntennaSuggestionsReady = (query, accounts) => ({ + type: ANTENNA_EDITOR_SUGGESTIONS_READY, + query, + accounts, +}); + +export const clearAntennaSuggestions = () => ({ + type: ANTENNA_EDITOR_SUGGESTIONS_CLEAR, +}); + +export const changeAntennaSuggestions = value => ({ + type: ANTENNA_EDITOR_SUGGESTIONS_CHANGE, + value, +}); + +export const addToAntennaEditor = accountId => (dispatch, getState) => { + dispatch(addToAntenna(getState().getIn(['antennaEditor', 'antennaId']), accountId)); +}; + +export const addToAntenna = (antennaId, accountId) => (dispatch, getState) => { + dispatch(addToAntennaRequest(antennaId, accountId)); + + api(getState).post(`/api/v1/antennas/${antennaId}/accounts`, { account_ids: [accountId] }) + .then(() => dispatch(addToAntennaSuccess(antennaId, accountId))) + .catch(err => dispatch(addToAntennaFail(antennaId, accountId, err))); +}; + +export const addToAntennaRequest = (antennaId, accountId) => ({ + type: ANTENNA_EDITOR_ADD_REQUEST, + antennaId, + accountId, +}); + +export const addToAntennaSuccess = (antennaId, accountId) => ({ + type: ANTENNA_EDITOR_ADD_SUCCESS, + antennaId, + accountId, +}); + +export const addToAntennaFail = (antennaId, accountId, error) => ({ + type: ANTENNA_EDITOR_ADD_FAIL, + antennaId, + accountId, + error, +}); + +export const addExcludeToAntennaEditor = accountId => (dispatch, getState) => { + dispatch(addExcludeToAntenna(getState().getIn(['antennaEditor', 'antennaId']), accountId)); +}; + +export const addExcludeToAntenna = (antennaId, accountId) => (dispatch, getState) => { + dispatch(addExcludeToAntennaRequest(antennaId, accountId)); + + api(getState).post(`/api/v1/antennas/${antennaId}/exclude_accounts`, { account_ids: [accountId] }) + .then(() => dispatch(addExcludeToAntennaSuccess(antennaId, accountId))) + .catch(err => dispatch(addExcludeToAntennaFail(antennaId, accountId, err))); +}; + +export const addExcludeToAntennaRequest = (antennaId, accountId) => ({ + type: ANTENNA_EDITOR_ADD_EXCLUDE_REQUEST, + antennaId, + accountId, +}); + +export const addExcludeToAntennaSuccess = (antennaId, accountId) => ({ + type: ANTENNA_EDITOR_ADD_EXCLUDE_SUCCESS, + antennaId, + accountId, +}); + +export const addExcludeToAntennaFail = (antennaId, accountId, error) => ({ + type: ANTENNA_EDITOR_ADD_EXCLUDE_FAIL, + antennaId, + accountId, + error, +}); + +export const removeFromAntennaEditor = accountId => (dispatch, getState) => { + dispatch(removeFromAntenna(getState().getIn(['antennaEditor', 'antennaId']), accountId)); +}; + +export const removeFromAntenna = (antennaId, accountId) => (dispatch, getState) => { + dispatch(removeFromAntennaRequest(antennaId, accountId)); + + api(getState).delete(`/api/v1/antennas/${antennaId}/accounts`, { params: { account_ids: [accountId] } }) + .then(() => dispatch(removeFromAntennaSuccess(antennaId, accountId))) + .catch(err => dispatch(removeFromAntennaFail(antennaId, accountId, err))); +}; + +export const removeFromAntennaRequest = (antennaId, accountId) => ({ + type: ANTENNA_EDITOR_REMOVE_REQUEST, + antennaId, + accountId, +}); + +export const removeFromAntennaSuccess = (antennaId, accountId) => ({ + type: ANTENNA_EDITOR_REMOVE_SUCCESS, + antennaId, + accountId, +}); + +export const removeFromAntennaFail = (antennaId, accountId, error) => ({ + type: ANTENNA_EDITOR_REMOVE_FAIL, + antennaId, + accountId, + error, +}); + +export const removeExcludeFromAntennaEditor = accountId => (dispatch, getState) => { + dispatch(removeExcludeFromAntenna(getState().getIn(['antennaEditor', 'antennaId']), accountId)); +}; + +export const removeExcludeFromAntenna = (antennaId, accountId) => (dispatch, getState) => { + dispatch(removeExcludeFromAntennaRequest(antennaId, accountId)); + + api(getState).delete(`/api/v1/antennas/${antennaId}/exclude_accounts`, { params: { account_ids: [accountId] } }) + .then(() => dispatch(removeExcludeFromAntennaSuccess(antennaId, accountId))) + .catch(err => dispatch(removeExcludeFromAntennaFail(antennaId, accountId, err))); +}; + +export const removeExcludeFromAntennaRequest = (antennaId, accountId) => ({ + type: ANTENNA_EDITOR_REMOVE_EXCLUDE_REQUEST, + antennaId, + accountId, +}); + +export const removeExcludeFromAntennaSuccess = (antennaId, accountId) => ({ + type: ANTENNA_EDITOR_REMOVE_EXCLUDE_SUCCESS, + antennaId, + accountId, +}); + +export const removeExcludeFromAntennaFail = (antennaId, accountId, error) => ({ + type: ANTENNA_EDITOR_REMOVE_EXCLUDE_FAIL, + antennaId, + accountId, + error, +}); + +export const fetchAntennaDomains = antennaId => (dispatch, getState) => { + dispatch(fetchAntennaDomainsRequest(antennaId)); + + api(getState).get(`/api/v1/antennas/${antennaId}/domains`, { params: { limit: 0 } }).then(({ data }) => { + dispatch(fetchAntennaDomainsSuccess(antennaId, data)); + }).catch(err => dispatch(fetchAntennaDomainsFail(antennaId, err))); +}; + +export const fetchAntennaDomainsRequest = id => ({ + type: ANTENNA_EDITOR_FETCH_DOMAINS_REQUEST, + id, +}); + +export const fetchAntennaDomainsSuccess = (id, domains) => ({ + type: ANTENNA_EDITOR_FETCH_DOMAINS_SUCCESS, + id, + domains, +}); + +export const fetchAntennaDomainsFail = (id, error) => ({ + type: ANTENNA_EDITOR_FETCH_DOMAINS_FAIL, + id, + error, +}); + +export const addDomainToAntenna = (antennaId, domain) => (dispatch, getState) => { + dispatch(addDomainToAntennaRequest(antennaId, domain)); + + api(getState).post(`/api/v1/antennas/${antennaId}/domains`, { domains: [domain] }) + .then(() => dispatch(addDomainToAntennaSuccess(antennaId, domain))) + .catch(err => dispatch(addDomainToAntennaFail(antennaId, domain, err))); +}; + +export const addDomainToAntennaRequest = (antennaId, domain) => ({ + type: ANTENNA_EDITOR_ADD_DOMAIN_REQUEST, + antennaId, + domain, +}); + +export const addDomainToAntennaSuccess = (antennaId, domain) => ({ + type: ANTENNA_EDITOR_ADD_DOMAIN_SUCCESS, + antennaId, + domain, +}); + +export const addDomainToAntennaFail = (antennaId, domain, error) => ({ + type: ANTENNA_EDITOR_ADD_DOMAIN_FAIL, + antennaId, + domain, + error, +}); + +export const removeDomainFromAntenna = (antennaId, domain) => (dispatch, getState) => { + dispatch(removeDomainFromAntennaRequest(antennaId, domain)); + + api(getState).delete(`/api/v1/antennas/${antennaId}/domains`, { params: { domains: [domain] } }) + .then(() => dispatch(removeDomainFromAntennaSuccess(antennaId, domain))) + .catch(err => dispatch(removeDomainFromAntennaFail(antennaId, domain, err))); +}; + +export const removeDomainFromAntennaRequest = (antennaId, domain) => ({ + type: ANTENNA_EDITOR_REMOVE_DOMAIN_REQUEST, + antennaId, + domain, +}); + +export const removeDomainFromAntennaSuccess = (antennaId, domain) => ({ + type: ANTENNA_EDITOR_REMOVE_DOMAIN_SUCCESS, + antennaId, + domain, +}); + +export const removeDomainFromAntennaFail = (antennaId, domain, error) => ({ + type: ANTENNA_EDITOR_REMOVE_DOMAIN_FAIL, + antennaId, + domain, + error, +}); + +export const addExcludeDomainToAntenna = (antennaId, domain) => (dispatch, getState) => { + dispatch(addExcludeDomainToAntennaRequest(antennaId, domain)); + + api(getState).post(`/api/v1/antennas/${antennaId}/exclude_domains`, { domains: [domain] }) + .then(() => dispatch(addExcludeDomainToAntennaSuccess(antennaId, domain))) + .catch(err => dispatch(addExcludeDomainToAntennaFail(antennaId, domain, err))); +}; + +export const addExcludeDomainToAntennaRequest = (antennaId, domain) => ({ + type: ANTENNA_EDITOR_ADD_EXCLUDE_DOMAIN_REQUEST, + antennaId, + domain, +}); + +export const addExcludeDomainToAntennaSuccess = (antennaId, domain) => ({ + type: ANTENNA_EDITOR_ADD_EXCLUDE_DOMAIN_SUCCESS, + antennaId, + domain, +}); + +export const addExcludeDomainToAntennaFail = (antennaId, domain, error) => ({ + type: ANTENNA_EDITOR_ADD_EXCLUDE_DOMAIN_FAIL, + antennaId, + domain, + error, +}); + +export const removeExcludeDomainFromAntenna = (antennaId, domain) => (dispatch, getState) => { + dispatch(removeExcludeDomainFromAntennaRequest(antennaId, domain)); + + api(getState).delete(`/api/v1/antennas/${antennaId}/exclude_domains`, { params: { domains: [domain] } }) + .then(() => dispatch(removeExcludeDomainFromAntennaSuccess(antennaId, domain))) + .catch(err => dispatch(removeExcludeDomainFromAntennaFail(antennaId, domain, err))); +}; + +export const removeExcludeDomainFromAntennaRequest = (antennaId, domain) => ({ + type: ANTENNA_EDITOR_REMOVE_EXCLUDE_DOMAIN_REQUEST, + antennaId, + domain, +}); + +export const removeExcludeDomainFromAntennaSuccess = (antennaId, domain) => ({ + type: ANTENNA_EDITOR_REMOVE_EXCLUDE_DOMAIN_SUCCESS, + antennaId, + domain, +}); + +export const removeExcludeDomainFromAntennaFail = (antennaId, domain, error) => ({ + type: ANTENNA_EDITOR_REMOVE_EXCLUDE_DOMAIN_FAIL, + antennaId, + domain, + error, +}); + +export const fetchAntennaKeywords = antennaId => (dispatch, getState) => { + dispatch(fetchAntennaKeywordsRequest(antennaId)); + + api(getState).get(`/api/v1/antennas/${antennaId}/keywords`, { params: { limit: 0 } }).then(({ data }) => { + dispatch(fetchAntennaKeywordsSuccess(antennaId, data)); + }).catch(err => dispatch(fetchAntennaKeywordsFail(antennaId, err))); +}; + +export const fetchAntennaKeywordsRequest = id => ({ + type: ANTENNA_EDITOR_FETCH_KEYWORDS_REQUEST, + id, +}); + +export const fetchAntennaKeywordsSuccess = (id, keywords) => ({ + type: ANTENNA_EDITOR_FETCH_KEYWORDS_SUCCESS, + id, + keywords, +}); + +export const fetchAntennaKeywordsFail = (id, error) => ({ + type: ANTENNA_EDITOR_FETCH_KEYWORDS_FAIL, + id, + error, +}); + +export const addKeywordToAntenna = (antennaId, keyword) => (dispatch, getState) => { + dispatch(addKeywordToAntennaRequest(antennaId, keyword)); + + api(getState).post(`/api/v1/antennas/${antennaId}/keywords`, { keywords: [keyword] }) + .then(() => dispatch(addKeywordToAntennaSuccess(antennaId, keyword))) + .catch(err => dispatch(addKeywordToAntennaFail(antennaId, keyword, err))); +}; + +export const addKeywordToAntennaRequest = (antennaId, keyword) => ({ + type: ANTENNA_EDITOR_ADD_KEYWORD_REQUEST, + antennaId, + keyword, +}); + +export const addKeywordToAntennaSuccess = (antennaId, keyword) => ({ + type: ANTENNA_EDITOR_ADD_KEYWORD_SUCCESS, + antennaId, + keyword, +}); + +export const addKeywordToAntennaFail = (antennaId, keyword, error) => ({ + type: ANTENNA_EDITOR_ADD_KEYWORD_FAIL, + antennaId, + keyword, + error, +}); + +export const removeKeywordFromAntenna = (antennaId, keyword) => (dispatch, getState) => { + dispatch(removeKeywordFromAntennaRequest(antennaId, keyword)); + + api(getState).delete(`/api/v1/antennas/${antennaId}/keywords`, { params: { keywords: [keyword] } }) + .then(() => dispatch(removeKeywordFromAntennaSuccess(antennaId, keyword))) + .catch(err => dispatch(removeKeywordFromAntennaFail(antennaId, keyword, err))); +}; + +export const removeKeywordFromAntennaRequest = (antennaId, keyword) => ({ + type: ANTENNA_EDITOR_REMOVE_KEYWORD_REQUEST, + antennaId, + keyword, +}); + +export const removeKeywordFromAntennaSuccess = (antennaId, keyword) => ({ + type: ANTENNA_EDITOR_REMOVE_KEYWORD_SUCCESS, + antennaId, + keyword, +}); + +export const removeKeywordFromAntennaFail = (antennaId, keyword, error) => ({ + type: ANTENNA_EDITOR_REMOVE_KEYWORD_FAIL, + antennaId, + keyword, + error, +}); + +export const addExcludeKeywordToAntenna = (antennaId, keyword) => (dispatch, getState) => { + dispatch(addExcludeKeywordToAntennaRequest(antennaId, keyword)); + + api(getState).post(`/api/v1/antennas/${antennaId}/exclude_keywords`, { keywords: [keyword] }) + .then(() => dispatch(addExcludeKeywordToAntennaSuccess(antennaId, keyword))) + .catch(err => dispatch(addExcludeKeywordToAntennaFail(antennaId, keyword, err))); +}; + +export const addExcludeKeywordToAntennaRequest = (antennaId, keyword) => ({ + type: ANTENNA_EDITOR_ADD_EXCLUDE_KEYWORD_REQUEST, + antennaId, + keyword, +}); + +export const addExcludeKeywordToAntennaSuccess = (antennaId, keyword) => ({ + type: ANTENNA_EDITOR_ADD_EXCLUDE_KEYWORD_SUCCESS, + antennaId, + keyword, +}); + +export const addExcludeKeywordToAntennaFail = (antennaId, keyword, error) => ({ + type: ANTENNA_EDITOR_ADD_EXCLUDE_KEYWORD_FAIL, + antennaId, + keyword, + error, +}); + +export const removeExcludeKeywordFromAntenna = (antennaId, keyword) => (dispatch, getState) => { + dispatch(removeExcludeKeywordFromAntennaRequest(antennaId, keyword)); + + api(getState).delete(`/api/v1/antennas/${antennaId}/exclude_keywords`, { params: { keywords: [keyword] } }) + .then(() => dispatch(removeExcludeKeywordFromAntennaSuccess(antennaId, keyword))) + .catch(err => dispatch(removeExcludeKeywordFromAntennaFail(antennaId, keyword, err))); +}; + +export const removeExcludeKeywordFromAntennaRequest = (antennaId, keyword) => ({ + type: ANTENNA_EDITOR_REMOVE_EXCLUDE_KEYWORD_REQUEST, + antennaId, + keyword, +}); + +export const removeExcludeKeywordFromAntennaSuccess = (antennaId, keyword) => ({ + type: ANTENNA_EDITOR_REMOVE_EXCLUDE_KEYWORD_SUCCESS, + antennaId, + keyword, +}); + +export const removeExcludeKeywordFromAntennaFail = (antennaId, keyword, error) => ({ + type: ANTENNA_EDITOR_REMOVE_EXCLUDE_KEYWORD_FAIL, + antennaId, + keyword, + error, +}); + +export const fetchAntennaTags = antennaId => (dispatch, getState) => { + dispatch(fetchAntennaTagsRequest(antennaId)); + + api(getState).get(`/api/v1/antennas/${antennaId}/tags`, { params: { limit: 0 } }).then(({ data }) => { + dispatch(fetchAntennaTagsSuccess(antennaId, data)); + }).catch(err => dispatch(fetchAntennaTagsFail(antennaId, err))); +}; + +export const fetchAntennaTagsRequest = id => ({ + type: ANTENNA_EDITOR_FETCH_TAGS_REQUEST, + id, +}); + +export const fetchAntennaTagsSuccess = (id, tags) => ({ + type: ANTENNA_EDITOR_FETCH_TAGS_SUCCESS, + id, + tags, +}); + +export const fetchAntennaTagsFail = (id, error) => ({ + type: ANTENNA_EDITOR_FETCH_TAGS_FAIL, + id, + error, +}); + +export const addTagToAntenna = (antennaId, tag) => (dispatch, getState) => { + dispatch(addTagToAntennaRequest(antennaId, tag)); + + api(getState).post(`/api/v1/antennas/${antennaId}/tags`, { tags: [tag] }) + .then(() => dispatch(addTagToAntennaSuccess(antennaId, tag))) + .catch(err => dispatch(addTagToAntennaFail(antennaId, tag, err))); +}; + +export const addTagToAntennaRequest = (antennaId, tag) => ({ + type: ANTENNA_EDITOR_ADD_TAG_REQUEST, + antennaId, + tag, +}); + +export const addTagToAntennaSuccess = (antennaId, tag) => ({ + type: ANTENNA_EDITOR_ADD_TAG_SUCCESS, + antennaId, + tag, +}); + +export const addTagToAntennaFail = (antennaId, tag, error) => ({ + type: ANTENNA_EDITOR_ADD_TAG_FAIL, + antennaId, + tag, + error, +}); + +export const removeTagFromAntenna = (antennaId, tag) => (dispatch, getState) => { + dispatch(removeTagFromAntennaRequest(antennaId, tag)); + + api(getState).delete(`/api/v1/antennas/${antennaId}/tags`, { params: { tags: [tag] } }) + .then(() => dispatch(removeTagFromAntennaSuccess(antennaId, tag))) + .catch(err => dispatch(removeTagFromAntennaFail(antennaId, tag, err))); +}; + +export const removeTagFromAntennaRequest = (antennaId, tag) => ({ + type: ANTENNA_EDITOR_REMOVE_TAG_REQUEST, + antennaId, + tag, +}); + +export const removeTagFromAntennaSuccess = (antennaId, tag) => ({ + type: ANTENNA_EDITOR_REMOVE_TAG_SUCCESS, + antennaId, + tag, +}); + +export const removeTagFromAntennaFail = (antennaId, tag, error) => ({ + type: ANTENNA_EDITOR_REMOVE_TAG_FAIL, + antennaId, + tag, + error, +}); + +export const addExcludeTagToAntenna = (antennaId, tag) => (dispatch, getState) => { + dispatch(addExcludeTagToAntennaRequest(antennaId, tag)); + + api(getState).post(`/api/v1/antennas/${antennaId}/exclude_tags`, { tags: [tag] }) + .then(() => dispatch(addExcludeTagToAntennaSuccess(antennaId, tag))) + .catch(err => dispatch(addExcludeTagToAntennaFail(antennaId, tag, err))); +}; + +export const addExcludeTagToAntennaRequest = (antennaId, tag) => ({ + type: ANTENNA_EDITOR_ADD_EXCLUDE_TAG_REQUEST, + antennaId, + tag, +}); + +export const addExcludeTagToAntennaSuccess = (antennaId, tag) => ({ + type: ANTENNA_EDITOR_ADD_EXCLUDE_TAG_SUCCESS, + antennaId, + tag, +}); + +export const addExcludeTagToAntennaFail = (antennaId, tag, error) => ({ + type: ANTENNA_EDITOR_ADD_EXCLUDE_TAG_FAIL, + antennaId, + tag, + error, +}); + +export const removeExcludeTagFromAntenna = (antennaId, tag) => (dispatch, getState) => { + dispatch(removeExcludeTagFromAntennaRequest(antennaId, tag)); + + api(getState).delete(`/api/v1/antennas/${antennaId}/exclude_tags`, { params: { tags: [tag] } }) + .then(() => dispatch(removeExcludeTagFromAntennaSuccess(antennaId, tag))) + .catch(err => dispatch(removeExcludeTagFromAntennaFail(antennaId, tag, err))); +}; + +export const removeExcludeTagFromAntennaRequest = (antennaId, tag) => ({ + type: ANTENNA_EDITOR_REMOVE_EXCLUDE_TAG_REQUEST, + antennaId, + tag, +}); + +export const removeExcludeTagFromAntennaSuccess = (antennaId, tag) => ({ + type: ANTENNA_EDITOR_REMOVE_EXCLUDE_TAG_SUCCESS, + antennaId, + tag, +}); + +export const removeExcludeTagFromAntennaFail = (antennaId, tag, error) => ({ + type: ANTENNA_EDITOR_REMOVE_EXCLUDE_TAG_FAIL, + antennaId, + tag, + error, +}); + +export const resetAntennaAdder = () => ({ + type: ANTENNA_ADDER_RESET, +}); + +export const setupAntennaAdder = accountId => (dispatch, getState) => { + dispatch({ + type: ANTENNA_ADDER_SETUP, + account: getState().getIn(['accounts', accountId]), + }); + dispatch(fetchAntennas()); + dispatch(fetchAccountAntennas(accountId)); +}; + +export const setupExcludeAntennaAdder = accountId => (dispatch, getState) => { + dispatch({ + type: ANTENNA_ADDER_SETUP, + account: getState().getIn(['accounts', accountId]), + }); + dispatch(fetchAntennas()); + dispatch(fetchExcludeAccountAntennas(accountId)); +}; + +export const fetchAccountAntennas = accountId => (dispatch, getState) => { + dispatch(fetchAccountAntennasRequest(accountId)); + + api(getState).get(`/api/v1/accounts/${accountId}/antennas`) + .then(({ data }) => dispatch(fetchAccountAntennasSuccess(accountId, data))) + .catch(err => dispatch(fetchAccountAntennasFail(accountId, err))); +}; + +export const fetchAccountAntennasRequest = id => ({ + type:ANTENNA_ADDER_ANTENNAS_FETCH_REQUEST, + id, +}); + +export const fetchAccountAntennasSuccess = (id, antennas) => ({ + type: ANTENNA_ADDER_ANTENNAS_FETCH_SUCCESS, + id, + antennas, +}); + +export const fetchAccountAntennasFail = (id, err) => ({ + type: ANTENNA_ADDER_ANTENNAS_FETCH_FAIL, + id, + err, +}); + +export const fetchExcludeAccountAntennas = accountId => (dispatch, getState) => { + dispatch(fetchExcludeAccountAntennasRequest(accountId)); + + api(getState).get(`/api/v1/accounts/${accountId}/exclude_antennas`) + .then(({ data }) => dispatch(fetchExcludeAccountAntennasSuccess(accountId, data))) + .catch(err => dispatch(fetchExcludeAccountAntennasFail(accountId, err))); +}; + +export const fetchExcludeAccountAntennasRequest = id => ({ + type:ANTENNA_ADDER_EXCLUDE_ANTENNAS_FETCH_REQUEST, + id, +}); + +export const fetchExcludeAccountAntennasSuccess = (id, antennas) => ({ + type: ANTENNA_ADDER_EXCLUDE_ANTENNAS_FETCH_SUCCESS, + id, + antennas, +}); + +export const fetchExcludeAccountAntennasFail = (id, err) => ({ + type: ANTENNA_ADDER_EXCLUDE_ANTENNAS_FETCH_FAIL, + id, + err, +}); + +export const addToAntennaAdder = antennaId => (dispatch, getState) => { + dispatch(addToAntenna(antennaId, getState().getIn(['antennaAdder', 'accountId']))); +}; + +export const removeFromAntennaAdder = antennaId => (dispatch, getState) => { + dispatch(removeFromAntenna(antennaId, getState().getIn(['antennaAdder', 'accountId']))); +}; + +export const addExcludeToAntennaAdder = antennaId => (dispatch, getState) => { + dispatch(addExcludeToAntenna(antennaId, getState().getIn(['antennaAdder', 'accountId']))); +}; + +export const removeExcludeFromAntennaAdder = antennaId => (dispatch, getState) => { + dispatch(removeExcludeFromAntenna(antennaId, getState().getIn(['antennaAdder', 'accountId']))); +}; + diff --git a/app/javascript/mastodon/actions/antennas_typed.ts b/app/javascript/mastodon/actions/antennas_typed.ts deleted file mode 100644 index f385b37d6e..0000000000 --- a/app/javascript/mastodon/actions/antennas_typed.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { apiCreate, apiUpdate } from 'mastodon/api/antennas'; -import type { Antenna } from 'mastodon/models/antenna'; -import { createDataLoadingThunk } from 'mastodon/store/typed_functions'; - -export const createAntenna = createDataLoadingThunk( - 'antenna/create', - (antenna: Partial) => apiCreate(antenna), -); - -export const updateAntenna = createDataLoadingThunk( - 'antenna/update', - (antenna: Partial) => apiUpdate(antenna), -); diff --git a/app/javascript/mastodon/actions/bookmark_categories.js b/app/javascript/mastodon/actions/bookmark_categories.js index 313d5de8f2..7d458b85ec 100644 --- a/app/javascript/mastodon/actions/bookmark_categories.js +++ b/app/javascript/mastodon/actions/bookmark_categories.js @@ -1,6 +1,10 @@ +import { bookmarkCategoryNeeded } from 'mastodon/initial_state'; +import { makeGetStatus } from 'mastodon/selectors'; + import api, { getLinks } from '../api'; import { importFetchedStatuses } from './importer'; +import { unbookmark } from './interactions'; export const BOOKMARK_CATEGORY_FETCH_REQUEST = 'BOOKMARK_CATEGORY_FETCH_REQUEST'; export const BOOKMARK_CATEGORY_FETCH_SUCCESS = 'BOOKMARK_CATEGORY_FETCH_SUCCESS'; @@ -10,6 +14,18 @@ export const BOOKMARK_CATEGORIES_FETCH_REQUEST = 'BOOKMARK_CATEGORIES_FETCH_REQU export const BOOKMARK_CATEGORIES_FETCH_SUCCESS = 'BOOKMARK_CATEGORIES_FETCH_SUCCESS'; export const BOOKMARK_CATEGORIES_FETCH_FAIL = 'BOOKMARK_CATEGORIES_FETCH_FAIL'; +export const BOOKMARK_CATEGORY_EDITOR_TITLE_CHANGE = 'BOOKMARK_CATEGORY_EDITOR_TITLE_CHANGE'; +export const BOOKMARK_CATEGORY_EDITOR_RESET = 'BOOKMARK_CATEGORY_EDITOR_RESET'; +export const BOOKMARK_CATEGORY_EDITOR_SETUP = 'BOOKMARK_CATEGORY_EDITOR_SETUP'; + +export const BOOKMARK_CATEGORY_CREATE_REQUEST = 'BOOKMARK_CATEGORY_CREATE_REQUEST'; +export const BOOKMARK_CATEGORY_CREATE_SUCCESS = 'BOOKMARK_CATEGORY_CREATE_SUCCESS'; +export const BOOKMARK_CATEGORY_CREATE_FAIL = 'BOOKMARK_CATEGORY_CREATE_FAIL'; + +export const BOOKMARK_CATEGORY_UPDATE_REQUEST = 'BOOKMARK_CATEGORY_UPDATE_REQUEST'; +export const BOOKMARK_CATEGORY_UPDATE_SUCCESS = 'BOOKMARK_CATEGORY_UPDATE_SUCCESS'; +export const BOOKMARK_CATEGORY_UPDATE_FAIL = 'BOOKMARK_CATEGORY_UPDATE_FAIL'; + export const BOOKMARK_CATEGORY_DELETE_REQUEST = 'BOOKMARK_CATEGORY_DELETE_REQUEST'; export const BOOKMARK_CATEGORY_DELETE_SUCCESS = 'BOOKMARK_CATEGORY_DELETE_SUCCESS'; export const BOOKMARK_CATEGORY_DELETE_FAIL = 'BOOKMARK_CATEGORY_DELETE_FAIL'; @@ -18,13 +34,25 @@ export const BOOKMARK_CATEGORY_STATUSES_FETCH_REQUEST = 'BOOKMARK_CATEGORY_STATU export const BOOKMARK_CATEGORY_STATUSES_FETCH_SUCCESS = 'BOOKMARK_CATEGORY_STATUSES_FETCH_SUCCESS'; export const BOOKMARK_CATEGORY_STATUSES_FETCH_FAIL = 'BOOKMARK_CATEGORY_STATUSES_FETCH_FAIL'; +export const BOOKMARK_CATEGORY_EDITOR_ADD_REQUEST = 'BOOKMARK_CATEGORY_EDITOR_ADD_REQUEST'; +export const BOOKMARK_CATEGORY_EDITOR_ADD_SUCCESS = 'BOOKMARK_CATEGORY_EDITOR_ADD_SUCCESS'; +export const BOOKMARK_CATEGORY_EDITOR_ADD_FAIL = 'BOOKMARK_CATEGORY_EDITOR_ADD_FAIL'; + +export const BOOKMARK_CATEGORY_EDITOR_REMOVE_REQUEST = 'BOOKMARK_CATEGORY_EDITOR_REMOVE_REQUEST'; +export const BOOKMARK_CATEGORY_EDITOR_REMOVE_SUCCESS = 'BOOKMARK_CATEGORY_EDITOR_REMOVE_SUCCESS'; +export const BOOKMARK_CATEGORY_EDITOR_REMOVE_FAIL = 'BOOKMARK_CATEGORY_EDITOR_REMOVE_FAIL'; + +export const BOOKMARK_CATEGORY_ADDER_RESET = 'BOOKMARK_CATEGORY_ADDER_RESET'; +export const BOOKMARK_CATEGORY_ADDER_SETUP = 'BOOKMARK_CATEGORY_ADDER_SETUP'; + +export const BOOKMARK_CATEGORY_ADDER_BOOKMARK_CATEGORIES_FETCH_REQUEST = 'BOOKMARK_CATEGORY_ADDER_BOOKMARK_CATEGORIES_FETCH_REQUEST'; +export const BOOKMARK_CATEGORY_ADDER_BOOKMARK_CATEGORIES_FETCH_SUCCESS = 'BOOKMARK_CATEGORY_ADDER_BOOKMARK_CATEGORIES_FETCH_SUCCESS'; +export const BOOKMARK_CATEGORY_ADDER_BOOKMARK_CATEGORIES_FETCH_FAIL = 'BOOKMARK_CATEGORY_ADDER_BOOKMARK_CATEGORIES_FETCH_FAIL'; + export const BOOKMARK_CATEGORY_STATUSES_EXPAND_REQUEST = 'BOOKMARK_CATEGORY_STATUSES_EXPAND_REQUEST'; export const BOOKMARK_CATEGORY_STATUSES_EXPAND_SUCCESS = 'BOOKMARK_CATEGORY_STATUSES_EXPAND_SUCCESS'; export const BOOKMARK_CATEGORY_STATUSES_EXPAND_FAIL = 'BOOKMARK_CATEGORY_STATUSES_EXPAND_FAIL'; -export const BOOKMARK_CATEGORY_EDITOR_ADD_SUCCESS = 'BOOKMARK_CATEGORY_EDITOR_ADD_SUCCESS'; -export const BOOKMARK_CATEGORY_EDITOR_REMOVE_SUCCESS = 'BOOKMARK_CATEGORY_EDITOR_REMOVE_SUCCESS'; - export const fetchBookmarkCategory = id => (dispatch, getState) => { if (getState().getIn(['bookmark_categories', id])) { return; @@ -75,6 +103,89 @@ export const fetchBookmarkCategoriesFail = error => ({ error, }); +export const submitBookmarkCategoryEditor = shouldReset => (dispatch, getState) => { + const bookmarkCategoryId = getState().getIn(['bookmarkCategoryEditor', 'bookmarkCategoryId']); + const title = getState().getIn(['bookmarkCategoryEditor', 'title']); + + if (bookmarkCategoryId === null) { + dispatch(createBookmarkCategory(title, shouldReset)); + } else { + dispatch(updateBookmarkCategory(bookmarkCategoryId, title, shouldReset)); + } +}; + +export const setupBookmarkCategoryEditor = bookmarkCategoryId => (dispatch, getState) => { + dispatch({ + type: BOOKMARK_CATEGORY_EDITOR_SETUP, + bookmarkCategory: getState().getIn(['bookmark_categories', bookmarkCategoryId]), + }); + + dispatch(fetchBookmarkCategoryStatuses(bookmarkCategoryId)); +}; + +export const changeBookmarkCategoryEditorTitle = value => ({ + type: BOOKMARK_CATEGORY_EDITOR_TITLE_CHANGE, + value, +}); + +export const createBookmarkCategory = (title, shouldReset) => (dispatch, getState) => { + dispatch(createBookmarkCategoryRequest()); + + api(getState).post('/api/v1/bookmark_categories', { title }).then(({ data }) => { + dispatch(createBookmarkCategorySuccess(data)); + + if (shouldReset) { + dispatch(resetBookmarkCategoryEditor()); + } + }).catch(err => dispatch(createBookmarkCategoryFail(err))); +}; + +export const createBookmarkCategoryRequest = () => ({ + type: BOOKMARK_CATEGORY_CREATE_REQUEST, +}); + +export const createBookmarkCategorySuccess = bookmarkCategory => ({ + type: BOOKMARK_CATEGORY_CREATE_SUCCESS, + bookmarkCategory, +}); + +export const createBookmarkCategoryFail = error => ({ + type: BOOKMARK_CATEGORY_CREATE_FAIL, + error, +}); + +export const updateBookmarkCategory = (id, title, shouldReset) => (dispatch, getState) => { + dispatch(updateBookmarkCategoryRequest(id)); + + api(getState).put(`/api/v1/bookmark_categories/${id}`, { title }).then(({ data }) => { + dispatch(updateBookmarkCategorySuccess(data)); + + if (shouldReset) { + dispatch(resetBookmarkCategoryEditor()); + } + }).catch(err => dispatch(updateBookmarkCategoryFail(id, err))); +}; + +export const updateBookmarkCategoryRequest = id => ({ + type: BOOKMARK_CATEGORY_UPDATE_REQUEST, + id, +}); + +export const updateBookmarkCategorySuccess = bookmarkCategory => ({ + type: BOOKMARK_CATEGORY_UPDATE_SUCCESS, + bookmarkCategory, +}); + +export const updateBookmarkCategoryFail = (id, error) => ({ + type: BOOKMARK_CATEGORY_UPDATE_FAIL, + id, + error, +}); + +export const resetBookmarkCategoryEditor = () => ({ + type: BOOKMARK_CATEGORY_EDITOR_RESET, +}); + export const deleteBookmarkCategory = id => (dispatch, getState) => { dispatch(deleteBookmarkCategoryRequest(id)); @@ -127,11 +238,121 @@ export const fetchBookmarkCategoryStatusesFail = (id, error) => ({ error, }); +export const addToBookmarkCategory = (bookmarkCategoryId, statusId) => (dispatch, getState) => { + dispatch(addToBookmarkCategoryRequest(bookmarkCategoryId, statusId)); + + api(getState).post(`/api/v1/bookmark_categories/${bookmarkCategoryId}/statuses`, { status_ids: [statusId] }) + .then(() => dispatch(addToBookmarkCategorySuccess(bookmarkCategoryId, statusId))) + .catch(err => dispatch(addToBookmarkCategoryFail(bookmarkCategoryId, statusId, err))); +}; + +export const addToBookmarkCategoryRequest = (bookmarkCategoryId, statusId) => ({ + type: BOOKMARK_CATEGORY_EDITOR_ADD_REQUEST, + bookmarkCategoryId, + statusId, +}); + +export const addToBookmarkCategorySuccess = (bookmarkCategoryId, statusId) => ({ + type: BOOKMARK_CATEGORY_EDITOR_ADD_SUCCESS, + bookmarkCategoryId, + statusId, +}); + +export const addToBookmarkCategoryFail = (bookmarkCategoryId, statusId, error) => ({ + type: BOOKMARK_CATEGORY_EDITOR_ADD_FAIL, + bookmarkCategoryId, + statusId, + error, +}); + +export const removeFromBookmarkCategory = (bookmarkCategoryId, statusId) => (dispatch, getState) => { + dispatch(removeFromBookmarkCategoryRequest(bookmarkCategoryId, statusId)); + + api(getState).delete(`/api/v1/bookmark_categories/${bookmarkCategoryId}/statuses`, { params: { status_ids: [statusId] } }) + .then(() => dispatch(removeFromBookmarkCategorySuccess(bookmarkCategoryId, statusId))) + .catch(err => dispatch(removeFromBookmarkCategoryFail(bookmarkCategoryId, statusId, err))); +}; + +export const removeFromBookmarkCategoryRequest = (bookmarkCategoryId, statusId) => ({ + type: BOOKMARK_CATEGORY_EDITOR_REMOVE_REQUEST, + bookmarkCategoryId, + statusId, +}); + +export const removeFromBookmarkCategorySuccess = (bookmarkCategoryId, statusId) => ({ + type: BOOKMARK_CATEGORY_EDITOR_REMOVE_SUCCESS, + bookmarkCategoryId, + statusId, +}); + +export const removeFromBookmarkCategoryFail = (bookmarkCategoryId, statusId, error) => ({ + type: BOOKMARK_CATEGORY_EDITOR_REMOVE_FAIL, + bookmarkCategoryId, + statusId, + error, +}); + +export const resetBookmarkCategoryAdder = () => ({ + type: BOOKMARK_CATEGORY_ADDER_RESET, +}); + +export const setupBookmarkCategoryAdder = statusId => (dispatch, getState) => { + dispatch({ + type: BOOKMARK_CATEGORY_ADDER_SETUP, + status: getState().getIn(['statuses', statusId]), + }); + dispatch(fetchBookmarkCategories()); + dispatch(fetchStatusBookmarkCategories(statusId)); +}; + +export const fetchStatusBookmarkCategories = statusId => (dispatch, getState) => { + dispatch(fetchStatusBookmarkCategoriesRequest(statusId)); + + api(getState).get(`/api/v1/statuses/${statusId}/bookmark_categories`) + .then(({ data }) => dispatch(fetchStatusBookmarkCategoriesSuccess(statusId, data))) + .catch(err => dispatch(fetchStatusBookmarkCategoriesFail(statusId, err))); +}; + +export const fetchStatusBookmarkCategoriesRequest = id => ({ + type:BOOKMARK_CATEGORY_ADDER_BOOKMARK_CATEGORIES_FETCH_REQUEST, + id, +}); + +export const fetchStatusBookmarkCategoriesSuccess = (id, bookmarkCategories) => ({ + type: BOOKMARK_CATEGORY_ADDER_BOOKMARK_CATEGORIES_FETCH_SUCCESS, + id, + bookmarkCategories, +}); + +export const fetchStatusBookmarkCategoriesFail = (id, err) => ({ + type: BOOKMARK_CATEGORY_ADDER_BOOKMARK_CATEGORIES_FETCH_FAIL, + id, + err, +}); + +export const addToBookmarkCategoryAdder = bookmarkCategoryId => (dispatch, getState) => { + dispatch(addToBookmarkCategory(bookmarkCategoryId, getState().getIn(['bookmarkCategoryAdder', 'statusId']))); +}; + +export const removeFromBookmarkCategoryAdder = bookmarkCategoryId => (dispatch, getState) => { + if (bookmarkCategoryNeeded) { + const categories = getState().getIn(['bookmarkCategoryAdder', 'bookmarkCategories', 'items']); + if (categories && categories.count() <= 1) { + const status = makeGetStatus()(getState(), { id: getState().getIn(['bookmarkCategoryAdder', 'statusId']) }); + dispatch(unbookmark(status)); + } else { + dispatch(removeFromBookmarkCategory(bookmarkCategoryId, getState().getIn(['bookmarkCategoryAdder', 'statusId']))); + } + } else { + dispatch(removeFromBookmarkCategory(bookmarkCategoryId, getState().getIn(['bookmarkCategoryAdder', 'statusId']))); + } +}; + export function expandBookmarkCategoryStatuses(bookmarkCategoryId) { return (dispatch, getState) => { - const url = getState().getIn(['status_lists', 'bookmark_category_statuses', bookmarkCategoryId, 'next'], null); + const url = getState().getIn(['bookmark_categories', bookmarkCategoryId, 'next'], null); - if (url === null || getState().getIn(['status_lists', 'bookmark_category_statuses', bookmarkCategoryId, 'isLoading'])) { + if (url === null || getState().getIn(['bookmark_categories', bookmarkCategoryId, 'isLoading'])) { return; } @@ -171,19 +392,3 @@ export function expandBookmarkCategoryStatusesFail(id, error) { }; } -export function bookmarkCategoryEditorAddSuccess(id, statusId) { - return { - type: BOOKMARK_CATEGORY_EDITOR_ADD_SUCCESS, - id, - statusId, - }; -} - -export function bookmarkCategoryEditorRemoveSuccess(id, statusId) { - return { - type: BOOKMARK_CATEGORY_EDITOR_REMOVE_SUCCESS, - id, - statusId, - }; -} - diff --git a/app/javascript/mastodon/actions/bookmark_categories_typed.ts b/app/javascript/mastodon/actions/bookmark_categories_typed.ts deleted file mode 100644 index 3570ce5991..0000000000 --- a/app/javascript/mastodon/actions/bookmark_categories_typed.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { apiCreate, apiUpdate } from 'mastodon/api/bookmark_categories'; -import type { BookmarkCategory } from 'mastodon/models/bookmark_category'; -import { createDataLoadingThunk } from 'mastodon/store/typed_functions'; - -export const createBookmarkCategory = createDataLoadingThunk( - 'bookmark_category/create', - (bookmarkCategory: Partial) => apiCreate(bookmarkCategory), -); - -export const updateBookmarkCategory = createDataLoadingThunk( - 'bookmark_category/update', - (bookmarkCategory: Partial) => apiUpdate(bookmarkCategory), -); diff --git a/app/javascript/mastodon/actions/circles.js b/app/javascript/mastodon/actions/circles.js index 221c0c683a..7ed41b4045 100644 --- a/app/javascript/mastodon/actions/circles.js +++ b/app/javascript/mastodon/actions/circles.js @@ -1,6 +1,7 @@ import api, { getLinks } from '../api'; -import { importFetchedStatuses } from './importer'; +import { showAlertForError } from './alerts'; +import { importFetchedAccounts, importFetchedStatuses } from './importer'; export const CIRCLE_FETCH_REQUEST = 'CIRCLE_FETCH_REQUEST'; export const CIRCLE_FETCH_SUCCESS = 'CIRCLE_FETCH_SUCCESS'; @@ -10,6 +11,10 @@ export const CIRCLES_FETCH_REQUEST = 'CIRCLES_FETCH_REQUEST'; export const CIRCLES_FETCH_SUCCESS = 'CIRCLES_FETCH_SUCCESS'; export const CIRCLES_FETCH_FAIL = 'CIRCLES_FETCH_FAIL'; +export const CIRCLE_EDITOR_TITLE_CHANGE = 'CIRCLE_EDITOR_TITLE_CHANGE'; +export const CIRCLE_EDITOR_RESET = 'CIRCLE_EDITOR_RESET'; +export const CIRCLE_EDITOR_SETUP = 'CIRCLE_EDITOR_SETUP'; + export const CIRCLE_CREATE_REQUEST = 'CIRCLE_CREATE_REQUEST'; export const CIRCLE_CREATE_SUCCESS = 'CIRCLE_CREATE_SUCCESS'; export const CIRCLE_CREATE_FAIL = 'CIRCLE_CREATE_FAIL'; @@ -22,6 +27,29 @@ export const CIRCLE_DELETE_REQUEST = 'CIRCLE_DELETE_REQUEST'; export const CIRCLE_DELETE_SUCCESS = 'CIRCLE_DELETE_SUCCESS'; export const CIRCLE_DELETE_FAIL = 'CIRCLE_DELETE_FAIL'; +export const CIRCLE_ACCOUNTS_FETCH_REQUEST = 'CIRCLE_ACCOUNTS_FETCH_REQUEST'; +export const CIRCLE_ACCOUNTS_FETCH_SUCCESS = 'CIRCLE_ACCOUNTS_FETCH_SUCCESS'; +export const CIRCLE_ACCOUNTS_FETCH_FAIL = 'CIRCLE_ACCOUNTS_FETCH_FAIL'; + +export const CIRCLE_EDITOR_SUGGESTIONS_CHANGE = 'CIRCLE_EDITOR_SUGGESTIONS_CHANGE'; +export const CIRCLE_EDITOR_SUGGESTIONS_READY = 'CIRCLE_EDITOR_SUGGESTIONS_READY'; +export const CIRCLE_EDITOR_SUGGESTIONS_CLEAR = 'CIRCLE_EDITOR_SUGGESTIONS_CLEAR'; + +export const CIRCLE_EDITOR_ADD_REQUEST = 'CIRCLE_EDITOR_ADD_REQUEST'; +export const CIRCLE_EDITOR_ADD_SUCCESS = 'CIRCLE_EDITOR_ADD_SUCCESS'; +export const CIRCLE_EDITOR_ADD_FAIL = 'CIRCLE_EDITOR_ADD_FAIL'; + +export const CIRCLE_EDITOR_REMOVE_REQUEST = 'CIRCLE_EDITOR_REMOVE_REQUEST'; +export const CIRCLE_EDITOR_REMOVE_SUCCESS = 'CIRCLE_EDITOR_REMOVE_SUCCESS'; +export const CIRCLE_EDITOR_REMOVE_FAIL = 'CIRCLE_EDITOR_REMOVE_FAIL'; + +export const CIRCLE_ADDER_RESET = 'CIRCLE_ADDER_RESET'; +export const CIRCLE_ADDER_SETUP = 'CIRCLE_ADDER_SETUP'; + +export const CIRCLE_ADDER_CIRCLES_FETCH_REQUEST = 'CIRCLE_ADDER_CIRCLES_FETCH_REQUEST'; +export const CIRCLE_ADDER_CIRCLES_FETCH_SUCCESS = 'CIRCLE_ADDER_CIRCLES_FETCH_SUCCESS'; +export const CIRCLE_ADDER_CIRCLES_FETCH_FAIL = 'CIRCLE_ADDER_CIRCLES_FETCH_FAIL'; + export const CIRCLE_STATUSES_FETCH_REQUEST = 'CIRCLE_STATUSES_FETCH_REQUEST'; export const CIRCLE_STATUSES_FETCH_SUCCESS = 'CIRCLE_STATUSES_FETCH_SUCCESS'; export const CIRCLE_STATUSES_FETCH_FAIL = 'CIRCLE_STATUSES_FETCH_FAIL'; @@ -80,6 +108,89 @@ export const fetchCirclesFail = error => ({ error, }); +export const submitCircleEditor = shouldReset => (dispatch, getState) => { + const circleId = getState().getIn(['circleEditor', 'circleId']); + const title = getState().getIn(['circleEditor', 'title']); + + if (circleId === null) { + dispatch(createCircle(title, shouldReset)); + } else { + dispatch(updateCircle(circleId, title, shouldReset)); + } +}; + +export const setupCircleEditor = circleId => (dispatch, getState) => { + dispatch({ + type: CIRCLE_EDITOR_SETUP, + circle: getState().getIn(['circles', circleId]), + }); + + dispatch(fetchCircleAccounts(circleId)); +}; + +export const changeCircleEditorTitle = value => ({ + type: CIRCLE_EDITOR_TITLE_CHANGE, + value, +}); + +export const createCircle = (title, shouldReset) => (dispatch, getState) => { + dispatch(createCircleRequest()); + + api(getState).post('/api/v1/circles', { title }).then(({ data }) => { + dispatch(createCircleSuccess(data)); + + if (shouldReset) { + dispatch(resetCircleEditor()); + } + }).catch(err => dispatch(createCircleFail(err))); +}; + +export const createCircleRequest = () => ({ + type: CIRCLE_CREATE_REQUEST, +}); + +export const createCircleSuccess = circle => ({ + type: CIRCLE_CREATE_SUCCESS, + circle, +}); + +export const createCircleFail = error => ({ + type: CIRCLE_CREATE_FAIL, + error, +}); + +export const updateCircle = (id, title, shouldReset, isExclusive, replies_policy) => (dispatch, getState) => { + dispatch(updateCircleRequest(id)); + + api(getState).put(`/api/v1/circles/${id}`, { title, replies_policy, exclusive: typeof isExclusive === 'undefined' ? undefined : !!isExclusive }).then(({ data }) => { + dispatch(updateCircleSuccess(data)); + + if (shouldReset) { + dispatch(resetCircleEditor()); + } + }).catch(err => dispatch(updateCircleFail(id, err))); +}; + +export const updateCircleRequest = id => ({ + type: CIRCLE_UPDATE_REQUEST, + id, +}); + +export const updateCircleSuccess = circle => ({ + type: CIRCLE_UPDATE_SUCCESS, + circle, +}); + +export const updateCircleFail = (id, error) => ({ + type: CIRCLE_UPDATE_FAIL, + id, + error, +}); + +export const resetCircleEditor = () => ({ + type: CIRCLE_EDITOR_RESET, +}); + export const deleteCircle = id => (dispatch, getState) => { dispatch(deleteCircleRequest(id)); @@ -104,6 +215,169 @@ export const deleteCircleFail = (id, error) => ({ error, }); +export const fetchCircleAccounts = circleId => (dispatch, getState) => { + dispatch(fetchCircleAccountsRequest(circleId)); + + api(getState).get(`/api/v1/circles/${circleId}/accounts`, { params: { limit: 0 } }).then(({ data }) => { + dispatch(importFetchedAccounts(data)); + dispatch(fetchCircleAccountsSuccess(circleId, data)); + }).catch(err => dispatch(fetchCircleAccountsFail(circleId, err))); +}; + +export const fetchCircleAccountsRequest = id => ({ + type: CIRCLE_ACCOUNTS_FETCH_REQUEST, + id, +}); + +export const fetchCircleAccountsSuccess = (id, accounts, next) => ({ + type: CIRCLE_ACCOUNTS_FETCH_SUCCESS, + id, + accounts, + next, +}); + +export const fetchCircleAccountsFail = (id, error) => ({ + type: CIRCLE_ACCOUNTS_FETCH_FAIL, + id, + error, +}); + +export const fetchCircleSuggestions = q => (dispatch, getState) => { + const params = { + q, + resolve: false, + follower: true, + }; + + api(getState).get('/api/v1/accounts/search', { params }).then(({ data }) => { + dispatch(importFetchedAccounts(data)); + dispatch(fetchCircleSuggestionsReady(q, data)); + }).catch(error => dispatch(showAlertForError(error))); +}; + +export const fetchCircleSuggestionsReady = (query, accounts) => ({ + type: CIRCLE_EDITOR_SUGGESTIONS_READY, + query, + accounts, +}); + +export const clearCircleSuggestions = () => ({ + type: CIRCLE_EDITOR_SUGGESTIONS_CLEAR, +}); + +export const changeCircleSuggestions = value => ({ + type: CIRCLE_EDITOR_SUGGESTIONS_CHANGE, + value, +}); + +export const addToCircleEditor = accountId => (dispatch, getState) => { + dispatch(addToCircle(getState().getIn(['circleEditor', 'circleId']), accountId)); +}; + +export const addToCircle = (circleId, accountId) => (dispatch, getState) => { + dispatch(addToCircleRequest(circleId, accountId)); + + api(getState).post(`/api/v1/circles/${circleId}/accounts`, { account_ids: [accountId] }) + .then(() => dispatch(addToCircleSuccess(circleId, accountId))) + .catch(err => dispatch(addToCircleFail(circleId, accountId, err))); +}; + +export const addToCircleRequest = (circleId, accountId) => ({ + type: CIRCLE_EDITOR_ADD_REQUEST, + circleId, + accountId, +}); + +export const addToCircleSuccess = (circleId, accountId) => ({ + type: CIRCLE_EDITOR_ADD_SUCCESS, + circleId, + accountId, +}); + +export const addToCircleFail = (circleId, accountId, error) => ({ + type: CIRCLE_EDITOR_ADD_FAIL, + circleId, + accountId, + error, +}); + +export const removeFromCircleEditor = accountId => (dispatch, getState) => { + dispatch(removeFromCircle(getState().getIn(['circleEditor', 'circleId']), accountId)); +}; + +export const removeFromCircle = (circleId, accountId) => (dispatch, getState) => { + dispatch(removeFromCircleRequest(circleId, accountId)); + + api(getState).delete(`/api/v1/circles/${circleId}/accounts`, { params: { account_ids: [accountId] } }) + .then(() => dispatch(removeFromCircleSuccess(circleId, accountId))) + .catch(err => dispatch(removeFromCircleFail(circleId, accountId, err))); +}; + +export const removeFromCircleRequest = (circleId, accountId) => ({ + type: CIRCLE_EDITOR_REMOVE_REQUEST, + circleId, + accountId, +}); + +export const removeFromCircleSuccess = (circleId, accountId) => ({ + type: CIRCLE_EDITOR_REMOVE_SUCCESS, + circleId, + accountId, +}); + +export const removeFromCircleFail = (circleId, accountId, error) => ({ + type: CIRCLE_EDITOR_REMOVE_FAIL, + circleId, + accountId, + error, +}); + +export const resetCircleAdder = () => ({ + type: CIRCLE_ADDER_RESET, +}); + +export const setupCircleAdder = accountId => (dispatch, getState) => { + dispatch({ + type: CIRCLE_ADDER_SETUP, + account: getState().getIn(['accounts', accountId]), + }); + dispatch(fetchCircles()); + dispatch(fetchAccountCircles(accountId)); +}; + +export const fetchAccountCircles = accountId => (dispatch, getState) => { + dispatch(fetchAccountCirclesRequest(accountId)); + + api(getState).get(`/api/v1/accounts/${accountId}/circles`) + .then(({ data }) => dispatch(fetchAccountCirclesSuccess(accountId, data))) + .catch(err => dispatch(fetchAccountCirclesFail(accountId, err))); +}; + +export const fetchAccountCirclesRequest = id => ({ + type:CIRCLE_ADDER_CIRCLES_FETCH_REQUEST, + id, +}); + +export const fetchAccountCirclesSuccess = (id, circles) => ({ + type: CIRCLE_ADDER_CIRCLES_FETCH_SUCCESS, + id, + circles, +}); + +export const fetchAccountCirclesFail = (id, err) => ({ + type: CIRCLE_ADDER_CIRCLES_FETCH_FAIL, + id, + err, +}); + +export const addToCircleAdder = circleId => (dispatch, getState) => { + dispatch(addToCircle(circleId, getState().getIn(['circleAdder', 'accountId']))); +}; + +export const removeFromCircleAdder = circleId => (dispatch, getState) => { + dispatch(removeFromCircle(circleId, getState().getIn(['circleAdder', 'accountId']))); +}; + export function fetchCircleStatuses(circleId) { return (dispatch, getState) => { if (getState().getIn(['circles', circleId, 'isLoading'])) { @@ -152,9 +426,9 @@ export function fetchCircleStatusesFail(id, error) { export function expandCircleStatuses(circleId) { return (dispatch, getState) => { - const url = getState().getIn(['status_lists', 'circle_statuses', circleId, 'next'], null); + const url = getState().getIn(['circles', circleId, 'next'], null); - if (url === null || getState().getIn(['status_lists', 'circle_statuses', circleId, 'isLoading'])) { + if (url === null || getState().getIn(['circles', circleId, 'isLoading'])) { return; } diff --git a/app/javascript/mastodon/actions/circles_typed.ts b/app/javascript/mastodon/actions/circles_typed.ts deleted file mode 100644 index 6f4117ff81..0000000000 --- a/app/javascript/mastodon/actions/circles_typed.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { apiCreate, apiUpdate } from 'mastodon/api/circles'; -import type { Circle } from 'mastodon/models/circle'; -import { createDataLoadingThunk } from 'mastodon/store/typed_functions'; - -export const createCircle = createDataLoadingThunk( - 'circle/create', - (circle: Partial) => apiCreate(circle), -); - -export const updateCircle = createDataLoadingThunk( - 'circle/update', - (circle: Partial) => apiUpdate(circle), -); diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js index 9a92528f3a..7bba41ee97 100644 --- a/app/javascript/mastodon/actions/compose.js +++ b/app/javascript/mastodon/actions/compose.js @@ -4,7 +4,6 @@ import axios from 'axios'; import { throttle } from 'lodash'; import api from 'mastodon/api'; -import { browserHistory } from 'mastodon/components/router'; import { search as emojiSearch } from 'mastodon/features/emoji/emoji_mart_search_light'; import { tagHistory } from 'mastodon/settings'; @@ -98,9 +97,9 @@ const messages = defineMessages({ saved: { id: 'compose.saved.body', defaultMessage: 'Post saved.' }, }); -export const ensureComposeIsVisible = (getState) => { +export const ensureComposeIsVisible = (getState, routerHistory) => { if (!getState().getIn(['compose', 'mounted'])) { - browserHistory.push('/publish'); + routerHistory.push('/publish'); } }; @@ -120,26 +119,14 @@ export function changeCompose(text) { }; } -export function replyCompose(status) { +export function replyCompose(status, routerHistory) { return (dispatch, getState) => { dispatch({ type: COMPOSE_REPLY, status: status, }); - ensureComposeIsVisible(getState); - }; -} - -export function replyComposeById(statusId) { - return (dispatch, getState) => { - const state = getState(); - const status = state.statuses.get(statusId); - - if (status) { - const account = state.accounts.get(status.get('account')); - dispatch(replyCompose(status.set('account', account))); - } + ensureComposeIsVisible(getState, routerHistory); }; } @@ -155,44 +142,38 @@ export function resetCompose() { }; } -export const focusCompose = (defaultText) => (dispatch, getState) => { +export const focusCompose = (routerHistory, defaultText) => (dispatch, getState) => { dispatch({ type: COMPOSE_FOCUS, defaultText, }); - ensureComposeIsVisible(getState); + ensureComposeIsVisible(getState, routerHistory); }; -export function mentionCompose(account) { +export function mentionCompose(account, routerHistory) { return (dispatch, getState) => { dispatch({ type: COMPOSE_MENTION, account: account, }); - ensureComposeIsVisible(getState); + ensureComposeIsVisible(getState, routerHistory); }; } -export function mentionComposeById(accountId) { - return (dispatch, getState) => { - dispatch(mentionCompose(getState().accounts.get(accountId))); - }; -} - -export function directCompose(account) { +export function directCompose(account, routerHistory) { return (dispatch, getState) => { dispatch({ type: COMPOSE_DIRECT, account: account, }); - ensureComposeIsVisible(getState); + ensureComposeIsVisible(getState, routerHistory); }; } -export function submitCompose() { +export function submitCompose(routerHistory) { return function (dispatch, getState) { const status = getState().getIn(['compose', 'text'], ''); const media = getState().getIn(['compose', 'media_attachments']); @@ -247,8 +228,8 @@ export function submitCompose() { 'Idempotency-Key': getState().getIn(['compose', 'idempotencyKey']), }, }).then(function (response) { - if ((browserHistory.location.pathname === '/publish' || browserHistory.location.pathname === '/statuses/new') && window.history.state) { - browserHistory.goBack(); + if (routerHistory && (routerHistory.location.pathname === '/publish' || routerHistory.location.pathname === '/statuses/new') && window.history.state) { + routerHistory.goBack(); } dispatch(insertIntoTagHistory(response.data.tags, status)); @@ -272,21 +253,21 @@ export function submitCompose() { insertIfOnline('home'); } - if (statusId === null && response.data.in_reply_to_id === null && ['public', 'public_unlisted', 'login'].includes(response.data.visibility_ex)) { + if (statusId === null && response.data.in_reply_to_id === null && response.data.visibility_ex === 'public') { insertIfOnline('community'); insertIfOnline('public'); insertIfOnline(`account:${response.data.account.id}`); } if (statusId === null && privacy === 'circle' && circleId !== null && circleId !== 0) { - dispatch(submitComposeWithCircleSuccess({ ...response.data }, `${circleId}`)); + dispatch(submitComposeWithCircleSuccess({ ...response.data }, circleId)); } dispatch(showAlert({ message: statusId === null ? messages.published : messages.saved, action: messages.open, dismissAfter: 10000, - onClick: () => browserHistory.push(`/@${response.data.account.username}/${response.data.id}`), + onClick: () => routerHistory.push(`/@${response.data.account.username}/${response.data.id}`), })); }).catch(function (error) { dispatch(submitComposeFail(error)); @@ -310,7 +291,7 @@ export function submitComposeSuccess(status) { export function submitComposeWithCircleSuccess(status, circleId) { return { type: COMPOSE_WITH_CIRCLE_SUCCESS, - statusId: status.id, + status, circleId, }; } @@ -324,7 +305,7 @@ export function submitComposeFail(error) { export function uploadCompose(files) { return function (dispatch, getState) { - const uploadLimit = getState().getIn(['server', 'server', 'configuration', 'statuses', 'max_media_attachments']); + const uploadLimit = 4; const media = getState().getIn(['compose', 'media_attachments']); const pending = getState().getIn(['compose', 'pending_media_attachments']); const defaultSensitive = getState().getIn(['compose', 'default_sensitive']); @@ -341,7 +322,7 @@ export function uploadCompose(files) { dispatch(uploadComposeRequest()); for (const [i, file] of Array.from(files).entries()) { - if (media.size + i > (uploadLimit - 1)) break; + if (media.size + i >= 4) break; const data = new FormData(); data.append('file', file); @@ -441,7 +422,7 @@ export function initMediaEditModal(id) { dispatch(openModal({ modalType: 'FOCAL_POINT', - modalProps: { mediaId: id }, + modalProps: { id }, })); }; } diff --git a/app/javascript/mastodon/actions/compose_typed.ts b/app/javascript/mastodon/actions/compose_typed.ts deleted file mode 100644 index 97f0d68c51..0000000000 --- a/app/javascript/mastodon/actions/compose_typed.ts +++ /dev/null @@ -1,70 +0,0 @@ -import type { List as ImmutableList, Map as ImmutableMap } from 'immutable'; - -import { apiUpdateMedia } from 'mastodon/api/compose'; -import type { ApiMediaAttachmentJSON } from 'mastodon/api_types/media_attachments'; -import type { MediaAttachment } from 'mastodon/models/media_attachment'; -import { createDataLoadingThunk } from 'mastodon/store/typed_functions'; - -type SimulatedMediaAttachmentJSON = ApiMediaAttachmentJSON & { - unattached?: boolean; -}; - -const simulateModifiedApiResponse = ( - media: MediaAttachment, - params: { description?: string; focus?: string }, -): SimulatedMediaAttachmentJSON => { - const [x, y] = (params.focus ?? '').split(','); - - const data = { - ...media.toJS(), - ...params, - meta: { - focus: { - x: parseFloat(x ?? '0'), - y: parseFloat(y ?? '0'), - }, - }, - } as unknown as SimulatedMediaAttachmentJSON; - - return data; -}; - -export const changeUploadCompose = createDataLoadingThunk( - 'compose/changeUpload', - async ( - { - id, - ...params - }: { - id: string; - description: string; - focus: string; - }, - { getState }, - ) => { - const media = ( - (getState().compose as ImmutableMap).get( - 'media_attachments', - ) as ImmutableList - ).find((item) => item.get('id') === id); - - // Editing already-attached media is deferred to editing the post itself. - // For simplicity's sake, fake an API reply. - if (media && !media.get('unattached')) { - return new Promise((resolve) => { - resolve(simulateModifiedApiResponse(media, params)); - }); - } - - return apiUpdateMedia(id, params); - }, - (media: SimulatedMediaAttachmentJSON) => { - return { - media, - attached: typeof media.unattached !== 'undefined' && !media.unattached, - }; - }, - { - useLoadingBar: false, - }, -); diff --git a/app/javascript/mastodon/actions/domain_blocks.js b/app/javascript/mastodon/actions/domain_blocks.js index 279ec1bef7..727f800af3 100644 --- a/app/javascript/mastodon/actions/domain_blocks.js +++ b/app/javascript/mastodon/actions/domain_blocks.js @@ -12,6 +12,14 @@ export const DOMAIN_BLOCK_FAIL = 'DOMAIN_BLOCK_FAIL'; export const DOMAIN_UNBLOCK_REQUEST = 'DOMAIN_UNBLOCK_REQUEST'; export const DOMAIN_UNBLOCK_FAIL = 'DOMAIN_UNBLOCK_FAIL'; +export const DOMAIN_BLOCKS_FETCH_REQUEST = 'DOMAIN_BLOCKS_FETCH_REQUEST'; +export const DOMAIN_BLOCKS_FETCH_SUCCESS = 'DOMAIN_BLOCKS_FETCH_SUCCESS'; +export const DOMAIN_BLOCKS_FETCH_FAIL = 'DOMAIN_BLOCKS_FETCH_FAIL'; + +export const DOMAIN_BLOCKS_EXPAND_REQUEST = 'DOMAIN_BLOCKS_EXPAND_REQUEST'; +export const DOMAIN_BLOCKS_EXPAND_SUCCESS = 'DOMAIN_BLOCKS_EXPAND_SUCCESS'; +export const DOMAIN_BLOCKS_EXPAND_FAIL = 'DOMAIN_BLOCKS_EXPAND_FAIL'; + export function blockDomain(domain) { return (dispatch, getState) => { dispatch(blockDomainRequest(domain)); @@ -71,6 +79,80 @@ export function unblockDomainFail(domain, error) { }; } +export function fetchDomainBlocks() { + return (dispatch) => { + dispatch(fetchDomainBlocksRequest()); + + api().get('/api/v1/domain_blocks').then(response => { + const next = getLinks(response).refs.find(link => link.rel === 'next'); + dispatch(fetchDomainBlocksSuccess(response.data, next ? next.uri : null)); + }).catch(err => { + dispatch(fetchDomainBlocksFail(err)); + }); + }; +} + +export function fetchDomainBlocksRequest() { + return { + type: DOMAIN_BLOCKS_FETCH_REQUEST, + }; +} + +export function fetchDomainBlocksSuccess(domains, next) { + return { + type: DOMAIN_BLOCKS_FETCH_SUCCESS, + domains, + next, + }; +} + +export function fetchDomainBlocksFail(error) { + return { + type: DOMAIN_BLOCKS_FETCH_FAIL, + error, + }; +} + +export function expandDomainBlocks() { + return (dispatch, getState) => { + const url = getState().getIn(['domain_lists', 'blocks', 'next']); + + if (!url) { + return; + } + + dispatch(expandDomainBlocksRequest()); + + api().get(url).then(response => { + const next = getLinks(response).refs.find(link => link.rel === 'next'); + dispatch(expandDomainBlocksSuccess(response.data, next ? next.uri : null)); + }).catch(err => { + dispatch(expandDomainBlocksFail(err)); + }); + }; +} + +export function expandDomainBlocksRequest() { + return { + type: DOMAIN_BLOCKS_EXPAND_REQUEST, + }; +} + +export function expandDomainBlocksSuccess(domains, next) { + return { + type: DOMAIN_BLOCKS_EXPAND_SUCCESS, + domains, + next, + }; +} + +export function expandDomainBlocksFail(error) { + return { + type: DOMAIN_BLOCKS_EXPAND_FAIL, + error, + }; +} + export const initDomainBlockModal = account => dispatch => dispatch(openModal({ modalType: 'DOMAIN_BLOCK', modalProps: { diff --git a/app/javascript/mastodon/actions/dropdown_menu.ts b/app/javascript/mastodon/actions/dropdown_menu.ts index d9d395ba33..3694df1ae0 100644 --- a/app/javascript/mastodon/actions/dropdown_menu.ts +++ b/app/javascript/mastodon/actions/dropdown_menu.ts @@ -1,11 +1,11 @@ import { createAction } from '@reduxjs/toolkit'; export const openDropdownMenu = createAction<{ - id: number; + id: string; keyboard: boolean; - scrollKey?: string; + scrollKey: string; }>('dropdownMenu/open'); -export const closeDropdownMenu = createAction<{ id: number }>( +export const closeDropdownMenu = createAction<{ id: string }>( 'dropdownMenu/close', ); diff --git a/app/javascript/mastodon/actions/importer/index.js b/app/javascript/mastodon/actions/importer/index.js index fc165b1a1f..ebf58b761a 100644 --- a/app/javascript/mastodon/actions/importer/index.js +++ b/app/javascript/mastodon/actions/importer/index.js @@ -1,12 +1,10 @@ -import { createPollFromServerJSON } from 'mastodon/models/poll'; - import { importAccounts } from '../accounts_typed'; -import { normalizeStatus } from './normalizer'; -import { importPolls } from './polls'; +import { normalizeStatus, normalizePoll } from './normalizer'; export const STATUS_IMPORT = 'STATUS_IMPORT'; export const STATUSES_IMPORT = 'STATUSES_IMPORT'; +export const POLLS_IMPORT = 'POLLS_IMPORT'; export const FILTERS_IMPORT = 'FILTERS_IMPORT'; function pushUnique(array, object) { @@ -27,6 +25,10 @@ export function importFilters(filters) { return { type: FILTERS_IMPORT, filters }; } +export function importPolls(polls) { + return { type: POLLS_IMPORT, polls }; +} + export function importFetchedAccount(account) { return importFetchedAccounts([account]); } @@ -75,7 +77,7 @@ export function importFetchedStatuses(statuses) { } if (status.poll?.id) { - pushUnique(polls, createPollFromServerJSON(status.poll, getState().polls[status.poll.id])); + pushUnique(polls, normalizePoll(status.poll, getState().getIn(['polls', status.poll.id]))); } if (status.card) { @@ -85,9 +87,15 @@ export function importFetchedStatuses(statuses) { statuses.forEach(processStatus); - dispatch(importPolls({ polls })); + dispatch(importPolls(polls)); dispatch(importFetchedAccounts(accounts)); dispatch(importStatuses(normalStatuses)); dispatch(importFilters(filters)); }; } + +export function importFetchedPoll(poll) { + return (dispatch, getState) => { + dispatch(importPolls([normalizePoll(poll, getState().getIn(['polls', poll.id]))])); + }; +} diff --git a/app/javascript/mastodon/actions/importer/normalizer.js b/app/javascript/mastodon/actions/importer/normalizer.js index b643cf5613..d9e9fef0c6 100644 --- a/app/javascript/mastodon/actions/importer/normalizer.js +++ b/app/javascript/mastodon/actions/importer/normalizer.js @@ -1,12 +1,15 @@ import escapeTextContentForBrowser from 'escape-html'; -import { makeEmojiMap } from 'mastodon/models/custom_emoji'; - import emojify from '../../features/emoji/emoji'; import { expandSpoilers, me } from '../../initial_state'; const domParser = new DOMParser(); +const makeEmojiMap = emojis => emojis.reduce((obj, emoji) => { + obj[`:${emoji.shortcode}:`] = emoji; + return obj; +}, {}); + export function searchTextFromRawStatus (status) { const spoilerText = status.spoiler_text || ''; const searchContent = ([spoilerText, status.content].concat((status.poll && status.poll.options) ? status.poll.options.map(option => option.title) : [])).concat(status.media_attachments.map(att => att.description)).join('\n\n').replace(//g, '\n').replace(/<\/p>

/g, '\n\n'); @@ -137,6 +140,38 @@ export function normalizeStatusTranslation(translation, status) { return normalTranslation; } +export function normalizePoll(poll, normalOldPoll) { + const normalPoll = { ...poll }; + const emojiMap = makeEmojiMap(poll.emojis); + + normalPoll.options = poll.options.map((option, index) => { + const normalOption = { + ...option, + voted: poll.own_votes && poll.own_votes.includes(index), + titleHtml: emojify(escapeTextContentForBrowser(option.title), emojiMap), + }; + + if (normalOldPoll && normalOldPoll.getIn(['options', index, 'title']) === option.title) { + normalOption.translation = normalOldPoll.getIn(['options', index, 'translation']); + } + + return normalOption; + }); + + return normalPoll; +} + +export function normalizePollOptionTranslation(translation, poll) { + const emojiMap = makeEmojiMap(poll.get('emojis').toJS()); + + const normalTranslation = { + ...translation, + titleHtml: emojify(escapeTextContentForBrowser(translation.title), emojiMap), + }; + + return normalTranslation; +} + export function normalizeAnnouncement(announcement) { const normalAnnouncement = { ...announcement }; const emojiMap = makeEmojiMap(normalAnnouncement.emojis); diff --git a/app/javascript/mastodon/actions/importer/polls.ts b/app/javascript/mastodon/actions/importer/polls.ts deleted file mode 100644 index 5bbe7d57d6..0000000000 --- a/app/javascript/mastodon/actions/importer/polls.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { createAction } from '@reduxjs/toolkit'; - -import type { Poll } from 'mastodon/models/poll'; - -export const importPolls = createAction<{ polls: Poll[] }>( - 'poll/importMultiple', -); diff --git a/app/javascript/mastodon/actions/interactions.js b/app/javascript/mastodon/actions/interactions.js index 1392d3a667..6c60a70465 100644 --- a/app/javascript/mastodon/actions/interactions.js +++ b/app/javascript/mastodon/actions/interactions.js @@ -1,11 +1,7 @@ -import { boostModal } from 'mastodon/initial_state'; - import api, { getLinks } from '../api'; import { fetchRelationships } from './accounts'; import { importFetchedAccounts, importFetchedStatus, importFetchedStatuses } from './importer'; -import { unreblog, reblog } from './interactions_typed'; -import { openModal } from './modal'; export const REBLOGS_EXPAND_REQUEST = 'REBLOGS_EXPAND_REQUEST'; export const REBLOGS_EXPAND_SUCCESS = 'REBLOGS_EXPAND_SUCCESS'; @@ -745,49 +741,3 @@ export function expandMentionedUsersFail(id, error) { error, }; } - -function toggleReblogWithoutConfirmation(status, visibility) { - return (dispatch) => { - if (status.get('reblogged')) { - dispatch(unreblog({ statusId: status.get('id') })); - } else { - dispatch(reblog({ statusId: status.get('id'), visibility })); - } - }; -} - -export function toggleReblog(statusId, skipModal = false, forceModal = false) { - return (dispatch, getState) => { - const state = getState(); - let status = state.statuses.get(statusId); - - if (!status) - return; - - // The reblog modal expects a pre-filled account in status - // TODO: fix this by having the reblog modal get a statusId and do the work itself - status = status.set('account', state.accounts.get(status.get('account'))); - - if ((boostModal && !skipModal) || (forceModal && !status.get('reblogged'))) { - dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: (status, privacy) => dispatch(toggleReblogWithoutConfirmation(status, privacy)) } })); - } else { - dispatch(toggleReblogWithoutConfirmation(status)); - } - }; -} - -export function toggleFavourite(statusId) { - return (dispatch, getState) => { - const state = getState(); - const status = state.statuses.get(statusId); - - if (!status) - return; - - if (status.get('favourited')) { - dispatch(unfavourite(status)); - } else { - dispatch(favourite(status)); - } - }; -} diff --git a/app/javascript/mastodon/actions/languages.js b/app/javascript/mastodon/actions/languages.js new file mode 100644 index 0000000000..ad186ba0cc --- /dev/null +++ b/app/javascript/mastodon/actions/languages.js @@ -0,0 +1,12 @@ +import { saveSettings } from './settings'; + +export const LANGUAGE_USE = 'LANGUAGE_USE'; + +export const useLanguage = language => dispatch => { + dispatch({ + type: LANGUAGE_USE, + language, + }); + + dispatch(saveSettings()); +}; diff --git a/app/javascript/mastodon/actions/lists.js b/app/javascript/mastodon/actions/lists.js index 7b6dd22041..a7cc1a9329 100644 --- a/app/javascript/mastodon/actions/lists.js +++ b/app/javascript/mastodon/actions/lists.js @@ -2,6 +2,9 @@ import api from '../api'; +import { showAlertForError } from './alerts'; +import { importFetchedAccounts } from './importer'; + export const LIST_FETCH_REQUEST = 'LIST_FETCH_REQUEST'; export const LIST_FETCH_SUCCESS = 'LIST_FETCH_SUCCESS'; export const LIST_FETCH_FAIL = 'LIST_FETCH_FAIL'; @@ -10,10 +13,45 @@ export const LISTS_FETCH_REQUEST = 'LISTS_FETCH_REQUEST'; export const LISTS_FETCH_SUCCESS = 'LISTS_FETCH_SUCCESS'; export const LISTS_FETCH_FAIL = 'LISTS_FETCH_FAIL'; +export const LIST_EDITOR_TITLE_CHANGE = 'LIST_EDITOR_TITLE_CHANGE'; +export const LIST_EDITOR_RESET = 'LIST_EDITOR_RESET'; +export const LIST_EDITOR_SETUP = 'LIST_EDITOR_SETUP'; + +export const LIST_CREATE_REQUEST = 'LIST_CREATE_REQUEST'; +export const LIST_CREATE_SUCCESS = 'LIST_CREATE_SUCCESS'; +export const LIST_CREATE_FAIL = 'LIST_CREATE_FAIL'; + +export const LIST_UPDATE_REQUEST = 'LIST_UPDATE_REQUEST'; +export const LIST_UPDATE_SUCCESS = 'LIST_UPDATE_SUCCESS'; +export const LIST_UPDATE_FAIL = 'LIST_UPDATE_FAIL'; + export const LIST_DELETE_REQUEST = 'LIST_DELETE_REQUEST'; export const LIST_DELETE_SUCCESS = 'LIST_DELETE_SUCCESS'; export const LIST_DELETE_FAIL = 'LIST_DELETE_FAIL'; +export const LIST_ACCOUNTS_FETCH_REQUEST = 'LIST_ACCOUNTS_FETCH_REQUEST'; +export const LIST_ACCOUNTS_FETCH_SUCCESS = 'LIST_ACCOUNTS_FETCH_SUCCESS'; +export const LIST_ACCOUNTS_FETCH_FAIL = 'LIST_ACCOUNTS_FETCH_FAIL'; + +export const LIST_EDITOR_SUGGESTIONS_CHANGE = 'LIST_EDITOR_SUGGESTIONS_CHANGE'; +export const LIST_EDITOR_SUGGESTIONS_READY = 'LIST_EDITOR_SUGGESTIONS_READY'; +export const LIST_EDITOR_SUGGESTIONS_CLEAR = 'LIST_EDITOR_SUGGESTIONS_CLEAR'; + +export const LIST_EDITOR_ADD_REQUEST = 'LIST_EDITOR_ADD_REQUEST'; +export const LIST_EDITOR_ADD_SUCCESS = 'LIST_EDITOR_ADD_SUCCESS'; +export const LIST_EDITOR_ADD_FAIL = 'LIST_EDITOR_ADD_FAIL'; + +export const LIST_EDITOR_REMOVE_REQUEST = 'LIST_EDITOR_REMOVE_REQUEST'; +export const LIST_EDITOR_REMOVE_SUCCESS = 'LIST_EDITOR_REMOVE_SUCCESS'; +export const LIST_EDITOR_REMOVE_FAIL = 'LIST_EDITOR_REMOVE_FAIL'; + +export const LIST_ADDER_RESET = 'LIST_ADDER_RESET'; +export const LIST_ADDER_SETUP = 'LIST_ADDER_SETUP'; + +export const LIST_ADDER_LISTS_FETCH_REQUEST = 'LIST_ADDER_LISTS_FETCH_REQUEST'; +export const LIST_ADDER_LISTS_FETCH_SUCCESS = 'LIST_ADDER_LISTS_FETCH_SUCCESS'; +export const LIST_ADDER_LISTS_FETCH_FAIL = 'LIST_ADDER_LISTS_FETCH_FAIL'; + export const fetchList = id => (dispatch, getState) => { if (getState().getIn(['lists', id])) { return; @@ -64,6 +102,94 @@ export const fetchListsFail = error => ({ error, }); +export const submitListEditor = shouldReset => (dispatch, getState) => { + const listId = getState().getIn(['listEditor', 'listId']); + const title = getState().getIn(['listEditor', 'title']); + + if (listId === null) { + dispatch(createList(title, shouldReset)); + } else { + dispatch(updateList(listId, title, shouldReset)); + } +}; + +export const setupListEditor = listId => (dispatch, getState) => { + dispatch({ + type: LIST_EDITOR_SETUP, + list: getState().getIn(['lists', listId]), + }); + + dispatch(fetchListAccounts(listId)); +}; + +export const changeListEditorTitle = value => ({ + type: LIST_EDITOR_TITLE_CHANGE, + value, +}); + +export const createList = (title, shouldReset) => (dispatch) => { + dispatch(createListRequest()); + + api().post('/api/v1/lists', { title }).then(({ data }) => { + dispatch(createListSuccess(data)); + + if (shouldReset) { + dispatch(resetListEditor()); + } + }).catch(err => dispatch(createListFail(err))); +}; + +export const createListRequest = () => ({ + type: LIST_CREATE_REQUEST, +}); + +export const createListSuccess = list => ({ + type: LIST_CREATE_SUCCESS, + list, +}); + +export const createListFail = error => ({ + type: LIST_CREATE_FAIL, + error, +}); + +export const updateList = (id, title, shouldReset, isExclusive, replies_policy, notify) => (dispatch) => { + dispatch(updateListRequest(id)); + + api().put(`/api/v1/lists/${id}`, { + title, + replies_policy, + exclusive: typeof isExclusive === 'undefined' ? undefined : !!isExclusive, + notify: typeof notify === 'undefined' ? undefined : !!notify, + }).then(({ data }) => { + dispatch(updateListSuccess(data)); + + if (shouldReset) { + dispatch(resetListEditor()); + } + }).catch(err => dispatch(updateListFail(id, err))); +}; + +export const updateListRequest = id => ({ + type: LIST_UPDATE_REQUEST, + id, +}); + +export const updateListSuccess = list => ({ + type: LIST_UPDATE_SUCCESS, + list, +}); + +export const updateListFail = (id, error) => ({ + type: LIST_UPDATE_FAIL, + id, + error, +}); + +export const resetListEditor = () => ({ + type: LIST_EDITOR_RESET, +}); + export const deleteList = id => (dispatch) => { dispatch(deleteListRequest(id)); @@ -87,3 +213,166 @@ export const deleteListFail = (id, error) => ({ id, error, }); + +export const fetchListAccounts = listId => (dispatch) => { + dispatch(fetchListAccountsRequest(listId)); + + api().get(`/api/v1/lists/${listId}/accounts`, { params: { limit: 0 } }).then(({ data }) => { + dispatch(importFetchedAccounts(data)); + dispatch(fetchListAccountsSuccess(listId, data)); + }).catch(err => dispatch(fetchListAccountsFail(listId, err))); +}; + +export const fetchListAccountsRequest = id => ({ + type: LIST_ACCOUNTS_FETCH_REQUEST, + id, +}); + +export const fetchListAccountsSuccess = (id, accounts, next) => ({ + type: LIST_ACCOUNTS_FETCH_SUCCESS, + id, + accounts, + next, +}); + +export const fetchListAccountsFail = (id, error) => ({ + type: LIST_ACCOUNTS_FETCH_FAIL, + id, + error, +}); + +export const fetchListSuggestions = q => (dispatch) => { + const params = { + q, + resolve: false, + following: true, + }; + + api().get('/api/v1/accounts/search', { params }).then(({ data }) => { + dispatch(importFetchedAccounts(data)); + dispatch(fetchListSuggestionsReady(q, data)); + }).catch(error => dispatch(showAlertForError(error))); +}; + +export const fetchListSuggestionsReady = (query, accounts) => ({ + type: LIST_EDITOR_SUGGESTIONS_READY, + query, + accounts, +}); + +export const clearListSuggestions = () => ({ + type: LIST_EDITOR_SUGGESTIONS_CLEAR, +}); + +export const changeListSuggestions = value => ({ + type: LIST_EDITOR_SUGGESTIONS_CHANGE, + value, +}); + +export const addToListEditor = accountId => (dispatch, getState) => { + dispatch(addToList(getState().getIn(['listEditor', 'listId']), accountId)); +}; + +export const addToList = (listId, accountId) => (dispatch) => { + dispatch(addToListRequest(listId, accountId)); + + api().post(`/api/v1/lists/${listId}/accounts`, { account_ids: [accountId] }) + .then(() => dispatch(addToListSuccess(listId, accountId))) + .catch(err => dispatch(addToListFail(listId, accountId, err))); +}; + +export const addToListRequest = (listId, accountId) => ({ + type: LIST_EDITOR_ADD_REQUEST, + listId, + accountId, +}); + +export const addToListSuccess = (listId, accountId) => ({ + type: LIST_EDITOR_ADD_SUCCESS, + listId, + accountId, +}); + +export const addToListFail = (listId, accountId, error) => ({ + type: LIST_EDITOR_ADD_FAIL, + listId, + accountId, + error, +}); + +export const removeFromListEditor = accountId => (dispatch, getState) => { + dispatch(removeFromList(getState().getIn(['listEditor', 'listId']), accountId)); +}; + +export const removeFromList = (listId, accountId) => (dispatch) => { + dispatch(removeFromListRequest(listId, accountId)); + + api().delete(`/api/v1/lists/${listId}/accounts`, { params: { account_ids: [accountId] } }) + .then(() => dispatch(removeFromListSuccess(listId, accountId))) + .catch(err => dispatch(removeFromListFail(listId, accountId, err))); +}; + +export const removeFromListRequest = (listId, accountId) => ({ + type: LIST_EDITOR_REMOVE_REQUEST, + listId, + accountId, +}); + +export const removeFromListSuccess = (listId, accountId) => ({ + type: LIST_EDITOR_REMOVE_SUCCESS, + listId, + accountId, +}); + +export const removeFromListFail = (listId, accountId, error) => ({ + type: LIST_EDITOR_REMOVE_FAIL, + listId, + accountId, + error, +}); + +export const resetListAdder = () => ({ + type: LIST_ADDER_RESET, +}); + +export const setupListAdder = accountId => (dispatch, getState) => { + dispatch({ + type: LIST_ADDER_SETUP, + account: getState().getIn(['accounts', accountId]), + }); + dispatch(fetchLists()); + dispatch(fetchAccountLists(accountId)); +}; + +export const fetchAccountLists = accountId => (dispatch) => { + dispatch(fetchAccountListsRequest(accountId)); + + api().get(`/api/v1/accounts/${accountId}/lists`) + .then(({ data }) => dispatch(fetchAccountListsSuccess(accountId, data))) + .catch(err => dispatch(fetchAccountListsFail(accountId, err))); +}; + +export const fetchAccountListsRequest = id => ({ + type:LIST_ADDER_LISTS_FETCH_REQUEST, + id, +}); + +export const fetchAccountListsSuccess = (id, lists) => ({ + type: LIST_ADDER_LISTS_FETCH_SUCCESS, + id, + lists, +}); + +export const fetchAccountListsFail = (id, err) => ({ + type: LIST_ADDER_LISTS_FETCH_FAIL, + id, + err, +}); + +export const addToListAdder = listId => (dispatch, getState) => { + dispatch(addToList(listId, getState().getIn(['listAdder', 'accountId']))); +}; + +export const removeFromListAdder = listId => (dispatch, getState) => { + dispatch(removeFromList(listId, getState().getIn(['listAdder', 'accountId']))); +}; diff --git a/app/javascript/mastodon/actions/lists_typed.ts b/app/javascript/mastodon/actions/lists_typed.ts deleted file mode 100644 index eca051f52c..0000000000 --- a/app/javascript/mastodon/actions/lists_typed.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { apiCreate, apiUpdate } from 'mastodon/api/lists'; -import type { List } from 'mastodon/models/list'; -import { createDataLoadingThunk } from 'mastodon/store/typed_functions'; - -export const createList = createDataLoadingThunk( - 'list/create', - (list: Partial) => apiCreate(list), -); - -// Kmyblue tracking marker: copied antenna, circle, bookmark_category - -export const updateList = createDataLoadingThunk( - 'list/update', - (list: Partial) => apiUpdate(list), -); - -// Kmyblue tracking marker: copied antenna, circle, bookmark_category diff --git a/app/javascript/mastodon/actions/markers.ts b/app/javascript/mastodon/actions/markers.ts index 251546cb9a..03f577c540 100644 --- a/app/javascript/mastodon/actions/markers.ts +++ b/app/javascript/mastodon/actions/markers.ts @@ -37,7 +37,8 @@ export const synchronouslySubmitMarkers = createAppAsyncThunk( }); return; - } else if ('sendBeacon' in navigator) { + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition + } else if ('navigator' && 'sendBeacon' in navigator) { // Failing that, we can use sendBeacon, but we have to encode the data as // FormData for DoorKeeper to recognize the token. const formData = new FormData(); @@ -63,7 +64,7 @@ export const synchronouslySubmitMarkers = createAppAsyncThunk( client.setRequestHeader('Content-Type', 'application/json'); client.setRequestHeader('Authorization', `Bearer ${accessToken}`); client.send(JSON.stringify(params)); - } catch { + } catch (e) { // Do not make the BeforeUnload handler error out } }, @@ -74,7 +75,9 @@ interface MarkerParam { } function getLastNotificationId(state: RootState): string | undefined { - return state.notificationGroups.lastReadId; + // @ts-expect-error state.notifications is not yet typed + // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-call + return state.getIn(['notifications', 'lastReadId']); } const buildPostMarkersParams = (state: RootState) => { diff --git a/app/javascript/mastodon/actions/modal.ts b/app/javascript/mastodon/actions/modal.ts index 49af176a11..ab03e46765 100644 --- a/app/javascript/mastodon/actions/modal.ts +++ b/app/javascript/mastodon/actions/modal.ts @@ -9,7 +9,6 @@ export type ModalType = keyof typeof MODAL_COMPONENTS; interface OpenModalPayload { modalType: ModalType; modalProps: ModalProps; - previousModalProps?: ModalProps; } export const openModal = createAction('MODAL_OPEN'); diff --git a/app/javascript/mastodon/actions/notification_groups.ts b/app/javascript/mastodon/actions/notification_groups.ts deleted file mode 100644 index c7b192accc..0000000000 --- a/app/javascript/mastodon/actions/notification_groups.ts +++ /dev/null @@ -1,259 +0,0 @@ -import { createAction } from '@reduxjs/toolkit'; - -import { - apiClearNotifications, - apiFetchNotificationGroups, -} from 'mastodon/api/notifications'; -import type { ApiAccountJSON } from 'mastodon/api_types/accounts'; -import type { - ApiNotificationGroupJSON, - ApiNotificationJSON, - NotificationType, -} from 'mastodon/api_types/notifications'; -import { allNotificationTypes } from 'mastodon/api_types/notifications'; -import type { ApiStatusJSON } from 'mastodon/api_types/statuses'; -import { enableEmojiReaction, usePendingItems } from 'mastodon/initial_state'; -import type { NotificationGap } from 'mastodon/reducers/notification_groups'; -import { - selectSettingsNotificationsExcludedTypes, - selectSettingsNotificationsGroupFollows, - selectSettingsNotificationsQuickFilterActive, - selectSettingsNotificationsShows, -} from 'mastodon/selectors/settings'; -import type { AppDispatch, RootState } from 'mastodon/store'; -import { - createAppAsyncThunk, - createDataLoadingThunk, -} from 'mastodon/store/typed_functions'; - -import { importFetchedAccounts, importFetchedStatuses } from './importer'; -import { NOTIFICATIONS_FILTER_SET } from './notifications'; -import { saveSettings } from './settings'; - -function excludeAllTypesExcept(filter: string) { - return allNotificationTypes.filter((item) => item !== filter); -} - -function getExcludedTypes(state: RootState) { - const activeFilter = selectSettingsNotificationsQuickFilterActive(state); - - const types = - activeFilter === 'all' - ? selectSettingsNotificationsExcludedTypes(state) - : excludeAllTypesExcept(activeFilter); - if (!enableEmojiReaction && !types.includes('emoji_reaction')) { - types.push('emoji_reaction'); - } - - return types; -} - -function dispatchAssociatedRecords( - dispatch: AppDispatch, - notifications: ApiNotificationGroupJSON[] | ApiNotificationJSON[], -) { - const fetchedAccounts: ApiAccountJSON[] = []; - const fetchedStatuses: ApiStatusJSON[] = []; - - notifications.forEach((notification) => { - if (notification.type === 'admin.report') { - fetchedAccounts.push(notification.report.target_account); - } - - if (notification.type === 'moderation_warning') { - fetchedAccounts.push(notification.moderation_warning.target_account); - } - - if ('status' in notification && notification.status) { - fetchedStatuses.push(notification.status); - } - }); - - if (fetchedAccounts.length > 0) - dispatch(importFetchedAccounts(fetchedAccounts)); - - if (fetchedStatuses.length > 0) - dispatch(importFetchedStatuses(fetchedStatuses)); -} - -function selectNotificationGroupedTypes(state: RootState) { - const types: NotificationType[] = ['favourite', 'reblog', 'emoji_reaction']; - - if (selectSettingsNotificationsGroupFollows(state)) types.push('follow'); - - return types; -} - -export const fetchNotifications = createDataLoadingThunk( - 'notificationGroups/fetch', - async (_params, { getState }) => - apiFetchNotificationGroups({ - grouped_types: selectNotificationGroupedTypes(getState()), - exclude_types: getExcludedTypes(getState()), - }), - ({ notifications, accounts, statuses }, { dispatch }) => { - dispatch(importFetchedAccounts(accounts)); - dispatch(importFetchedStatuses(statuses)); - dispatchAssociatedRecords(dispatch, notifications); - const payload: (ApiNotificationGroupJSON | NotificationGap)[] = - notifications; - - // TODO: might be worth not using gaps for that… - // if (nextLink) payload.push({ type: 'gap', loadUrl: nextLink.uri }); - if (notifications.length > 1) - payload.push({ type: 'gap', maxId: notifications.at(-1)?.page_min_id }); - - return payload; - // dispatch(submitMarkers()); - }, -); - -export const fetchNotificationsGap = createDataLoadingThunk( - 'notificationGroups/fetchGap', - async (params: { gap: NotificationGap }, { getState }) => - apiFetchNotificationGroups({ - grouped_types: selectNotificationGroupedTypes(getState()), - max_id: params.gap.maxId, - exclude_types: getExcludedTypes(getState()), - }), - ({ notifications, accounts, statuses }, { dispatch }) => { - dispatch(importFetchedAccounts(accounts)); - dispatch(importFetchedStatuses(statuses)); - dispatchAssociatedRecords(dispatch, notifications); - - return { notifications }; - }, -); - -export const pollRecentNotifications = createDataLoadingThunk( - 'notificationGroups/pollRecentNotifications', - async (_params, { getState }) => { - return apiFetchNotificationGroups({ - grouped_types: selectNotificationGroupedTypes(getState()), - max_id: undefined, - exclude_types: getExcludedTypes(getState()), - // In slow mode, we don't want to include notifications that duplicate the already-displayed ones - since_id: usePendingItems - ? getState().notificationGroups.groups.find( - (group) => group.type !== 'gap', - )?.page_max_id - : undefined, - }); - }, - ({ notifications, accounts, statuses }, { dispatch }) => { - dispatch(importFetchedAccounts(accounts)); - dispatch(importFetchedStatuses(statuses)); - dispatchAssociatedRecords(dispatch, notifications); - - return { notifications }; - }, - { - useLoadingBar: false, - }, -); - -export const processNewNotificationForGroups = createAppAsyncThunk( - 'notificationGroups/processNew', - (notification: ApiNotificationJSON, { dispatch, getState }) => { - const state = getState(); - const activeFilter = selectSettingsNotificationsQuickFilterActive(state); - const notificationShows = selectSettingsNotificationsShows(state); - - const showInColumn = - activeFilter === 'all' - ? notificationShows[notification.type] !== false - : activeFilter === notification.type; - - if (!showInColumn) return; - - if ( - (notification.type === 'mention' || notification.type === 'update') && - notification.status?.filtered - ) { - const filters = notification.status.filtered.filter((result) => - result.filter.context.includes('notifications'), - ); - - if (filters.some((result) => result.filter.filter_action === 'hide')) { - return; - } - } - - dispatchAssociatedRecords(dispatch, [notification]); - - return { - notification, - groupedTypes: selectNotificationGroupedTypes(state), - }; - }, -); - -export const loadPending = createAction('notificationGroups/loadPending'); - -export const updateScrollPosition = createAppAsyncThunk( - 'notificationGroups/updateScrollPosition', - ({ top }: { top: boolean }, { dispatch, getState }) => { - if ( - top && - getState().notificationGroups.mergedNotifications === 'needs-reload' - ) { - void dispatch(fetchNotifications()); - } - - return { top }; - }, -); - -export const setNotificationsFilter = createAppAsyncThunk( - 'notifications/filter/set', - ({ filterType }: { filterType: string }, { dispatch }) => { - dispatch({ - type: NOTIFICATIONS_FILTER_SET, - path: ['notifications', 'quickFilter', 'active'], - value: filterType, - }); - void dispatch(fetchNotifications()); - dispatch(saveSettings()); - }, -); - -export const clearNotifications = createDataLoadingThunk( - 'notifications/clear', - () => apiClearNotifications(), -); - -export const markNotificationsAsRead = createAction( - 'notificationGroups/markAsRead', -); - -export const mountNotifications = createAppAsyncThunk( - 'notificationGroups/mount', - (_, { dispatch, getState }) => { - const state = getState(); - - if ( - state.notificationGroups.mounted === 0 && - state.notificationGroups.mergedNotifications === 'needs-reload' - ) { - void dispatch(fetchNotifications()); - } - }, -); - -export const unmountNotifications = createAction('notificationGroups/unmount'); - -export const refreshStaleNotificationGroups = createAppAsyncThunk<{ - deferredRefresh: boolean; -}>('notificationGroups/refreshStale', (_, { dispatch, getState }) => { - const state = getState(); - - if ( - state.notificationGroups.scrolledToTop || - !state.notificationGroups.mounted - ) { - void dispatch(fetchNotifications()); - return { deferredRefresh: false }; - } - - return { deferredRefresh: true }; -}); diff --git a/app/javascript/mastodon/actions/notification_policies.ts b/app/javascript/mastodon/actions/notification_policies.ts index fd798eaad7..fcc9919c49 100644 --- a/app/javascript/mastodon/actions/notification_policies.ts +++ b/app/javascript/mastodon/actions/notification_policies.ts @@ -1,5 +1,3 @@ -import { createAction } from '@reduxjs/toolkit'; - import { apiGetNotificationPolicy, apiUpdateNotificationsPolicy, @@ -16,7 +14,3 @@ export const updateNotificationsPolicy = createDataLoadingThunk( 'notificationPolicy/update', (policy: Partial) => apiUpdateNotificationsPolicy(policy), ); - -export const decreasePendingRequestsCount = createAction( - 'notificationPolicy/decreasePendingRequestsCount', -); diff --git a/app/javascript/mastodon/actions/notification_requests.ts b/app/javascript/mastodon/actions/notification_requests.ts deleted file mode 100644 index 8352ff2aad..0000000000 --- a/app/javascript/mastodon/actions/notification_requests.ts +++ /dev/null @@ -1,214 +0,0 @@ -import { - apiFetchNotificationRequest, - apiFetchNotificationRequests, - apiFetchNotifications, - apiAcceptNotificationRequest, - apiDismissNotificationRequest, - apiAcceptNotificationRequests, - apiDismissNotificationRequests, -} from 'mastodon/api/notifications'; -import type { ApiAccountJSON } from 'mastodon/api_types/accounts'; -import type { - ApiNotificationGroupJSON, - ApiNotificationJSON, -} from 'mastodon/api_types/notifications'; -import type { ApiStatusJSON } from 'mastodon/api_types/statuses'; -import type { AppDispatch } from 'mastodon/store'; -import { createDataLoadingThunk } from 'mastodon/store/typed_functions'; - -import { importFetchedAccounts, importFetchedStatuses } from './importer'; -import { decreasePendingRequestsCount } from './notification_policies'; - -// TODO: refactor with notification_groups -function dispatchAssociatedRecords( - dispatch: AppDispatch, - notifications: ApiNotificationGroupJSON[] | ApiNotificationJSON[], -) { - const fetchedAccounts: ApiAccountJSON[] = []; - const fetchedStatuses: ApiStatusJSON[] = []; - - notifications.forEach((notification) => { - if (notification.type === 'admin.report') { - fetchedAccounts.push(notification.report.target_account); - } - - if (notification.type === 'moderation_warning') { - fetchedAccounts.push(notification.moderation_warning.target_account); - } - - if ('status' in notification && notification.status) { - fetchedStatuses.push(notification.status); - } - }); - - if (fetchedAccounts.length > 0) - dispatch(importFetchedAccounts(fetchedAccounts)); - - if (fetchedStatuses.length > 0) - dispatch(importFetchedStatuses(fetchedStatuses)); -} - -export const fetchNotificationRequests = createDataLoadingThunk( - 'notificationRequests/fetch', - async (_params, { getState }) => { - let sinceId = undefined; - - if (getState().notificationRequests.items.length > 0) { - sinceId = getState().notificationRequests.items[0]?.id; - } - - return apiFetchNotificationRequests({ - since_id: sinceId, - }); - }, - ({ requests, links }, { dispatch }) => { - const next = links.refs.find((link) => link.rel === 'next'); - - dispatch(importFetchedAccounts(requests.map((request) => request.account))); - - return { requests, next: next?.uri }; - }, - { - condition: (_params, { getState }) => - !getState().notificationRequests.isLoading, - }, -); - -export const fetchNotificationRequest = createDataLoadingThunk( - 'notificationRequest/fetch', - async ({ id }: { id: string }) => apiFetchNotificationRequest(id), - { - condition: ({ id }, { getState }) => - !( - getState().notificationRequests.current.item?.id === id || - getState().notificationRequests.current.isLoading - ), - }, -); - -export const expandNotificationRequests = createDataLoadingThunk( - 'notificationRequests/expand', - async (_, { getState }) => { - const nextUrl = getState().notificationRequests.next; - if (!nextUrl) throw new Error('missing URL'); - - return apiFetchNotificationRequests(undefined, nextUrl); - }, - ({ requests, links }, { dispatch }) => { - const next = links.refs.find((link) => link.rel === 'next'); - - dispatch(importFetchedAccounts(requests.map((request) => request.account))); - - return { requests, next: next?.uri }; - }, - { - condition: (_, { getState }) => - !!getState().notificationRequests.next && - !getState().notificationRequests.isLoading, - }, -); - -export const fetchNotificationsForRequest = createDataLoadingThunk( - 'notificationRequest/fetchNotifications', - async ({ accountId }: { accountId: string }, { getState }) => { - const sinceId = - // @ts-expect-error current.notifications.items is not yet typed - // eslint-disable-next-line @typescript-eslint/no-unsafe-call - getState().notificationRequests.current.notifications.items[0]?.get( - 'id', - ) as string | undefined; - - return apiFetchNotifications({ - since_id: sinceId, - account_id: accountId, - }); - }, - ({ notifications, links }, { dispatch }) => { - const next = links.refs.find((link) => link.rel === 'next'); - - dispatchAssociatedRecords(dispatch, notifications); - - return { notifications, next: next?.uri }; - }, - { - condition: ({ accountId }, { getState }) => { - const current = getState().notificationRequests.current; - return !( - current.item?.account_id === accountId && - current.notifications.isLoading - ); - }, - }, -); - -export const expandNotificationsForRequest = createDataLoadingThunk( - 'notificationRequest/expandNotifications', - async (_, { getState }) => { - const nextUrl = getState().notificationRequests.current.notifications.next; - if (!nextUrl) throw new Error('missing URL'); - - return apiFetchNotifications(undefined, nextUrl); - }, - ({ notifications, links }, { dispatch }) => { - const next = links.refs.find((link) => link.rel === 'next'); - - dispatchAssociatedRecords(dispatch, notifications); - - return { notifications, next: next?.uri }; - }, - { - condition: ({ accountId }: { accountId: string }, { getState }) => { - const url = getState().notificationRequests.current.notifications.next; - - return ( - !!url && - !getState().notificationRequests.current.notifications.isLoading && - getState().notificationRequests.current.item?.account_id === accountId - ); - }, - }, -); - -export const acceptNotificationRequest = createDataLoadingThunk( - 'notificationRequest/accept', - ({ id }: { id: string }) => apiAcceptNotificationRequest(id), - (_data, { dispatch, discardLoadData }) => { - dispatch(decreasePendingRequestsCount(1)); - - // The payload is not used in any functions - return discardLoadData; - }, -); - -export const dismissNotificationRequest = createDataLoadingThunk( - 'notificationRequest/dismiss', - ({ id }: { id: string }) => apiDismissNotificationRequest(id), - (_data, { dispatch, discardLoadData }) => { - dispatch(decreasePendingRequestsCount(1)); - - // The payload is not used in any functions - return discardLoadData; - }, -); - -export const acceptNotificationRequests = createDataLoadingThunk( - 'notificationRequests/acceptBulk', - ({ ids }: { ids: string[] }) => apiAcceptNotificationRequests(ids), - (_data, { dispatch, discardLoadData, actionArg: { ids } }) => { - dispatch(decreasePendingRequestsCount(ids.length)); - - // The payload is not used in any functions - return discardLoadData; - }, -); - -export const dismissNotificationRequests = createDataLoadingThunk( - 'notificationRequests/dismissBulk', - ({ ids }: { ids: string[] }) => apiDismissNotificationRequests(ids), - (_data, { dispatch, discardLoadData, actionArg: { ids } }) => { - dispatch(decreasePendingRequestsCount(ids.length)); - - // The payload is not used in any functions - return discardLoadData; - }, -); diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js index 87b842e51f..08f85475da 100644 --- a/app/javascript/mastodon/actions/notifications.js +++ b/app/javascript/mastodon/actions/notifications.js @@ -1,40 +1,93 @@ import { IntlMessageFormat } from 'intl-messageformat'; import { defineMessages } from 'react-intl'; +import { List as ImmutableList } from 'immutable'; + +import { compareId } from 'mastodon/compare_id'; +import { enableEmojiReaction, usePendingItems as preferPendingItems } from 'mastodon/initial_state'; + +import api, { getLinks } from '../api'; import { unescapeHTML } from '../utils/html'; import { requestNotificationPermission } from '../utils/notifications'; -import { fetchFollowRequests } from './accounts'; +import { fetchFollowRequests, fetchRelationships } from './accounts'; import { importFetchedAccount, + importFetchedAccounts, + importFetchedStatus, + importFetchedStatuses, } from './importer'; import { submitMarkers } from './markers'; import { notificationsUpdate } from "./notifications_typed"; import { register as registerPushNotifications } from './push_notifications'; +import { saveSettings } from './settings'; import { STATUS_EMOJI_REACTION_UPDATE } from './statuses'; export * from "./notifications_typed"; +export const NOTIFICATIONS_UPDATE_NOOP = 'NOTIFICATIONS_UPDATE_NOOP'; + +export const NOTIFICATIONS_EXPAND_REQUEST = 'NOTIFICATIONS_EXPAND_REQUEST'; +export const NOTIFICATIONS_EXPAND_SUCCESS = 'NOTIFICATIONS_EXPAND_SUCCESS'; +export const NOTIFICATIONS_EXPAND_FAIL = 'NOTIFICATIONS_EXPAND_FAIL'; + export const NOTIFICATIONS_FILTER_SET = 'NOTIFICATIONS_FILTER_SET'; +export const NOTIFICATIONS_CLEAR = 'NOTIFICATIONS_CLEAR'; +export const NOTIFICATIONS_SCROLL_TOP = 'NOTIFICATIONS_SCROLL_TOP'; +export const NOTIFICATIONS_LOAD_PENDING = 'NOTIFICATIONS_LOAD_PENDING'; + +export const NOTIFICATIONS_MOUNT = 'NOTIFICATIONS_MOUNT'; +export const NOTIFICATIONS_UNMOUNT = 'NOTIFICATIONS_UNMOUNT'; + +export const NOTIFICATIONS_MARK_AS_READ = 'NOTIFICATIONS_MARK_AS_READ'; + export const NOTIFICATIONS_SET_BROWSER_SUPPORT = 'NOTIFICATIONS_SET_BROWSER_SUPPORT'; export const NOTIFICATIONS_SET_BROWSER_PERMISSION = 'NOTIFICATIONS_SET_BROWSER_PERMISSION'; -const messages = defineMessages({ - // mention: { id: 'notification.mention', defaultMessage: '{name} mentioned you' }, +export const NOTIFICATION_REQUESTS_FETCH_REQUEST = 'NOTIFICATION_REQUESTS_FETCH_REQUEST'; +export const NOTIFICATION_REQUESTS_FETCH_SUCCESS = 'NOTIFICATION_REQUESTS_FETCH_SUCCESS'; +export const NOTIFICATION_REQUESTS_FETCH_FAIL = 'NOTIFICATION_REQUESTS_FETCH_FAIL'; + +export const NOTIFICATION_REQUESTS_EXPAND_REQUEST = 'NOTIFICATION_REQUESTS_EXPAND_REQUEST'; +export const NOTIFICATION_REQUESTS_EXPAND_SUCCESS = 'NOTIFICATION_REQUESTS_EXPAND_SUCCESS'; +export const NOTIFICATION_REQUESTS_EXPAND_FAIL = 'NOTIFICATION_REQUESTS_EXPAND_FAIL'; + +export const NOTIFICATION_REQUEST_FETCH_REQUEST = 'NOTIFICATION_REQUEST_FETCH_REQUEST'; +export const NOTIFICATION_REQUEST_FETCH_SUCCESS = 'NOTIFICATION_REQUEST_FETCH_SUCCESS'; +export const NOTIFICATION_REQUEST_FETCH_FAIL = 'NOTIFICATION_REQUEST_FETCH_FAIL'; + +export const NOTIFICATION_REQUEST_ACCEPT_REQUEST = 'NOTIFICATION_REQUEST_ACCEPT_REQUEST'; +export const NOTIFICATION_REQUEST_ACCEPT_SUCCESS = 'NOTIFICATION_REQUEST_ACCEPT_SUCCESS'; +export const NOTIFICATION_REQUEST_ACCEPT_FAIL = 'NOTIFICATION_REQUEST_ACCEPT_FAIL'; + +export const NOTIFICATION_REQUEST_DISMISS_REQUEST = 'NOTIFICATION_REQUEST_DISMISS_REQUEST'; +export const NOTIFICATION_REQUEST_DISMISS_SUCCESS = 'NOTIFICATION_REQUEST_DISMISS_SUCCESS'; +export const NOTIFICATION_REQUEST_DISMISS_FAIL = 'NOTIFICATION_REQUEST_DISMISS_FAIL'; + +export const NOTIFICATIONS_FOR_REQUEST_FETCH_REQUEST = 'NOTIFICATIONS_FOR_REQUEST_FETCH_REQUEST'; +export const NOTIFICATIONS_FOR_REQUEST_FETCH_SUCCESS = 'NOTIFICATIONS_FOR_REQUEST_FETCH_SUCCESS'; +export const NOTIFICATIONS_FOR_REQUEST_FETCH_FAIL = 'NOTIFICATIONS_FOR_REQUEST_FETCH_FAIL'; + +export const NOTIFICATIONS_FOR_REQUEST_EXPAND_REQUEST = 'NOTIFICATIONS_FOR_REQUEST_EXPAND_REQUEST'; +export const NOTIFICATIONS_FOR_REQUEST_EXPAND_SUCCESS = 'NOTIFICATIONS_FOR_REQUEST_EXPAND_SUCCESS'; +export const NOTIFICATIONS_FOR_REQUEST_EXPAND_FAIL = 'NOTIFICATIONS_FOR_REQUEST_EXPAND_FAIL'; + +defineMessages({ + mention: { id: 'notification.mention', defaultMessage: '{name} mentioned you' }, group: { id: 'notifications.group', defaultMessage: '{count} notifications' }, - 'message_admin.report': { id: 'notification.admin.report', defaultMessage: '{name} reported {target}' }, - 'message_admin.sign_up': { id: 'notification.admin.sign_up', defaultMessage: '{name} signed up' }, - message_emoji_reaction: { id: 'notification.emoji_reaction', defaultMessage: '{name} reacted your post with emoji' }, - message_favourite: { id: 'notification.favourite', defaultMessage: '{name} favorited your post' }, - message_follow: { id: 'notification.follow', defaultMessage: '{name} followed you' }, - message_list_status: { id: 'notification.list_status', defaultMessage: '{name} post is added to {listName}' }, - message_mention: { id: 'notification.mention', defaultMessage: 'Mention' }, - message_poll: { id: 'notification.poll', defaultMessage: 'A poll you voted in has ended' }, - message_reblog: { id: 'notification.reblog', defaultMessage: '{name} boosted your post' }, - message_status: { id: 'notification.status', defaultMessage: '{name} just posted' }, - message_status_reference: { id: 'notification.status_reference', defaultMessage: '{name} quoted your post' }, - message_update: { id: 'notification.update', defaultMessage: '{name} edited a post' }, +}); + +const fetchRelatedRelationships = (dispatch, notifications) => { + const accountIds = notifications.filter(item => ['follow', 'follow_request', 'admin.sign_up'].indexOf(item.type) !== -1).map(item => item.account.id); + + if (accountIds.length > 0) { + dispatch(fetchRelationships(accountIds)); + } +}; + +export const loadPending = () => ({ + type: NOTIFICATIONS_LOAD_PENDING, }); export function updateEmojiReactions(emoji_reaction) { @@ -47,6 +100,8 @@ export function updateEmojiReactions(emoji_reaction) { export function updateNotifications(notification, intlMessages, intlLocale) { return (dispatch, getState) => { + const activeFilter = getState().getIn(['settings', 'notifications', 'quickFilter', 'active']); + const showInColumn = activeFilter === 'all' ? getState().getIn(['settings', 'notifications', 'shows', notification.type], true) : activeFilter === notification.type; const showAlert = getState().getIn(['settings', 'notifications', 'alerts', notification.type], true); const playSound = getState().getIn(['settings', 'notifications', 'sounds', notification.type], true); @@ -55,7 +110,7 @@ export function updateNotifications(notification, intlMessages, intlLocale) { if (['mention', 'status'].includes(notification.type) && notification.status.filtered) { const filters = notification.status.filtered.filter(result => result.filter.context.includes('notifications')); - if (filters.some(result => result.filter.filter_action === 'hide')) { + if (filters.some(result => result.filter.filter_action_ex === 'hide')) { return; } @@ -68,17 +123,31 @@ export function updateNotifications(notification, intlMessages, intlLocale) { dispatch(submitMarkers()); - // `notificationsUpdate` is still used in `user_lists` and `relationships` reducers - dispatch(importFetchedAccount(notification.account)); - dispatch(notificationsUpdate({ notification, playSound: playSound && !filtered})); + if (showInColumn) { + dispatch(importFetchedAccount(notification.account)); + + if (notification.status) { + dispatch(importFetchedStatus(notification.status)); + } + + if (notification.report) { + dispatch(importFetchedAccount(notification.report.target_account)); + } + + + dispatch(notificationsUpdate({ notification, preferPendingItems, playSound: playSound && !filtered})); + + fetchRelatedRelationships(dispatch, [notification]); + } else if (playSound && !filtered) { + dispatch({ + type: NOTIFICATIONS_UPDATE_NOOP, + meta: { sound: 'boop' }, + }); + } // Desktop notifications if (typeof window.Notification !== 'undefined' && showAlert && !filtered) { - const messageTemplate = intlMessages[`notification.${notification.type}`] || messages[`message_${notification.type}`] || '[NO MESSAGE DEFINITION]'; - const title = new IntlMessageFormat(messageTemplate, intlLocale).format({ - name: notification.account.display_name.length > 0 ? notification.account.display_name : notification.account.username, - listName: notification.list && notification.list.title, - }); + const title = new IntlMessageFormat(intlMessages[`notification.${notification.type}`], intlLocale).format({ name: notification.account.display_name.length > 0 ? notification.account.display_name : notification.account.username }); const body = (notification.status && notification.status.spoiler_text.length > 0) ? notification.status.spoiler_text : unescapeHTML(notification.status ? notification.status.content : ''); const notify = new Notification(title, { body, icon: notification.account.avatar, tag: notification.id }); @@ -91,8 +160,162 @@ export function updateNotifications(notification, intlMessages, intlLocale) { }; } +const excludeTypesFromSettings = state => state.getIn(['settings', 'notifications', 'shows']).filter(enabled => !enabled).keySeq().toJS(); + +const excludeTypesFromFilter = filter => { + const allTypes = ImmutableList([ + 'follow', + 'follow_request', + 'favourite', + 'emoji_reaction', + 'reblog', + 'status_reference', + 'mention', + 'poll', + 'status', + 'list_status', + 'update', + 'admin.sign_up', + 'admin.report', + ]); + + return allTypes.filterNot(item => item === filter).toJS(); +}; + const noOp = () => {}; +let expandNotificationsController = new AbortController(); + +export function expandNotifications({ maxId, forceLoad } = {}, done = noOp) { + return (dispatch, getState) => { + const activeFilter = getState().getIn(['settings', 'notifications', 'quickFilter', 'active']); + const notifications = getState().get('notifications'); + const isLoadingMore = !!maxId; + + if (notifications.get('isLoading')) { + if (forceLoad) { + expandNotificationsController.abort(); + expandNotificationsController = new AbortController(); + } else { + done(); + return; + } + } + + let exclude_types = activeFilter === 'all' + ? excludeTypesFromSettings(getState()) + : excludeTypesFromFilter(activeFilter); + if (!enableEmojiReaction && !exclude_types.includes('emoji_reaction')) { + exclude_types.push('emoji_reaction'); + } + + const params = { + max_id: maxId, + exclude_types, + }; + + if (!params.max_id && (notifications.get('items', ImmutableList()).size + notifications.get('pendingItems', ImmutableList()).size) > 0) { + const a = notifications.getIn(['pendingItems', 0, 'id']); + const b = notifications.getIn(['items', 0, 'id']); + + if (a && b && compareId(a, b) > 0) { + params.since_id = a; + } else { + params.since_id = b || a; + } + } + + const isLoadingRecent = !!params.since_id; + + dispatch(expandNotificationsRequest(isLoadingMore)); + + api().get('/api/v1/notifications', { params, signal: expandNotificationsController.signal }).then(response => { + const next = getLinks(response).refs.find(link => link.rel === 'next'); + + dispatch(importFetchedAccounts(response.data.map(item => item.account))); + dispatch(importFetchedStatuses(response.data.map(item => item.status).filter(status => !!status))); + dispatch(importFetchedAccounts(response.data.filter(item => item.report).map(item => item.report.target_account))); + + dispatch(expandNotificationsSuccess(response.data, next ? next.uri : null, isLoadingMore, isLoadingRecent, isLoadingRecent && preferPendingItems)); + fetchRelatedRelationships(dispatch, response.data); + dispatch(submitMarkers()); + }).catch(error => { + dispatch(expandNotificationsFail(error, isLoadingMore)); + }).finally(() => { + done(); + }); + }; +} + +export function expandNotificationsRequest(isLoadingMore) { + return { + type: NOTIFICATIONS_EXPAND_REQUEST, + skipLoading: !isLoadingMore, + }; +} + +export function expandNotificationsSuccess(notifications, next, isLoadingMore, isLoadingRecent, usePendingItems) { + return { + type: NOTIFICATIONS_EXPAND_SUCCESS, + notifications, + next, + isLoadingRecent: isLoadingRecent, + usePendingItems, + skipLoading: !isLoadingMore, + }; +} + +export function expandNotificationsFail(error, isLoadingMore) { + return { + type: NOTIFICATIONS_EXPAND_FAIL, + error, + skipLoading: !isLoadingMore, + skipAlert: !isLoadingMore || error.name === 'AbortError', + }; +} + +export function clearNotifications() { + return (dispatch) => { + dispatch({ + type: NOTIFICATIONS_CLEAR, + }); + + api().post('/api/v1/notifications/clear'); + }; +} + +export function scrollTopNotifications(top) { + return { + type: NOTIFICATIONS_SCROLL_TOP, + top, + }; +} + +export function setFilter (filterType) { + return dispatch => { + dispatch({ + type: NOTIFICATIONS_FILTER_SET, + path: ['notifications', 'quickFilter', 'active'], + value: filterType, + }); + dispatch(expandNotifications({ forceLoad: true })); + dispatch(saveSettings()); + }; +} + +export const mountNotifications = () => ({ + type: NOTIFICATIONS_MOUNT, +}); + +export const unmountNotifications = () => ({ + type: NOTIFICATIONS_UNMOUNT, +}); + + +export const markNotificationsAsRead = () => ({ + type: NOTIFICATIONS_MARK_AS_READ, +}); + // Browser support export function setupBrowserNotifications() { return dispatch => { @@ -135,3 +358,236 @@ export function setBrowserPermission (value) { value, }; } + +export const fetchNotificationRequests = () => (dispatch, getState) => { + const params = {}; + + if (getState().getIn(['notificationRequests', 'isLoading'])) { + return; + } + + if (getState().getIn(['notificationRequests', 'items'])?.size > 0) { + params.since_id = getState().getIn(['notificationRequests', 'items', 0, 'id']); + } + + dispatch(fetchNotificationRequestsRequest()); + + api().get('/api/v1/notifications/requests', { params }).then(response => { + const next = getLinks(response).refs.find(link => link.rel === 'next'); + dispatch(importFetchedAccounts(response.data.map(x => x.account))); + dispatch(fetchNotificationRequestsSuccess(response.data, next ? next.uri : null)); + }).catch(err => { + dispatch(fetchNotificationRequestsFail(err)); + }); +}; + +export const fetchNotificationRequestsRequest = () => ({ + type: NOTIFICATION_REQUESTS_FETCH_REQUEST, +}); + +export const fetchNotificationRequestsSuccess = (requests, next) => ({ + type: NOTIFICATION_REQUESTS_FETCH_SUCCESS, + requests, + next, +}); + +export const fetchNotificationRequestsFail = error => ({ + type: NOTIFICATION_REQUESTS_FETCH_FAIL, + error, +}); + +export const expandNotificationRequests = () => (dispatch, getState) => { + const url = getState().getIn(['notificationRequests', 'next']); + + if (!url || getState().getIn(['notificationRequests', 'isLoading'])) { + return; + } + + dispatch(expandNotificationRequestsRequest()); + + api().get(url).then(response => { + const next = getLinks(response).refs.find(link => link.rel === 'next'); + dispatch(importFetchedAccounts(response.data.map(x => x.account))); + dispatch(expandNotificationRequestsSuccess(response.data, next?.uri)); + }).catch(err => { + dispatch(expandNotificationRequestsFail(err)); + }); +}; + +export const expandNotificationRequestsRequest = () => ({ + type: NOTIFICATION_REQUESTS_EXPAND_REQUEST, +}); + +export const expandNotificationRequestsSuccess = (requests, next) => ({ + type: NOTIFICATION_REQUESTS_EXPAND_SUCCESS, + requests, + next, +}); + +export const expandNotificationRequestsFail = error => ({ + type: NOTIFICATION_REQUESTS_EXPAND_FAIL, + error, +}); + +export const fetchNotificationRequest = id => (dispatch, getState) => { + const current = getState().getIn(['notificationRequests', 'current']); + + if (current.getIn(['item', 'id']) === id || current.get('isLoading')) { + return; + } + + dispatch(fetchNotificationRequestRequest(id)); + + api().get(`/api/v1/notifications/requests/${id}`).then(({ data }) => { + dispatch(fetchNotificationRequestSuccess(data)); + }).catch(err => { + dispatch(fetchNotificationRequestFail(id, err)); + }); +}; + +export const fetchNotificationRequestRequest = id => ({ + type: NOTIFICATION_REQUEST_FETCH_REQUEST, + id, +}); + +export const fetchNotificationRequestSuccess = request => ({ + type: NOTIFICATION_REQUEST_FETCH_SUCCESS, + request, +}); + +export const fetchNotificationRequestFail = (id, error) => ({ + type: NOTIFICATION_REQUEST_FETCH_FAIL, + id, + error, +}); + +export const acceptNotificationRequest = id => (dispatch) => { + dispatch(acceptNotificationRequestRequest(id)); + + api().post(`/api/v1/notifications/requests/${id}/accept`).then(() => { + dispatch(acceptNotificationRequestSuccess(id)); + }).catch(err => { + dispatch(acceptNotificationRequestFail(id, err)); + }); +}; + +export const acceptNotificationRequestRequest = id => ({ + type: NOTIFICATION_REQUEST_ACCEPT_REQUEST, + id, +}); + +export const acceptNotificationRequestSuccess = id => ({ + type: NOTIFICATION_REQUEST_ACCEPT_SUCCESS, + id, +}); + +export const acceptNotificationRequestFail = (id, error) => ({ + type: NOTIFICATION_REQUEST_ACCEPT_FAIL, + id, + error, +}); + +export const dismissNotificationRequest = id => (dispatch) => { + dispatch(dismissNotificationRequestRequest(id)); + + api().post(`/api/v1/notifications/requests/${id}/dismiss`).then(() =>{ + dispatch(dismissNotificationRequestSuccess(id)); + }).catch(err => { + dispatch(dismissNotificationRequestFail(id, err)); + }); +}; + +export const dismissNotificationRequestRequest = id => ({ + type: NOTIFICATION_REQUEST_DISMISS_REQUEST, + id, +}); + +export const dismissNotificationRequestSuccess = id => ({ + type: NOTIFICATION_REQUEST_DISMISS_SUCCESS, + id, +}); + +export const dismissNotificationRequestFail = (id, error) => ({ + type: NOTIFICATION_REQUEST_DISMISS_FAIL, + id, + error, +}); + +export const fetchNotificationsForRequest = accountId => (dispatch, getState) => { + const current = getState().getIn(['notificationRequests', 'current']); + const params = { account_id: accountId }; + + if (current.getIn(['item', 'account']) === accountId) { + if (current.getIn(['notifications', 'isLoading'])) { + return; + } + + if (current.getIn(['notifications', 'items'])?.size > 0) { + params.since_id = current.getIn(['notifications', 'items', 0, 'id']); + } + } + + dispatch(fetchNotificationsForRequestRequest()); + + api().get('/api/v1/notifications', { params }).then(response => { + const next = getLinks(response).refs.find(link => link.rel === 'next'); + dispatch(importFetchedAccounts(response.data.map(item => item.account))); + dispatch(importFetchedStatuses(response.data.map(item => item.status).filter(status => !!status))); + dispatch(importFetchedAccounts(response.data.filter(item => item.report).map(item => item.report.target_account))); + + dispatch(fetchNotificationsForRequestSuccess(response.data, next?.uri)); + }).catch(err => { + dispatch(fetchNotificationsForRequestFail(err)); + }); +}; + +export const fetchNotificationsForRequestRequest = () => ({ + type: NOTIFICATIONS_FOR_REQUEST_FETCH_REQUEST, +}); + +export const fetchNotificationsForRequestSuccess = (notifications, next) => ({ + type: NOTIFICATIONS_FOR_REQUEST_FETCH_SUCCESS, + notifications, + next, +}); + +export const fetchNotificationsForRequestFail = (error) => ({ + type: NOTIFICATIONS_FOR_REQUEST_FETCH_FAIL, + error, +}); + +export const expandNotificationsForRequest = () => (dispatch, getState) => { + const url = getState().getIn(['notificationRequests', 'current', 'notifications', 'next']); + + if (!url || getState().getIn(['notificationRequests', 'current', 'notifications', 'isLoading'])) { + return; + } + + dispatch(expandNotificationsForRequestRequest()); + + api().get(url).then(response => { + const next = getLinks(response).refs.find(link => link.rel === 'next'); + dispatch(importFetchedAccounts(response.data.map(item => item.account))); + dispatch(importFetchedStatuses(response.data.map(item => item.status).filter(status => !!status))); + dispatch(importFetchedAccounts(response.data.filter(item => item.report).map(item => item.report.target_account))); + + dispatch(expandNotificationsForRequestSuccess(response.data, next?.uri)); + }).catch(err => { + dispatch(expandNotificationsForRequestFail(err)); + }); +}; + +export const expandNotificationsForRequestRequest = () => ({ + type: NOTIFICATIONS_FOR_REQUEST_EXPAND_REQUEST, +}); + +export const expandNotificationsForRequestSuccess = (notifications, next) => ({ + type: NOTIFICATIONS_FOR_REQUEST_EXPAND_SUCCESS, + notifications, + next, +}); + +export const expandNotificationsForRequestFail = (error) => ({ + type: NOTIFICATIONS_FOR_REQUEST_EXPAND_FAIL, + error, +}); diff --git a/app/javascript/mastodon/actions/notifications_typed.ts b/app/javascript/mastodon/actions/notifications_typed.ts index 3eb1230666..176362f4b1 100644 --- a/app/javascript/mastodon/actions/notifications_typed.ts +++ b/app/javascript/mastodon/actions/notifications_typed.ts @@ -1,6 +1,11 @@ import { createAction } from '@reduxjs/toolkit'; -import type { ApiNotificationJSON } from 'mastodon/api_types/notifications'; +import type { ApiAccountJSON } from '../api_types/accounts'; +// To be replaced once ApiNotificationJSON type exists +interface FakeApiNotificationJSON { + type: string; + account: ApiAccountJSON; +} export const notificationsUpdate = createAction( 'notifications/update', @@ -8,7 +13,8 @@ export const notificationsUpdate = createAction( playSound, ...args }: { - notification: ApiNotificationJSON; + notification: FakeApiNotificationJSON; + usePendingItems: boolean; playSound: boolean; }) => ({ payload: args, diff --git a/app/javascript/mastodon/actions/polls.js b/app/javascript/mastodon/actions/polls.js new file mode 100644 index 0000000000..aa49341444 --- /dev/null +++ b/app/javascript/mastodon/actions/polls.js @@ -0,0 +1,61 @@ +import api from '../api'; + +import { importFetchedPoll } from './importer'; + +export const POLL_VOTE_REQUEST = 'POLL_VOTE_REQUEST'; +export const POLL_VOTE_SUCCESS = 'POLL_VOTE_SUCCESS'; +export const POLL_VOTE_FAIL = 'POLL_VOTE_FAIL'; + +export const POLL_FETCH_REQUEST = 'POLL_FETCH_REQUEST'; +export const POLL_FETCH_SUCCESS = 'POLL_FETCH_SUCCESS'; +export const POLL_FETCH_FAIL = 'POLL_FETCH_FAIL'; + +export const vote = (pollId, choices) => (dispatch) => { + dispatch(voteRequest()); + + api().post(`/api/v1/polls/${pollId}/votes`, { choices }) + .then(({ data }) => { + dispatch(importFetchedPoll(data)); + dispatch(voteSuccess(data)); + }) + .catch(err => dispatch(voteFail(err))); +}; + +export const fetchPoll = pollId => (dispatch) => { + dispatch(fetchPollRequest()); + + api().get(`/api/v1/polls/${pollId}`) + .then(({ data }) => { + dispatch(importFetchedPoll(data)); + dispatch(fetchPollSuccess(data)); + }) + .catch(err => dispatch(fetchPollFail(err))); +}; + +export const voteRequest = () => ({ + type: POLL_VOTE_REQUEST, +}); + +export const voteSuccess = poll => ({ + type: POLL_VOTE_SUCCESS, + poll, +}); + +export const voteFail = error => ({ + type: POLL_VOTE_FAIL, + error, +}); + +export const fetchPollRequest = () => ({ + type: POLL_FETCH_REQUEST, +}); + +export const fetchPollSuccess = poll => ({ + type: POLL_FETCH_SUCCESS, + poll, +}); + +export const fetchPollFail = error => ({ + type: POLL_FETCH_FAIL, + error, +}); diff --git a/app/javascript/mastodon/actions/polls.ts b/app/javascript/mastodon/actions/polls.ts deleted file mode 100644 index 65a96e8f62..0000000000 --- a/app/javascript/mastodon/actions/polls.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { apiGetPoll, apiPollVote } from 'mastodon/api/polls'; -import type { ApiPollJSON } from 'mastodon/api_types/polls'; -import { createPollFromServerJSON } from 'mastodon/models/poll'; -import { - createAppAsyncThunk, - createDataLoadingThunk, -} from 'mastodon/store/typed_functions'; - -import { importPolls } from './importer/polls'; - -export const importFetchedPoll = createAppAsyncThunk( - 'poll/importFetched', - (args: { poll: ApiPollJSON }, { dispatch, getState }) => { - const { poll } = args; - - dispatch( - importPolls({ - polls: [createPollFromServerJSON(poll, getState().polls[poll.id])], - }), - ); - }, -); - -export const vote = createDataLoadingThunk( - 'poll/vote', - ({ pollId, choices }: { pollId: string; choices: string[] }) => - apiPollVote(pollId, choices), - async (poll, { dispatch, discardLoadData }) => { - await dispatch(importFetchedPoll({ poll })); - return discardLoadData; - }, -); - -export const fetchPoll = createDataLoadingThunk( - 'poll/fetch', - ({ pollId }: { pollId: string }) => apiGetPoll(pollId), - async (poll, { dispatch }) => { - await dispatch(importFetchedPoll({ poll })); - }, -); diff --git a/app/javascript/mastodon/actions/push_notifications/registerer.js b/app/javascript/mastodon/actions/push_notifications/registerer.js index 647a6bd9fb..b3d3850e31 100644 --- a/app/javascript/mastodon/actions/push_notifications/registerer.js +++ b/app/javascript/mastodon/actions/push_notifications/registerer.js @@ -33,7 +33,7 @@ const unsubscribe = ({ registration, subscription }) => subscription ? subscription.unsubscribe().then(() => registration) : registration; const sendSubscriptionToBackend = (subscription) => { - const params = { subscription: { ...subscription.toJSON(), standard: true } }; + const params = { subscription }; if (me) { const data = pushNotificationsSetting.get(me); diff --git a/app/javascript/mastodon/actions/search.js b/app/javascript/mastodon/actions/search.js new file mode 100644 index 0000000000..bde17ae0db --- /dev/null +++ b/app/javascript/mastodon/actions/search.js @@ -0,0 +1,215 @@ +import { fromJS } from 'immutable'; + +import { searchHistory } from 'mastodon/settings'; + +import api from '../api'; + +import { fetchRelationships } from './accounts'; +import { importFetchedAccounts, importFetchedStatuses } from './importer'; + +export const SEARCH_CHANGE = 'SEARCH_CHANGE'; +export const SEARCH_CLEAR = 'SEARCH_CLEAR'; +export const SEARCH_SHOW = 'SEARCH_SHOW'; + +export const SEARCH_FETCH_REQUEST = 'SEARCH_FETCH_REQUEST'; +export const SEARCH_FETCH_SUCCESS = 'SEARCH_FETCH_SUCCESS'; +export const SEARCH_FETCH_FAIL = 'SEARCH_FETCH_FAIL'; + +export const SEARCH_EXPAND_REQUEST = 'SEARCH_EXPAND_REQUEST'; +export const SEARCH_EXPAND_SUCCESS = 'SEARCH_EXPAND_SUCCESS'; +export const SEARCH_EXPAND_FAIL = 'SEARCH_EXPAND_FAIL'; + +export const SEARCH_HISTORY_UPDATE = 'SEARCH_HISTORY_UPDATE'; + +export function changeSearch(value) { + return { + type: SEARCH_CHANGE, + value, + }; +} + +export function clearSearch() { + return { + type: SEARCH_CLEAR, + }; +} + +export function submitSearch(type) { + return (dispatch, getState) => { + const value = getState().getIn(['search', 'value']); + const signedIn = !!getState().getIn(['meta', 'me']); + + if (value.length === 0) { + dispatch(fetchSearchSuccess({ accounts: [], statuses: [], hashtags: [] }, '', type)); + return; + } + + dispatch(fetchSearchRequest(type)); + + api().get('/api/v2/search', { + params: { + q: value, + resolve: signedIn, + limit: 11, + type, + }, + }).then(response => { + if (response.data.accounts) { + dispatch(importFetchedAccounts(response.data.accounts)); + } + + if (response.data.statuses) { + dispatch(importFetchedStatuses(response.data.statuses)); + } + + dispatch(fetchSearchSuccess(response.data, value, type)); + dispatch(fetchRelationships(response.data.accounts.map(item => item.id))); + }).catch(error => { + dispatch(fetchSearchFail(error)); + }); + }; +} + +export function fetchSearchRequest(searchType) { + return { + type: SEARCH_FETCH_REQUEST, + searchType, + }; +} + +export function fetchSearchSuccess(results, searchTerm, searchType) { + return { + type: SEARCH_FETCH_SUCCESS, + results, + searchType, + searchTerm, + }; +} + +export function fetchSearchFail(error) { + return { + type: SEARCH_FETCH_FAIL, + error, + }; +} + +export const expandSearch = type => (dispatch, getState) => { + const value = getState().getIn(['search', 'value']); + const offset = getState().getIn(['search', 'results', type]).size - 1; + + dispatch(expandSearchRequest(type)); + + api().get('/api/v2/search', { + params: { + q: value, + type, + offset, + limit: 11, + }, + }).then(({ data }) => { + if (data.accounts) { + dispatch(importFetchedAccounts(data.accounts)); + } + + if (data.statuses) { + dispatch(importFetchedStatuses(data.statuses)); + } + + dispatch(expandSearchSuccess(data, value, type)); + dispatch(fetchRelationships(data.accounts.map(item => item.id))); + }).catch(error => { + dispatch(expandSearchFail(error)); + }); +}; + +export const expandSearchRequest = (searchType) => ({ + type: SEARCH_EXPAND_REQUEST, + searchType, +}); + +export const expandSearchSuccess = (results, searchTerm, searchType) => ({ + type: SEARCH_EXPAND_SUCCESS, + results, + searchTerm, + searchType, +}); + +export const expandSearchFail = error => ({ + type: SEARCH_EXPAND_FAIL, + error, +}); + +export const showSearch = () => ({ + type: SEARCH_SHOW, +}); + +export const openURL = (value, history, onFailure) => (dispatch, getState) => { + const signedIn = !!getState().getIn(['meta', 'me']); + + if (!signedIn) { + if (onFailure) { + onFailure(); + } + + return; + } + + dispatch(fetchSearchRequest()); + + api().get('/api/v2/search', { params: { q: value, resolve: true } }).then(response => { + if (response.data.accounts?.length > 0) { + dispatch(importFetchedAccounts(response.data.accounts)); + history.push(`/@${response.data.accounts[0].acct}`); + } else if (response.data.statuses?.length > 0) { + dispatch(importFetchedStatuses(response.data.statuses)); + history.push(`/@${response.data.statuses[0].account.acct}/${response.data.statuses[0].id}`); + } else if (onFailure) { + onFailure(); + } + + dispatch(fetchSearchSuccess(response.data, value)); + }).catch(err => { + dispatch(fetchSearchFail(err)); + + if (onFailure) { + onFailure(); + } + }); +}; + +export const clickSearchResult = (q, type) => (dispatch, getState) => { + const previous = getState().getIn(['search', 'recent']); + + if (previous.some(x => x.get('q') === q && x.get('type') === type)) { + return; + } + + const me = getState().getIn(['meta', 'me']); + const current = previous.add(fromJS({ type, q })).takeLast(4); + + searchHistory.set(me, current.toJS()); + dispatch(updateSearchHistory(current)); +}; + +export const forgetSearchResult = q => (dispatch, getState) => { + const previous = getState().getIn(['search', 'recent']); + const me = getState().getIn(['meta', 'me']); + const current = previous.filterNot(result => result.get('q') === q); + + searchHistory.set(me, current.toJS()); + dispatch(updateSearchHistory(current)); +}; + +export const updateSearchHistory = recent => ({ + type: SEARCH_HISTORY_UPDATE, + recent, +}); + +export const hydrateSearch = () => (dispatch, getState) => { + const me = getState().getIn(['meta', 'me']); + const history = searchHistory.get(me); + + if (history !== null) { + dispatch(updateSearchHistory(history)); + } +}; diff --git a/app/javascript/mastodon/actions/search.ts b/app/javascript/mastodon/actions/search.ts deleted file mode 100644 index 13a4ee4432..0000000000 --- a/app/javascript/mastodon/actions/search.ts +++ /dev/null @@ -1,148 +0,0 @@ -import { createAction } from '@reduxjs/toolkit'; - -import { apiGetSearch } from 'mastodon/api/search'; -import type { ApiSearchType } from 'mastodon/api_types/search'; -import type { - RecentSearch, - SearchType as RecentSearchType, -} from 'mastodon/models/search'; -import { searchHistory } from 'mastodon/settings'; -import { - createDataLoadingThunk, - createAppAsyncThunk, -} from 'mastodon/store/typed_functions'; - -import { fetchRelationships } from './accounts'; -import { importFetchedAccounts, importFetchedStatuses } from './importer'; - -export const SEARCH_HISTORY_UPDATE = 'SEARCH_HISTORY_UPDATE'; - -export const submitSearch = createDataLoadingThunk( - 'search/submit', - async ({ q, type }: { q: string; type?: ApiSearchType }, { getState }) => { - const signedIn = !!getState().meta.get('me'); - - return apiGetSearch({ - q, - type, - resolve: signedIn, - limit: 11, - }); - }, - (data, { dispatch }) => { - if (data.accounts.length > 0) { - dispatch(importFetchedAccounts(data.accounts)); - dispatch(fetchRelationships(data.accounts.map((account) => account.id))); - } - - if (data.statuses.length > 0) { - dispatch(importFetchedStatuses(data.statuses)); - } - - return data; - }, - { - useLoadingBar: false, - }, -); - -export const expandSearch = createDataLoadingThunk( - 'search/expand', - async ({ type }: { type: ApiSearchType }, { getState }) => { - const q = getState().search.q; - const results = getState().search.results; - const offset = results?.[type].length; - - return apiGetSearch({ - q, - type, - limit: 10, - offset, - }); - }, - (data, { dispatch }) => { - if (data.accounts.length > 0) { - dispatch(importFetchedAccounts(data.accounts)); - dispatch(fetchRelationships(data.accounts.map((account) => account.id))); - } - - if (data.statuses.length > 0) { - dispatch(importFetchedStatuses(data.statuses)); - } - - return data; - }, - { - useLoadingBar: true, - }, -); - -export const openURL = createDataLoadingThunk( - 'search/openURL', - ({ url }: { url: string }) => - apiGetSearch({ - q: url, - resolve: true, - limit: 1, - }), - (data, { dispatch }) => { - if (data.accounts.length > 0) { - dispatch(importFetchedAccounts(data.accounts)); - } else if (data.statuses.length > 0) { - dispatch(importFetchedStatuses(data.statuses)); - } - - return data; - }, - { - useLoadingBar: true, - }, -); - -export const clickSearchResult = createAppAsyncThunk( - 'search/clickResult', - ( - { q, type }: { q: string; type?: RecentSearchType }, - { dispatch, getState }, - ) => { - const previous = getState().search.recent; - - if (previous.some((x) => x.q === q && x.type === type)) { - return; - } - - const me = getState().meta.get('me') as string; - const current = [{ type, q }, ...previous].slice(0, 4); - - searchHistory.set(me, current); - dispatch(updateSearchHistory(current)); - }, -); - -export const forgetSearchResult = createAppAsyncThunk( - 'search/forgetResult', - (q: string, { dispatch, getState }) => { - const previous = getState().search.recent; - const me = getState().meta.get('me') as string; - const current = previous.filter((result) => result.q !== q); - - searchHistory.set(me, current); - dispatch(updateSearchHistory(current)); - }, -); - -export const updateSearchHistory = createAction( - 'search/updateHistory', -); - -export const hydrateSearch = createAppAsyncThunk( - 'search/hydrate', - (_args, { dispatch, getState }) => { - const me = getState().meta.get('me') as string; - const history = searchHistory.get(me) as RecentSearch[] | null; - - if (history !== null) { - dispatch(updateSearchHistory(history)); - } - }, -); diff --git a/app/javascript/mastodon/actions/settings.js b/app/javascript/mastodon/actions/settings.js index 7659fb5f98..fbd89f9d4b 100644 --- a/app/javascript/mastodon/actions/settings.js +++ b/app/javascript/mastodon/actions/settings.js @@ -29,7 +29,7 @@ const debouncedSave = debounce((dispatch, getState) => { api().put('/api/web/settings', { data }) .then(() => dispatch({ type: SETTING_SAVE })) .catch(error => dispatch(showAlertForError(error))); -}, 2000, { leading: true, trailing: true }); +}, 5000, { trailing: true }); export function saveSettings() { return (dispatch, getState) => debouncedSave(dispatch, getState); diff --git a/app/javascript/mastodon/actions/statuses.js b/app/javascript/mastodon/actions/statuses.js index 5064e65e7b..ec07f22957 100644 --- a/app/javascript/mastodon/actions/statuses.js +++ b/app/javascript/mastodon/actions/statuses.js @@ -1,9 +1,5 @@ -import { browserHistory } from 'mastodon/components/router'; -import { me } from 'mastodon/initial_state'; - import api from '../api'; -import { fetchRelationships } from './accounts'; import { ensureComposeIsVisible, setComposeToStatus } from './compose'; import { importFetchedStatus, importFetchedStatuses, importFetchedAccount } from './importer'; import { deleteFromTimelines } from './timelines'; @@ -53,13 +49,11 @@ export function fetchStatusRequest(id, skipLoading) { }; } -export function fetchStatus(id, forceFetch = false, alsoFetchContext = true) { +export function fetchStatus(id, forceFetch = false) { return (dispatch, getState) => { const skipLoading = !forceFetch && getState().getIn(['statuses', id], null) !== null; - if (alsoFetchContext) { - dispatch(fetchContext(id)); - } + dispatch(fetchContext(id)); if (skipLoading) { return; @@ -69,12 +63,6 @@ export function fetchStatus(id, forceFetch = false, alsoFetchContext = true) { api().get(`/api/v1/statuses/${id}`).then(response => { dispatch(importFetchedStatus(response.data)); - - const accountId = response.data.account.id; - if (me && !getState().getIn(['relationships', accountId])) { - dispatch(fetchRelationships([accountId])); - } - dispatch(fetchStatusSuccess(skipLoading)); }).catch(error => { dispatch(fetchStatusFail(id, error, skipLoading)); @@ -107,7 +95,7 @@ export function redraft(status, raw_text) { }; } -export const editStatus = (id) => (dispatch, getState) => { +export const editStatus = (id, routerHistory) => (dispatch, getState) => { let status = getState().getIn(['statuses', id]); if (status.get('poll')) { @@ -118,7 +106,7 @@ export const editStatus = (id) => (dispatch, getState) => { api().get(`/api/v1/statuses/${id}/source`).then(response => { dispatch(fetchStatusSourceSuccess()); - ensureComposeIsVisible(getState); + ensureComposeIsVisible(getState, routerHistory); dispatch(setComposeToStatus(status, response.data.text, response.data.spoiler_text)); }).catch(error => { dispatch(fetchStatusSourceFail(error)); @@ -138,7 +126,7 @@ export const fetchStatusSourceFail = error => ({ error, }); -export function deleteStatus(id, withRedraft = false) { +export function deleteStatus(id, routerHistory, withRedraft = false) { return (dispatch, getState) => { let status = getState().getIn(['statuses', id]); @@ -148,14 +136,14 @@ export function deleteStatus(id, withRedraft = false) { dispatch(deleteStatusRequest(id)); - api().delete(`/api/v1/statuses/${id}`, { params: { delete_media: !withRedraft } }).then(response => { + api().delete(`/api/v1/statuses/${id}`).then(response => { dispatch(deleteStatusSuccess(id)); dispatch(deleteFromTimelines(id)); dispatch(importFetchedAccount(response.data.account)); if (withRedraft) { dispatch(redraft(status, response.data.text)); - ensureComposeIsVisible(getState); + ensureComposeIsVisible(getState, routerHistory); } }).catch(error => { dispatch(deleteStatusFail(id, error)); @@ -323,21 +311,6 @@ export function revealStatus(ids) { }; } -export function toggleStatusSpoilers(statusId) { - return (dispatch, getState) => { - const status = getState().statuses.get(statusId); - - if (!status) - return; - - if (status.get('hidden')) { - dispatch(revealStatus(statusId)); - } else { - dispatch(hideStatus(statusId)); - } - }; -} - export function toggleStatusCollapse(id, isCollapsed) { return { type: STATUS_COLLAPSE, @@ -383,15 +356,3 @@ export const updateEmojiReaction = (emoji_reaction) => ({ type: STATUS_EMOJI_REACTION_UPDATE, emoji_reaction, }); - -export const navigateToStatus = (statusId) => { - return (_dispatch, getState) => { - const state = getState(); - const accountId = state.statuses.getIn([statusId, 'account']); - const acct = state.accounts.getIn([accountId, 'acct']); - - if (acct) { - browserHistory.push(`/@${acct}/${statusId}`); - } - }; -}; diff --git a/app/javascript/mastodon/actions/store.js b/app/javascript/mastodon/actions/store.js index e8fec13453..8ab75cdc44 100644 --- a/app/javascript/mastodon/actions/store.js +++ b/app/javascript/mastodon/actions/store.js @@ -1,4 +1,4 @@ -import { fromJS, isIndexed } from 'immutable'; +import { Iterable, fromJS } from 'immutable'; import { hydrateCompose } from './compose'; import { importFetchedAccounts } from './importer'; @@ -9,7 +9,8 @@ export const STORE_HYDRATE_LAZY = 'STORE_HYDRATE_LAZY'; const convertState = rawState => fromJS(rawState, (k, v) => - isIndexed(v) ? v.toList() : v.toMap()); + Iterable.isIndexed(v) ? v.toList() : v.toMap()); + export function hydrateStore(rawState) { return dispatch => { diff --git a/app/javascript/mastodon/actions/streaming.js b/app/javascript/mastodon/actions/streaming.js index f9d784c2b4..9d87bb3286 100644 --- a/app/javascript/mastodon/actions/streaming.js +++ b/app/javascript/mastodon/actions/streaming.js @@ -10,8 +10,7 @@ import { deleteAnnouncement, } from './announcements'; import { updateConversations } from './conversations'; -import { processNewNotificationForGroups, refreshStaleNotificationGroups, pollRecentNotifications as pollRecentGroupNotifications } from './notification_groups'; -import { updateNotifications, updateEmojiReactions } from './notifications'; +import { updateNotifications, expandNotifications, updateEmojiReactions } from './notifications'; import { updateStatus } from './statuses'; import { updateTimeline, @@ -38,7 +37,7 @@ const randomUpTo = max => * @param {string} channelName * @param {Object.} params * @param {Object} options - * @param {function(Function, Function): Promise} [options.fallback] + * @param {function(Function, Function): void} [options.fallback] * @param {function(): void} [options.fillGaps] * @param {function(object): boolean} [options.accept] * @returns {function(): void} @@ -53,13 +52,14 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti let pollingId; /** - * @param {function(Function, Function): Promise} fallback + * @param {function(Function, Function): void} fallback */ - const useFallback = async fallback => { - await fallback(dispatch, getState); - // eslint-disable-next-line react-hooks/rules-of-hooks -- this is not a react hook - pollingId = setTimeout(() => useFallback(fallback), 20000 + randomUpTo(20000)); + const useFallback = fallback => { + fallback(dispatch, () => { + // eslint-disable-next-line react-hooks/rules-of-hooks -- this is not a react hook + pollingId = setTimeout(() => useFallback(fallback), 20000 + randomUpTo(20000)); + }); }; return { @@ -99,22 +99,14 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti case 'delete': dispatch(deleteFromTimelines(data.payload)); break; - case 'notification': { + case 'notification': // @ts-expect-error - const notificationJSON = JSON.parse(data.payload); - dispatch(updateNotifications(notificationJSON, messages, locale)); - // TODO: remove this once the groups feature replaces the previous one - dispatch(processNewNotificationForGroups(notificationJSON)); + dispatch(updateNotifications(JSON.parse(data.payload), messages, locale)); break; - } case 'emoji_reaction': // @ts-expect-error dispatch(updateEmojiReactions(JSON.parse(data.payload))); break; - case 'notifications_merged': { - dispatch(refreshStaleNotificationGroups()); - break; - } case 'conversation': // @ts-expect-error dispatch(updateConversations(JSON.parse(data.payload))); @@ -138,24 +130,21 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti /** * @param {Function} dispatch + * @param {function(): void} done */ -async function refreshHomeTimelineAndNotification(dispatch) { - await dispatch(expandHomeTimeline({ maxId: undefined })); - - // TODO: polling for merged notifications - try { - await dispatch(pollRecentGroupNotifications()); - } catch { - // TODO - } - - await dispatch(fetchAnnouncements()); -} +const refreshHomeTimelineAndNotification = (dispatch, done) => { + // @ts-expect-error + dispatch(expandHomeTimeline({}, () => + // @ts-expect-error + dispatch(expandNotifications({}, () => + dispatch(fetchAnnouncements(done)))))); +}; /** * @returns {function(): void} */ export const connectUserStream = () => + // @ts-expect-error connectTimelineStream('home', 'user', {}, { fallback: refreshHomeTimelineAndNotification, fillGaps: fillHomeTimelineGaps }); /** diff --git a/app/javascript/mastodon/actions/suggestions.js b/app/javascript/mastodon/actions/suggestions.js new file mode 100644 index 0000000000..258ffa901d --- /dev/null +++ b/app/javascript/mastodon/actions/suggestions.js @@ -0,0 +1,58 @@ +import api from '../api'; + +import { fetchRelationships } from './accounts'; +import { importFetchedAccounts } from './importer'; + +export const SUGGESTIONS_FETCH_REQUEST = 'SUGGESTIONS_FETCH_REQUEST'; +export const SUGGESTIONS_FETCH_SUCCESS = 'SUGGESTIONS_FETCH_SUCCESS'; +export const SUGGESTIONS_FETCH_FAIL = 'SUGGESTIONS_FETCH_FAIL'; + +export const SUGGESTIONS_DISMISS = 'SUGGESTIONS_DISMISS'; + +export function fetchSuggestions(withRelationships = false) { + return (dispatch) => { + dispatch(fetchSuggestionsRequest()); + + api().get('/api/v2/suggestions', { params: { limit: 20 } }).then(response => { + dispatch(importFetchedAccounts(response.data.map(x => x.account))); + dispatch(fetchSuggestionsSuccess(response.data)); + + if (withRelationships) { + dispatch(fetchRelationships(response.data.map(item => item.account.id))); + } + }).catch(error => dispatch(fetchSuggestionsFail(error))); + }; +} + +export function fetchSuggestionsRequest() { + return { + type: SUGGESTIONS_FETCH_REQUEST, + skipLoading: true, + }; +} + +export function fetchSuggestionsSuccess(suggestions) { + return { + type: SUGGESTIONS_FETCH_SUCCESS, + suggestions, + skipLoading: true, + }; +} + +export function fetchSuggestionsFail(error) { + return { + type: SUGGESTIONS_FETCH_FAIL, + error, + skipLoading: true, + skipAlert: true, + }; +} + +export const dismissSuggestion = accountId => (dispatch) => { + dispatch({ + type: SUGGESTIONS_DISMISS, + id: accountId, + }); + + api().delete(`/api/v1/suggestions/${accountId}`).catch(() => {}); +}; diff --git a/app/javascript/mastodon/actions/suggestions.ts b/app/javascript/mastodon/actions/suggestions.ts deleted file mode 100644 index 0eadfa6b47..0000000000 --- a/app/javascript/mastodon/actions/suggestions.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { - apiGetSuggestions, - apiDeleteSuggestion, -} from 'mastodon/api/suggestions'; -import { createDataLoadingThunk } from 'mastodon/store/typed_functions'; - -import { fetchRelationships } from './accounts'; -import { importFetchedAccounts } from './importer'; - -export const fetchSuggestions = createDataLoadingThunk( - 'suggestions/fetch', - () => apiGetSuggestions(20), - (data, { dispatch }) => { - dispatch(importFetchedAccounts(data.map((x) => x.account))); - dispatch(fetchRelationships(data.map((x) => x.account.id))); - - return data; - }, -); - -export const dismissSuggestion = createDataLoadingThunk( - 'suggestions/dismiss', - ({ accountId }: { accountId: string }) => apiDeleteSuggestion(accountId), -); diff --git a/app/javascript/mastodon/actions/tags.js b/app/javascript/mastodon/actions/tags.js new file mode 100644 index 0000000000..d18d7e514f --- /dev/null +++ b/app/javascript/mastodon/actions/tags.js @@ -0,0 +1,172 @@ +import api, { getLinks } from '../api'; + +export const HASHTAG_FETCH_REQUEST = 'HASHTAG_FETCH_REQUEST'; +export const HASHTAG_FETCH_SUCCESS = 'HASHTAG_FETCH_SUCCESS'; +export const HASHTAG_FETCH_FAIL = 'HASHTAG_FETCH_FAIL'; + +export const FOLLOWED_HASHTAGS_FETCH_REQUEST = 'FOLLOWED_HASHTAGS_FETCH_REQUEST'; +export const FOLLOWED_HASHTAGS_FETCH_SUCCESS = 'FOLLOWED_HASHTAGS_FETCH_SUCCESS'; +export const FOLLOWED_HASHTAGS_FETCH_FAIL = 'FOLLOWED_HASHTAGS_FETCH_FAIL'; + +export const FOLLOWED_HASHTAGS_EXPAND_REQUEST = 'FOLLOWED_HASHTAGS_EXPAND_REQUEST'; +export const FOLLOWED_HASHTAGS_EXPAND_SUCCESS = 'FOLLOWED_HASHTAGS_EXPAND_SUCCESS'; +export const FOLLOWED_HASHTAGS_EXPAND_FAIL = 'FOLLOWED_HASHTAGS_EXPAND_FAIL'; + +export const HASHTAG_FOLLOW_REQUEST = 'HASHTAG_FOLLOW_REQUEST'; +export const HASHTAG_FOLLOW_SUCCESS = 'HASHTAG_FOLLOW_SUCCESS'; +export const HASHTAG_FOLLOW_FAIL = 'HASHTAG_FOLLOW_FAIL'; + +export const HASHTAG_UNFOLLOW_REQUEST = 'HASHTAG_UNFOLLOW_REQUEST'; +export const HASHTAG_UNFOLLOW_SUCCESS = 'HASHTAG_UNFOLLOW_SUCCESS'; +export const HASHTAG_UNFOLLOW_FAIL = 'HASHTAG_UNFOLLOW_FAIL'; + +export const fetchHashtag = name => (dispatch) => { + dispatch(fetchHashtagRequest()); + + api().get(`/api/v1/tags/${name}`).then(({ data }) => { + dispatch(fetchHashtagSuccess(name, data)); + }).catch(err => { + dispatch(fetchHashtagFail(err)); + }); +}; + +export const fetchHashtagRequest = () => ({ + type: HASHTAG_FETCH_REQUEST, +}); + +export const fetchHashtagSuccess = (name, tag) => ({ + type: HASHTAG_FETCH_SUCCESS, + name, + tag, +}); + +export const fetchHashtagFail = error => ({ + type: HASHTAG_FETCH_FAIL, + error, +}); + +export const fetchFollowedHashtags = () => (dispatch) => { + dispatch(fetchFollowedHashtagsRequest()); + + api().get('/api/v1/followed_tags').then(response => { + const next = getLinks(response).refs.find(link => link.rel === 'next'); + dispatch(fetchFollowedHashtagsSuccess(response.data, next ? next.uri : null)); + }).catch(err => { + dispatch(fetchFollowedHashtagsFail(err)); + }); +}; + +export function fetchFollowedHashtagsRequest() { + return { + type: FOLLOWED_HASHTAGS_FETCH_REQUEST, + }; +} + +export function fetchFollowedHashtagsSuccess(followed_tags, next) { + return { + type: FOLLOWED_HASHTAGS_FETCH_SUCCESS, + followed_tags, + next, + }; +} + +export function fetchFollowedHashtagsFail(error) { + return { + type: FOLLOWED_HASHTAGS_FETCH_FAIL, + error, + }; +} + +export function expandFollowedHashtags() { + return (dispatch, getState) => { + const url = getState().getIn(['followed_tags', 'next']); + + if (url === null) { + return; + } + + dispatch(expandFollowedHashtagsRequest()); + + api().get(url).then(response => { + const next = getLinks(response).refs.find(link => link.rel === 'next'); + dispatch(expandFollowedHashtagsSuccess(response.data, next ? next.uri : null)); + }).catch(error => { + dispatch(expandFollowedHashtagsFail(error)); + }); + }; +} + +export function expandFollowedHashtagsRequest() { + return { + type: FOLLOWED_HASHTAGS_EXPAND_REQUEST, + }; +} + +export function expandFollowedHashtagsSuccess(followed_tags, next) { + return { + type: FOLLOWED_HASHTAGS_EXPAND_SUCCESS, + followed_tags, + next, + }; +} + +export function expandFollowedHashtagsFail(error) { + return { + type: FOLLOWED_HASHTAGS_EXPAND_FAIL, + error, + }; +} + +export const followHashtag = name => (dispatch) => { + dispatch(followHashtagRequest(name)); + + api().post(`/api/v1/tags/${name}/follow`).then(({ data }) => { + dispatch(followHashtagSuccess(name, data)); + }).catch(err => { + dispatch(followHashtagFail(name, err)); + }); +}; + +export const followHashtagRequest = name => ({ + type: HASHTAG_FOLLOW_REQUEST, + name, +}); + +export const followHashtagSuccess = (name, tag) => ({ + type: HASHTAG_FOLLOW_SUCCESS, + name, + tag, +}); + +export const followHashtagFail = (name, error) => ({ + type: HASHTAG_FOLLOW_FAIL, + name, + error, +}); + +export const unfollowHashtag = name => (dispatch) => { + dispatch(unfollowHashtagRequest(name)); + + api().post(`/api/v1/tags/${name}/unfollow`).then(({ data }) => { + dispatch(unfollowHashtagSuccess(name, data)); + }).catch(err => { + dispatch(unfollowHashtagFail(name, err)); + }); +}; + +export const unfollowHashtagRequest = name => ({ + type: HASHTAG_UNFOLLOW_REQUEST, + name, +}); + +export const unfollowHashtagSuccess = (name, tag) => ({ + type: HASHTAG_UNFOLLOW_SUCCESS, + name, + tag, +}); + +export const unfollowHashtagFail = (name, error) => ({ + type: HASHTAG_UNFOLLOW_FAIL, + name, + error, +}); diff --git a/app/javascript/mastodon/actions/tags_typed.ts b/app/javascript/mastodon/actions/tags_typed.ts deleted file mode 100644 index 6dca32fd84..0000000000 --- a/app/javascript/mastodon/actions/tags_typed.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { apiGetTag, apiFollowTag, apiUnfollowTag } from 'mastodon/api/tags'; -import { createDataLoadingThunk } from 'mastodon/store/typed_functions'; - -export const fetchHashtag = createDataLoadingThunk( - 'tags/fetch', - ({ tagId }: { tagId: string }) => apiGetTag(tagId), -); - -export const followHashtag = createDataLoadingThunk( - 'tags/follow', - ({ tagId }: { tagId: string }) => apiFollowTag(tagId), -); - -export const unfollowHashtag = createDataLoadingThunk( - 'tags/unfollow', - ({ tagId }: { tagId: string }) => apiUnfollowTag(tagId), -); diff --git a/app/javascript/mastodon/actions/timelines.js b/app/javascript/mastodon/actions/timelines.js index 740e893a57..6f3971a4f1 100644 --- a/app/javascript/mastodon/actions/timelines.js +++ b/app/javascript/mastodon/actions/timelines.js @@ -76,18 +76,21 @@ export function clearTimeline(timeline) { }; } +const noOp = () => {}; + const parseTags = (tags = {}, mode) => { return (tags[mode] || []).map((tag) => { return tag.value; }); }; -export function expandTimeline(timelineId, path, params = {}) { - return async (dispatch, getState) => { +export function expandTimeline(timelineId, path, params = {}, done = noOp) { + return (dispatch, getState) => { const timeline = getState().getIn(['timelines', timelineId], ImmutableMap()); const isLoadingMore = !!params.max_id; if (timeline.get('isLoading')) { + done(); return; } @@ -106,8 +109,7 @@ export function expandTimeline(timelineId, path, params = {}) { dispatch(expandTimelineRequest(timelineId, isLoadingMore)); - try { - const response = await api().get(path, { params }); + api().get(path, { params }).then(response => { const next = getLinks(response).refs.find(link => link.rel === 'next'); dispatch(importFetchedStatuses(response.data)); @@ -125,50 +127,54 @@ export function expandTimeline(timelineId, path, params = {}) { if (timelineId === 'home') { dispatch(submitMarkers()); } - } catch(error) { + }).catch(error => { dispatch(expandTimelineFail(timelineId, error, isLoadingMore)); - } + }).finally(() => { + done(); + }); }; } -export function fillTimelineGaps(timelineId, path, params = {}) { - return async (dispatch, getState) => { +export function fillTimelineGaps(timelineId, path, params = {}, done = noOp) { + return (dispatch, getState) => { const timeline = getState().getIn(['timelines', timelineId], ImmutableMap()); const items = timeline.get('items'); const nullIndexes = items.map((statusId, index) => statusId === null ? index : null); const gaps = nullIndexes.map(index => index > 0 ? items.get(index - 1) : null); // Only expand at most two gaps to avoid doing too many requests - for (const maxId of gaps.take(2)) { - await dispatch(expandTimeline(timelineId, path, { ...params, maxId })); - } + done = gaps.take(2).reduce((done, maxId) => { + return (() => dispatch(expandTimeline(timelineId, path, { ...params, maxId }, done))); + }, done); + + done(); }; } -export const expandHomeTimeline = ({ maxId } = {}) => expandTimeline('home', '/api/v1/timelines/home', { max_id: maxId }); -export const expandPublicTimeline = ({ maxId, onlyMedia, onlyRemote } = {}) => expandTimeline(`public${onlyRemote ? ':remote' : ''}${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { remote: !!onlyRemote, max_id: maxId, only_media: !!onlyMedia }); -export const expandCommunityTimeline = ({ maxId, onlyMedia } = {}) => expandTimeline(`community${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { local: true, max_id: maxId, only_media: !!onlyMedia }); +export const expandHomeTimeline = ({ maxId } = {}, done = noOp) => expandTimeline('home', '/api/v1/timelines/home', { max_id: maxId }, done); +export const expandPublicTimeline = ({ maxId, onlyMedia, onlyRemote } = {}, done = noOp) => expandTimeline(`public${onlyRemote ? ':remote' : ''}${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { remote: !!onlyRemote, max_id: maxId, only_media: !!onlyMedia }, done); +export const expandCommunityTimeline = ({ maxId, onlyMedia } = {}, done = noOp) => expandTimeline(`community${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { local: true, max_id: maxId, only_media: !!onlyMedia }, done); export const expandAccountTimeline = (accountId, { maxId, withReplies, tagged } = {}) => expandTimeline(`account:${accountId}${withReplies ? ':with_replies' : ''}${tagged ? `:${tagged}` : ''}`, `/api/v1/accounts/${accountId}/statuses`, { exclude_replies: !withReplies, exclude_reblogs: withReplies, tagged, max_id: maxId }); export const expandAccountFeaturedTimeline = (accountId, { tagged } = {}) => expandTimeline(`account:${accountId}:pinned${tagged ? `:${tagged}` : ''}`, `/api/v1/accounts/${accountId}/statuses`, { pinned: true, tagged }); export const expandAccountMediaTimeline = (accountId, { maxId } = {}) => expandTimeline(`account:${accountId}:media`, `/api/v1/accounts/${accountId}/statuses`, { max_id: maxId, only_media: true, limit: 40 }); -export const expandListTimeline = (id, { maxId } = {}) => expandTimeline(`list:${id}`, `/api/v1/timelines/list/${id}`, { max_id: maxId }); -export const expandAntennaTimeline = (id, { maxId } = {}) => expandTimeline(`antenna:${id}`, `/api/v1/timelines/antenna/${id}`, { max_id: maxId }); -export const expandLinkTimeline = (url, { maxId } = {}) => expandTimeline(`link:${url}`, `/api/v1/timelines/link`, { url, max_id: maxId }); -export const expandHashtagTimeline = (hashtag, { maxId, tags, local } = {}) => { +export const expandListTimeline = (id, { maxId } = {}, done = noOp) => expandTimeline(`list:${id}`, `/api/v1/timelines/list/${id}`, { max_id: maxId }, done); +export const expandAntennaTimeline = (id, { maxId } = {}, done = noOp) => expandTimeline(`antenna:${id}`, `/api/v1/timelines/antenna/${id}`, { max_id: maxId }, done); +export const expandLinkTimeline = (url, { maxId } = {}, done = noOp) => expandTimeline(`link:${url}`, `/api/v1/timelines/link`, { url, max_id: maxId }, done); +export const expandHashtagTimeline = (hashtag, { maxId, tags, local } = {}, done = noOp) => { return expandTimeline(`hashtag:${hashtag}${local ? ':local' : ''}`, `/api/v1/timelines/tag/${hashtag}`, { max_id: maxId, any: parseTags(tags, 'any'), all: parseTags(tags, 'all'), none: parseTags(tags, 'none'), local: local, - }); + }, done); }; -export const fillHomeTimelineGaps = () => fillTimelineGaps('home', '/api/v1/timelines/home', {}); -export const fillPublicTimelineGaps = ({ onlyMedia, onlyRemote } = {}) => fillTimelineGaps(`public${onlyRemote ? ':remote' : ''}${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { remote: !!onlyRemote, only_media: !!onlyMedia }); -export const fillCommunityTimelineGaps = ({ onlyMedia } = {}) => fillTimelineGaps(`community${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { local: true, only_media: !!onlyMedia }); -export const fillListTimelineGaps = (id) => fillTimelineGaps(`list:${id}`, `/api/v1/timelines/list/${id}`, {}); -export const fillAntennaTimelineGaps = (id) => fillTimelineGaps(`antenna:${id}`, `/api/v1/timelines/antenna/${id}`, {}); +export const fillHomeTimelineGaps = (done = noOp) => fillTimelineGaps('home', '/api/v1/timelines/home', {}, done); +export const fillPublicTimelineGaps = ({ onlyMedia, onlyRemote } = {}, done = noOp) => fillTimelineGaps(`public${onlyRemote ? ':remote' : ''}${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { remote: !!onlyRemote, only_media: !!onlyMedia }, done); +export const fillCommunityTimelineGaps = ({ onlyMedia } = {}, done = noOp) => fillTimelineGaps(`community${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { local: true, only_media: !!onlyMedia }, done); +export const fillListTimelineGaps = (id, done = noOp) => fillTimelineGaps(`list:${id}`, `/api/v1/timelines/list/${id}`, {}, done); +export const fillAntennaTimelineGaps = (id, done = noOp) => fillTimelineGaps(`antenna:${id}`, `/api/v1/timelines/antenna/${id}`, {}, done); export function expandTimelineRequest(timeline, isLoadingMore) { return { diff --git a/app/javascript/mastodon/api.ts b/app/javascript/mastodon/api.ts index a41b058d2c..24672290c7 100644 --- a/app/javascript/mastodon/api.ts +++ b/app/javascript/mastodon/api.ts @@ -1,9 +1,4 @@ -import type { - AxiosError, - AxiosResponse, - Method, - RawAxiosRequestHeaders, -} from 'axios'; +import type { AxiosResponse, Method, RawAxiosRequestHeaders } from 'axios'; import axios from 'axios'; import LinkHeader from 'http-link-header'; @@ -46,10 +41,7 @@ const authorizationTokenFromInitialState = (): RawAxiosRequestHeaders => { // eslint-disable-next-line import/no-default-export export default function api(withAuthorization = true) { - const instance = axios.create({ - transitional: { - clarifyTimeoutError: true, - }, + return axios.create({ headers: { ...csrfHeader, ...(withAuthorization ? authorizationTokenFromInitialState() : {}), @@ -65,22 +57,6 @@ export default function api(withAuthorization = true) { }, ], }); - - instance.interceptors.response.use( - (response: AxiosResponse) => { - if (response.headers.deprecation) { - console.warn( - `Deprecated request: ${response.config.method} ${response.config.url}`, - ); - } - return response; - }, - (error: AxiosError) => { - return Promise.reject(error); - }, - ); - - return instance; } type RequestParamsOrData = Record; @@ -89,10 +65,8 @@ export async function apiRequest( method: Method, url: string, args: { - signal?: AbortSignal; params?: RequestParamsOrData; data?: RequestParamsOrData; - timeout?: number; } = {}, ) { const { data } = await api().request({ diff --git a/app/javascript/mastodon/api/accounts.ts b/app/javascript/mastodon/api/accounts.ts index 717010ba74..bd1757e827 100644 --- a/app/javascript/mastodon/api/accounts.ts +++ b/app/javascript/mastodon/api/accounts.ts @@ -5,16 +5,3 @@ export const apiSubmitAccountNote = (id: string, value: string) => apiRequestPost(`v1/accounts/${id}/note`, { comment: value, }); - -export const apiFollowAccount = ( - id: string, - params?: { - reblogs: boolean; - }, -) => - apiRequestPost(`v1/accounts/${id}/follow`, { - ...params, - }); - -export const apiUnfollowAccount = (id: string) => - apiRequestPost(`v1/accounts/${id}/unfollow`); diff --git a/app/javascript/mastodon/api/antennas.ts b/app/javascript/mastodon/api/antennas.ts deleted file mode 100644 index 61fd84185d..0000000000 --- a/app/javascript/mastodon/api/antennas.ts +++ /dev/null @@ -1,143 +0,0 @@ -import { - apiRequestPost, - apiRequestPut, - apiRequestGet, - apiRequestDelete, -} from 'mastodon/api'; -import type { ApiAccountJSON } from 'mastodon/api_types/accounts'; -import type { ApiAntennaJSON } from 'mastodon/api_types/antennas'; - -export const apiCreate = (antenna: Partial) => - apiRequestPost('v1/antennas', antenna); - -export const apiUpdate = (antenna: Partial) => - apiRequestPut(`v1/antennas/${antenna.id}`, antenna); - -export const apiGetAccounts = (antennaId: string) => - apiRequestGet(`v1/antennas/${antennaId}/accounts`, { - limit: 0, - }); - -export const apiGetExcludeAccounts = (antennaId: string) => - apiRequestGet(`v1/antennas/${antennaId}/exclude_accounts`, { - limit: 0, - }); - -export const apiGetDomains = (antennaId: string) => - apiRequestGet<{ domains: string[]; exclude_domains: string[] }>( - `v1/antennas/${antennaId}/domains`, - { - limit: 0, - }, - ); - -export const apiAddDomain = (antennaId: string, domain: string) => - apiRequestPost(`v1/antennas/${antennaId}/domains`, { - domains: [domain], - }); - -export const apiRemoveDomain = (antennaId: string, domain: string) => - apiRequestDelete(`v1/antennas/${antennaId}/domains`, { - domains: [domain], - }); - -export const apiAddExcludeDomain = (antennaId: string, domain: string) => - apiRequestPost(`v1/antennas/${antennaId}/exclude_domains`, { - domains: [domain], - }); - -export const apiRemoveExcludeDomain = (antennaId: string, domain: string) => - apiRequestDelete(`v1/antennas/${antennaId}/exclude_domains`, { - domains: [domain], - }); - -export const apiGetTags = (antennaId: string) => - apiRequestGet<{ tags: string[]; exclude_tags: string[] }>( - `v1/antennas/${antennaId}/tags`, - { - limit: 0, - }, - ); - -export const apiAddTag = (antennaId: string, tag: string) => - apiRequestPost(`v1/antennas/${antennaId}/tags`, { - tags: [tag], - }); - -export const apiRemoveTag = (antennaId: string, tag: string) => - apiRequestDelete(`v1/antennas/${antennaId}/tags`, { - tags: [tag], - }); - -export const apiAddExcludeTag = (antennaId: string, tag: string) => - apiRequestPost(`v1/antennas/${antennaId}/exclude_tags`, { - tags: [tag], - }); - -export const apiRemoveExcludeTag = (antennaId: string, tag: string) => - apiRequestDelete(`v1/antennas/${antennaId}/exclude_tags`, { - tags: [tag], - }); - -export const apiGetKeywords = (antennaId: string) => - apiRequestGet<{ keywords: string[]; exclude_keywords: string[] }>( - `v1/antennas/${antennaId}/keywords`, - { - limit: 0, - }, - ); - -export const apiAddKeyword = (antennaId: string, keyword: string) => - apiRequestPost(`v1/antennas/${antennaId}/keywords`, { - keywords: [keyword], - }); - -export const apiRemoveKeyword = (antennaId: string, keyword: string) => - apiRequestDelete(`v1/antennas/${antennaId}/keywords`, { - keywords: [keyword], - }); - -export const apiAddExcludeKeyword = (antennaId: string, keyword: string) => - apiRequestPost(`v1/antennas/${antennaId}/exclude_keywords`, { - keywords: [keyword], - }); - -export const apiRemoveExcludeKeyword = (antennaId: string, keyword: string) => - apiRequestDelete(`v1/antennas/${antennaId}/exclude_keywords`, { - keywords: [keyword], - }); - -export const apiGetAccountAntennas = (accountId: string) => - apiRequestGet(`v1/accounts/${accountId}/antennas`); - -export const apiAddAccountToAntenna = (antennaId: string, accountId: string) => - apiRequestPost(`v1/antennas/${antennaId}/accounts`, { - account_ids: [accountId], - }); - -export const apiRemoveAccountFromAntenna = ( - antennaId: string, - accountId: string, -) => - apiRequestDelete(`v1/antennas/${antennaId}/accounts`, { - account_ids: [accountId], - }); - -export const apiGetExcludeAccountAntennas = (accountId: string) => - apiRequestGet(`v1/accounts/${accountId}/exclude_antennas`); - -export const apiAddExcludeAccountToAntenna = ( - antennaId: string, - accountId: string, -) => - apiRequestPost(`v1/antennas/${antennaId}/exclude_accounts`, { - account_ids: [accountId], - }); - -export const apiRemoveExcludeAccountFromAntenna = ( - antennaId: string, - accountId: string, -) => - apiRequestDelete(`v1/antennas/${antennaId}/exclude_accounts`, { - account_ids: [accountId], - }); diff --git a/app/javascript/mastodon/api/bookmark_categories.ts b/app/javascript/mastodon/api/bookmark_categories.ts deleted file mode 100644 index d6d3394b3a..0000000000 --- a/app/javascript/mastodon/api/bookmark_categories.ts +++ /dev/null @@ -1,49 +0,0 @@ -import { - apiRequestPost, - apiRequestPut, - apiRequestGet, - apiRequestDelete, -} from 'mastodon/api'; -import type { ApiAccountJSON } from 'mastodon/api_types/accounts'; -import type { ApiBookmarkCategoryJSON } from 'mastodon/api_types/bookmark_categories'; - -export const apiCreate = (bookmarkCategory: Partial) => - apiRequestPost( - 'v1/bookmark_categories', - bookmarkCategory, - ); - -export const apiUpdate = (bookmarkCategory: Partial) => - apiRequestPut( - `v1/bookmark_categories/${bookmarkCategory.id}`, - bookmarkCategory, - ); - -export const apiGetStatuses = (bookmarkCategoryId: string) => - apiRequestGet( - `v1/bookmark_categories/${bookmarkCategoryId}/statuses`, - { - limit: 0, - }, - ); - -export const apiGetStatusBookmarkCategories = (accountId: string) => - apiRequestGet( - `v1/statuses/${accountId}/bookmark_categories`, - ); - -export const apiAddStatusToBookmarkCategory = ( - bookmarkCategoryId: string, - statusId: string, -) => - apiRequestPost(`v1/bookmark_categories/${bookmarkCategoryId}/statuses`, { - status_ids: [statusId], - }); - -export const apiRemoveStatusFromBookmarkCategory = ( - bookmarkCategoryId: string, - statusId: string, -) => - apiRequestDelete(`v1/bookmark_categories/${bookmarkCategoryId}/statuses`, { - status_ids: [statusId], - }); diff --git a/app/javascript/mastodon/api/circles.ts b/app/javascript/mastodon/api/circles.ts deleted file mode 100644 index 04971e1e6b..0000000000 --- a/app/javascript/mastodon/api/circles.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { - apiRequestPost, - apiRequestPut, - apiRequestGet, - apiRequestDelete, -} from 'mastodon/api'; -import type { ApiAccountJSON } from 'mastodon/api_types/accounts'; -import type { ApiCircleJSON } from 'mastodon/api_types/circles'; - -export const apiCreate = (circle: Partial) => - apiRequestPost('v1/circles', circle); - -export const apiUpdate = (circle: Partial) => - apiRequestPut(`v1/circles/${circle.id}`, circle); - -export const apiGetAccounts = (circleId: string) => - apiRequestGet(`v1/circles/${circleId}/accounts`, { - limit: 0, - }); - -export const apiGetAccountCircles = (accountId: string) => - apiRequestGet(`v1/accounts/${accountId}/circles`); - -export const apiAddAccountToCircle = (circleId: string, accountId: string) => - apiRequestPost(`v1/circles/${circleId}/accounts`, { - account_ids: [accountId], - }); - -export const apiRemoveAccountFromCircle = ( - circleId: string, - accountId: string, -) => - apiRequestDelete(`v1/circles/${circleId}/accounts`, { - account_ids: [accountId], - }); diff --git a/app/javascript/mastodon/api/compose.ts b/app/javascript/mastodon/api/compose.ts deleted file mode 100644 index 757e9961c9..0000000000 --- a/app/javascript/mastodon/api/compose.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { apiRequestPut } from 'mastodon/api'; -import type { ApiMediaAttachmentJSON } from 'mastodon/api_types/media_attachments'; - -export const apiUpdateMedia = ( - id: string, - params?: { description?: string; focus?: string }, -) => apiRequestPut(`v1/media/${id}`, params); diff --git a/app/javascript/mastodon/api/domain_blocks.ts b/app/javascript/mastodon/api/domain_blocks.ts deleted file mode 100644 index 4e153b0ee9..0000000000 --- a/app/javascript/mastodon/api/domain_blocks.ts +++ /dev/null @@ -1,13 +0,0 @@ -import api, { getLinks } from 'mastodon/api'; - -export const apiGetDomainBlocks = async (url?: string) => { - const response = await api().request({ - method: 'GET', - url: url ?? '/api/v1/domain_blocks', - }); - - return { - domains: response.data, - links: getLinks(response), - }; -}; diff --git a/app/javascript/mastodon/api/instance.ts b/app/javascript/mastodon/api/instance.ts deleted file mode 100644 index 764e8daab2..0000000000 --- a/app/javascript/mastodon/api/instance.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { apiRequestGet } from 'mastodon/api'; -import type { - ApiTermsOfServiceJSON, - ApiPrivacyPolicyJSON, -} from 'mastodon/api_types/instance'; - -export const apiGetTermsOfService = (version?: string) => - apiRequestGet( - version - ? `v1/instance/terms_of_service/${version}` - : 'v1/instance/terms_of_service', - ); - -export const apiGetPrivacyPolicy = () => - apiRequestGet('v1/instance/privacy_policy'); diff --git a/app/javascript/mastodon/api/lists.ts b/app/javascript/mastodon/api/lists.ts deleted file mode 100644 index a5586eb6d4..0000000000 --- a/app/javascript/mastodon/api/lists.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { - apiRequestPost, - apiRequestPut, - apiRequestGet, - apiRequestDelete, -} from 'mastodon/api'; -import type { ApiAccountJSON } from 'mastodon/api_types/accounts'; -import type { ApiListJSON } from 'mastodon/api_types/lists'; - -export const apiCreate = (list: Partial) => - apiRequestPost('v1/lists', list); - -export const apiUpdate = (list: Partial) => - apiRequestPut(`v1/lists/${list.id}`, list); - -export const apiGetAccounts = (listId: string) => - apiRequestGet(`v1/lists/${listId}/accounts`, { - limit: 0, - }); - -export const apiGetAccountLists = (accountId: string) => - apiRequestGet(`v1/accounts/${accountId}/lists`); - -export const apiAddAccountToList = (listId: string, accountId: string) => - apiRequestPost(`v1/lists/${listId}/accounts`, { - account_ids: [accountId], - }); - -export const apiRemoveAccountFromList = (listId: string, accountId: string) => - apiRequestDelete(`v1/lists/${listId}/accounts`, { - account_ids: [accountId], - }); diff --git a/app/javascript/mastodon/api/notification_policies.ts b/app/javascript/mastodon/api/notification_policies.ts index 3bc8174139..4032134fb5 100644 --- a/app/javascript/mastodon/api/notification_policies.ts +++ b/app/javascript/mastodon/api/notification_policies.ts @@ -2,8 +2,8 @@ import { apiRequestGet, apiRequestPut } from 'mastodon/api'; import type { NotificationPolicyJSON } from 'mastodon/api_types/notification_policies'; export const apiGetNotificationPolicy = () => - apiRequestGet('v2/notifications/policy'); + apiRequestGet('/v1/notifications/policy'); export const apiUpdateNotificationsPolicy = ( policy: Partial, -) => apiRequestPut('v2/notifications/policy', policy); +) => apiRequestPut('/v1/notifications/policy', policy); diff --git a/app/javascript/mastodon/api/notifications.ts b/app/javascript/mastodon/api/notifications.ts deleted file mode 100644 index 5c31baab8e..0000000000 --- a/app/javascript/mastodon/api/notifications.ts +++ /dev/null @@ -1,109 +0,0 @@ -import api, { - apiRequest, - getLinks, - apiRequestGet, - apiRequestPost, -} from 'mastodon/api'; -import type { - ApiNotificationGroupsResultJSON, - ApiNotificationGroupJSON, - ApiNotificationRequestJSON, - ApiNotificationJSON, -} from 'mastodon/api_types/notifications'; -import type { ApiStatusJSON } from 'mastodon/api_types/statuses'; - -const exceptInvalidNotifications = ( - notifications: ApiNotificationGroupJSON[], -) => { - return notifications.filter((n) => { - if ('status' in n) { - return (n.status as ApiStatusJSON | null) !== null; - } - return true; - }); -}; - -export const apiFetchNotifications = async ( - params?: { - account_id?: string; - since_id?: string; - }, - url?: string, -) => { - const response = await api().request({ - method: 'GET', - url: url ?? '/api/v1/notifications', - params, - }); - - return { - notifications: response.data, - links: getLinks(response), - }; -}; - -export const apiFetchNotificationGroups = async (params?: { - url?: string; - grouped_types?: string[]; - exclude_types?: string[]; - max_id?: string; - since_id?: string; -}) => { - const response = await api().request({ - method: 'GET', - url: '/api/v2/notifications', - params, - }); - - const { statuses, accounts, notification_groups } = response.data; - - return { - statuses, - accounts, - notifications: exceptInvalidNotifications(notification_groups), - links: getLinks(response), - }; -}; - -export const apiClearNotifications = () => - apiRequest('POST', 'v1/notifications/clear'); - -export const apiFetchNotificationRequests = async ( - params?: { - since_id?: string; - }, - url?: string, -) => { - const response = await api().request({ - method: 'GET', - url: url ?? '/api/v1/notifications/requests', - params, - }); - - return { - requests: response.data, - links: getLinks(response), - }; -}; - -export const apiFetchNotificationRequest = async (id: string) => { - return apiRequestGet( - `v1/notifications/requests/${id}`, - ); -}; - -export const apiAcceptNotificationRequest = async (id: string) => { - return apiRequestPost(`v1/notifications/requests/${id}/accept`); -}; - -export const apiDismissNotificationRequest = async (id: string) => { - return apiRequestPost(`v1/notifications/requests/${id}/dismiss`); -}; - -export const apiAcceptNotificationRequests = async (id: string[]) => { - return apiRequestPost('v1/notifications/requests/accept', { id }); -}; - -export const apiDismissNotificationRequests = async (id: string[]) => { - return apiRequestPost('v1/notifications/requests/dismiss', { id }); -}; diff --git a/app/javascript/mastodon/api/polls.ts b/app/javascript/mastodon/api/polls.ts deleted file mode 100644 index cb659986f5..0000000000 --- a/app/javascript/mastodon/api/polls.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { apiRequestGet, apiRequestPost } from 'mastodon/api'; -import type { ApiPollJSON } from 'mastodon/api_types/polls'; - -export const apiGetPoll = (pollId: string) => - apiRequestGet(`/v1/polls/${pollId}`); - -export const apiPollVote = (pollId: string, choices: string[]) => - apiRequestPost(`/v1/polls/${pollId}/votes`, { - choices, - }); diff --git a/app/javascript/mastodon/api/search.ts b/app/javascript/mastodon/api/search.ts deleted file mode 100644 index 79b0385fe8..0000000000 --- a/app/javascript/mastodon/api/search.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { apiRequestGet } from 'mastodon/api'; -import type { - ApiSearchType, - ApiSearchResultsJSON, -} from 'mastodon/api_types/search'; - -export const apiGetSearch = (params: { - q: string; - resolve?: boolean; - type?: ApiSearchType; - limit?: number; - offset?: number; -}) => - apiRequestGet('v2/search', { - ...params, - }); diff --git a/app/javascript/mastodon/api/suggestions.ts b/app/javascript/mastodon/api/suggestions.ts deleted file mode 100644 index d4817698cc..0000000000 --- a/app/javascript/mastodon/api/suggestions.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { apiRequestGet, apiRequestDelete } from 'mastodon/api'; -import type { ApiSuggestionJSON } from 'mastodon/api_types/suggestions'; - -export const apiGetSuggestions = (limit: number) => - apiRequestGet('v2/suggestions', { limit }); - -export const apiDeleteSuggestion = (accountId: string) => - apiRequestDelete(`v1/suggestions/${accountId}`); diff --git a/app/javascript/mastodon/api/tags.ts b/app/javascript/mastodon/api/tags.ts deleted file mode 100644 index 4b111def81..0000000000 --- a/app/javascript/mastodon/api/tags.ts +++ /dev/null @@ -1,23 +0,0 @@ -import api, { getLinks, apiRequestPost, apiRequestGet } from 'mastodon/api'; -import type { ApiHashtagJSON } from 'mastodon/api_types/tags'; - -export const apiGetTag = (tagId: string) => - apiRequestGet(`v1/tags/${tagId}`); - -export const apiFollowTag = (tagId: string) => - apiRequestPost(`v1/tags/${tagId}/follow`); - -export const apiUnfollowTag = (tagId: string) => - apiRequestPost(`v1/tags/${tagId}/unfollow`); - -export const apiGetFollowedTags = async (url?: string) => { - const response = await api().request({ - method: 'GET', - url: url ?? '/api/v1/followed_tags', - }); - - return { - tags: response.data, - links: getLinks(response), - }; -}; diff --git a/app/javascript/mastodon/api_types/accounts.ts b/app/javascript/mastodon/api_types/accounts.ts index 9d7974eda0..41694af4b4 100644 --- a/app/javascript/mastodon/api_types/accounts.ts +++ b/app/javascript/mastodon/api_types/accounts.ts @@ -39,15 +39,16 @@ export interface ApiServerFeaturesJSON { } // See app/serializers/rest/account_serializer.rb -export interface BaseApiAccountJSON { +export interface ApiAccountJSON { acct: string; avatar: string; avatar_static: string; bot: boolean; created_at: string; - discoverable?: boolean; + discoverable: boolean; indexable: boolean; display_name: string; + emoji_reaction_available_server: boolean; emojis: ApiCustomEmojiJSON[]; fields: ApiAccountFieldJSON[]; followers_count: number; @@ -74,12 +75,3 @@ export interface BaseApiAccountJSON { memorial?: boolean; hide_collections: boolean; } - -// See app/serializers/rest/muted_account_serializer.rb -export interface ApiMutedAccountJSON extends BaseApiAccountJSON { - mute_expires_at?: string | null; -} - -// For now, we have the same type representing both `Account` and `MutedAccount` -// objects, but we should refactor this in the future. -export type ApiAccountJSON = ApiMutedAccountJSON; diff --git a/app/javascript/mastodon/api_types/antennas.ts b/app/javascript/mastodon/api_types/antennas.ts deleted file mode 100644 index a2a8a997ba..0000000000 --- a/app/javascript/mastodon/api_types/antennas.ts +++ /dev/null @@ -1,17 +0,0 @@ -// See app/serializers/rest/antenna_serializer.rb - -import type { ApiListJSON } from './lists'; - -export interface ApiAntennaJSON { - id: string; - title: string; - stl: boolean; - ltl: boolean; - insert_feeds: boolean; - with_media_only: boolean; - ignore_reblog: boolean; - favourite: boolean; - list: ApiListJSON | null; - - list_id: string | undefined; -} diff --git a/app/javascript/mastodon/api_types/bookmark_categories.ts b/app/javascript/mastodon/api_types/bookmark_categories.ts deleted file mode 100644 index 5407b6b125..0000000000 --- a/app/javascript/mastodon/api_types/bookmark_categories.ts +++ /dev/null @@ -1,6 +0,0 @@ -// See app/serializers/rest/bookmark_category_serializer.rb - -export interface ApiBookmarkCategoryJSON { - id: string; - title: string; -} diff --git a/app/javascript/mastodon/api_types/circles.ts b/app/javascript/mastodon/api_types/circles.ts deleted file mode 100644 index 9905d480b8..0000000000 --- a/app/javascript/mastodon/api_types/circles.ts +++ /dev/null @@ -1,6 +0,0 @@ -// See app/serializers/rest/circle_serializer.rb - -export interface ApiCircleJSON { - id: string; - title: string; -} diff --git a/app/javascript/mastodon/api_types/instance.ts b/app/javascript/mastodon/api_types/instance.ts deleted file mode 100644 index 3a29684b70..0000000000 --- a/app/javascript/mastodon/api_types/instance.ts +++ /dev/null @@ -1,11 +0,0 @@ -export interface ApiTermsOfServiceJSON { - effective_date: string; - effective: boolean; - succeeded_by: string | null; - content: string; -} - -export interface ApiPrivacyPolicyJSON { - updated_at: string; - content: string; -} diff --git a/app/javascript/mastodon/api_types/lists.ts b/app/javascript/mastodon/api_types/lists.ts deleted file mode 100644 index bc32b33883..0000000000 --- a/app/javascript/mastodon/api_types/lists.ts +++ /dev/null @@ -1,15 +0,0 @@ -// See app/serializers/rest/list_serializer.rb - -import type { ApiAntennaJSON } from './antennas'; - -export type RepliesPolicyType = 'list' | 'followed' | 'none'; - -export interface ApiListJSON { - id: string; - title: string; - exclusive: boolean; - replies_policy: RepliesPolicyType; - notify: boolean; - favourite: boolean; - antennas?: ApiAntennaJSON[]; -} diff --git a/app/javascript/mastodon/api_types/notification_policies.ts b/app/javascript/mastodon/api_types/notification_policies.ts index 1c3970782c..0f4a2d132e 100644 --- a/app/javascript/mastodon/api_types/notification_policies.ts +++ b/app/javascript/mastodon/api_types/notification_policies.ts @@ -1,13 +1,10 @@ // See app/serializers/rest/notification_policy_serializer.rb -export type NotificationPolicyValue = 'accept' | 'filter' | 'drop'; - export interface NotificationPolicyJSON { - for_not_following: NotificationPolicyValue; - for_not_followers: NotificationPolicyValue; - for_new_accounts: NotificationPolicyValue; - for_private_mentions: NotificationPolicyValue; - for_limited_accounts: NotificationPolicyValue; + filter_not_following: boolean; + filter_not_followers: boolean; + filter_new_accounts: boolean; + filter_private_mentions: boolean; summary: { pending_requests_count: number; pending_notifications_count: number; diff --git a/app/javascript/mastodon/api_types/notifications.ts b/app/javascript/mastodon/api_types/notifications.ts deleted file mode 100644 index 41daed25ad..0000000000 --- a/app/javascript/mastodon/api_types/notifications.ts +++ /dev/null @@ -1,200 +0,0 @@ -// See app/serializers/rest/notification_group_serializer.rb - -import type { AccountWarningAction } from 'mastodon/models/notification_group'; - -import type { ApiAccountJSON } from './accounts'; -import type { ApiListJSON } from './lists'; -import type { ApiReportJSON } from './reports'; -import type { ApiStatusJSON } from './statuses'; - -// See app/model/notification.rb -export const allNotificationTypes = [ - 'follow', - 'follow_request', - 'favourite', - 'emoji_reaction', - 'reblog', - 'mention', - 'status_reference', - 'poll', - 'status', - 'list_status', - 'update', - 'admin.sign_up', - 'admin.report', - 'moderation_warning', - 'severed_relationships', - 'annual_report', -]; - -export type NotificationWithStatusType = - | 'favourite' - | 'emoji_reaction' - | 'reblog' - | 'status' - | 'list_status' - | 'mention' - | 'status_reference' - | 'poll' - | 'update'; - -export type NotificationType = - | NotificationWithStatusType - | 'follow' - | 'follow_request' - | 'moderation_warning' - | 'severed_relationships' - | 'admin.sign_up' - | 'admin.report' - | 'annual_report'; - -export interface NotifyEmojiReactionJSON { - name: string; - count: number; - me: boolean; - url?: string; - static_url?: string; - domain?: string; - width?: number; - height?: number; -} - -export interface NotificationEmojiReactionGroupJSON { - emoji_reaction: NotifyEmojiReactionJSON; - sample_account_ids: string[]; -} - -export interface BaseNotificationJSON { - id: string; - type: NotificationType; - created_at: string; - group_key: string; - account: ApiAccountJSON; - emoji_reaction?: NotifyEmojiReactionJSON; - list?: ApiListJSON; -} - -export interface BaseNotificationGroupJSON { - group_key: string; - notifications_count: number; - type: NotificationType; - sample_account_ids: string[]; - latest_page_notification_at: string; // FIXME: This will only be present if the notification group is returned in a paginated list, not requested directly - most_recent_notification_id: string; - page_min_id?: string; - page_max_id?: string; - emoji_reaction_groups?: NotificationEmojiReactionGroupJSON[]; - list?: ApiListJSON; -} - -interface NotificationGroupWithStatusJSON extends BaseNotificationGroupJSON { - type: NotificationWithStatusType; - status_id: string | null; -} - -interface NotificationWithStatusJSON extends BaseNotificationJSON { - type: NotificationWithStatusType; - status: ApiStatusJSON | null; - emoji_reaction?: NotifyEmojiReactionJSON; -} - -interface ReportNotificationGroupJSON extends BaseNotificationGroupJSON { - type: 'admin.report'; - report: ApiReportJSON; -} - -interface ReportNotificationJSON extends BaseNotificationJSON { - type: 'admin.report'; - report: ApiReportJSON; -} - -type SimpleNotificationTypes = 'follow' | 'follow_request' | 'admin.sign_up'; -interface SimpleNotificationGroupJSON extends BaseNotificationGroupJSON { - type: SimpleNotificationTypes; -} - -interface SimpleNotificationJSON extends BaseNotificationJSON { - type: SimpleNotificationTypes; -} - -export interface ApiAccountWarningJSON { - id: string; - action: AccountWarningAction; - text: string; - status_ids: string[]; - created_at: string; - target_account: ApiAccountJSON; - appeal: unknown; -} - -interface ModerationWarningNotificationGroupJSON - extends BaseNotificationGroupJSON { - type: 'moderation_warning'; - moderation_warning: ApiAccountWarningJSON; -} - -interface ModerationWarningNotificationJSON extends BaseNotificationJSON { - type: 'moderation_warning'; - moderation_warning: ApiAccountWarningJSON; -} - -export interface ApiAccountRelationshipSeveranceEventJSON { - id: string; - type: 'account_suspension' | 'domain_block' | 'user_domain_block'; - purged: boolean; - target_name: string; - followers_count: number; - following_count: number; - created_at: string; -} - -interface AccountRelationshipSeveranceNotificationGroupJSON - extends BaseNotificationGroupJSON { - type: 'severed_relationships'; - event: ApiAccountRelationshipSeveranceEventJSON; -} - -interface AccountRelationshipSeveranceNotificationJSON - extends BaseNotificationJSON { - type: 'severed_relationships'; - event: ApiAccountRelationshipSeveranceEventJSON; -} - -export interface ApiAnnualReportEventJSON { - year: string; -} - -interface AnnualReportNotificationGroupJSON extends BaseNotificationGroupJSON { - type: 'annual_report'; - annual_report: ApiAnnualReportEventJSON; -} - -export type ApiNotificationJSON = - | SimpleNotificationJSON - | ReportNotificationJSON - | AccountRelationshipSeveranceNotificationJSON - | NotificationWithStatusJSON - | ModerationWarningNotificationJSON; - -export type ApiNotificationGroupJSON = - | SimpleNotificationGroupJSON - | ReportNotificationGroupJSON - | AccountRelationshipSeveranceNotificationGroupJSON - | NotificationGroupWithStatusJSON - | ModerationWarningNotificationGroupJSON - | AnnualReportNotificationGroupJSON; - -export interface ApiNotificationGroupsResultJSON { - accounts: ApiAccountJSON[]; - statuses: ApiStatusJSON[]; - notification_groups: ApiNotificationGroupJSON[]; -} - -export interface ApiNotificationRequestJSON { - id: string; - created_at: string; - updated_at: string; - notifications_count: string; - account: ApiAccountJSON; - last_status?: ApiStatusJSON; -} diff --git a/app/javascript/mastodon/api_types/polls.ts b/app/javascript/mastodon/api_types/polls.ts index 891a2faba7..8181f7b813 100644 --- a/app/javascript/mastodon/api_types/polls.ts +++ b/app/javascript/mastodon/api_types/polls.ts @@ -13,11 +13,11 @@ export interface ApiPollJSON { expired: boolean; multiple: boolean; votes_count: number; - voters_count: number | null; + voters_count: number; options: ApiPollOptionJSON[]; emojis: ApiCustomEmojiJSON[]; - voted?: boolean; - own_votes?: number[]; + voted: boolean; + own_votes: number[]; } diff --git a/app/javascript/mastodon/api_types/reports.ts b/app/javascript/mastodon/api_types/reports.ts deleted file mode 100644 index b11cfdd2eb..0000000000 --- a/app/javascript/mastodon/api_types/reports.ts +++ /dev/null @@ -1,16 +0,0 @@ -import type { ApiAccountJSON } from './accounts'; - -export type ReportCategory = 'other' | 'spam' | 'legal' | 'violation'; - -export interface ApiReportJSON { - id: string; - action_taken: unknown; - action_taken_at: unknown; - category: ReportCategory; - comment: string; - forwarded: boolean; - created_at: string; - status_ids: string[]; - rule_ids: string[]; - target_account: ApiAccountJSON; -} diff --git a/app/javascript/mastodon/api_types/search.ts b/app/javascript/mastodon/api_types/search.ts deleted file mode 100644 index 795cbb2b41..0000000000 --- a/app/javascript/mastodon/api_types/search.ts +++ /dev/null @@ -1,11 +0,0 @@ -import type { ApiAccountJSON } from './accounts'; -import type { ApiStatusJSON } from './statuses'; -import type { ApiHashtagJSON } from './tags'; - -export type ApiSearchType = 'accounts' | 'statuses' | 'hashtags'; - -export interface ApiSearchResultsJSON { - accounts: ApiAccountJSON[]; - statuses: ApiStatusJSON[]; - hashtags: ApiHashtagJSON[]; -} diff --git a/app/javascript/mastodon/api_types/statuses.ts b/app/javascript/mastodon/api_types/statuses.ts index a83c99351e..8e76078c5a 100644 --- a/app/javascript/mastodon/api_types/statuses.ts +++ b/app/javascript/mastodon/api_types/statuses.ts @@ -64,29 +64,6 @@ export interface ApiPreviewCardJSON { authors: ApiPreviewCardAuthorJSON[]; } -export type FilterContext = - | 'home' - | 'notifications' - | 'public' - | 'thread' - | 'account'; - -export interface ApiFilterJSON { - id: string; - title: string; - context: FilterContext; - expires_at: string; - filter_action: 'warn' | 'hide'; - keywords?: unknown[]; // TODO: FilterKeywordSerializer - statuses?: unknown[]; // TODO: FilterStatusSerializer -} - -export interface ApiFilterResultJSON { - filter: ApiFilterJSON; - keyword_matches: string[]; - status_matches: string[]; -} - export interface ApiStatusJSON { id: string; created_at: string; @@ -109,7 +86,8 @@ export interface ApiStatusJSON { bookmarked?: boolean; pinned?: boolean; - filtered?: ApiFilterResultJSON[]; + // filtered: FilterResult[] + filtered: unknown; // TODO content?: string; text?: string; diff --git a/app/javascript/mastodon/api_types/suggestions.ts b/app/javascript/mastodon/api_types/suggestions.ts deleted file mode 100644 index 7d91daf901..0000000000 --- a/app/javascript/mastodon/api_types/suggestions.ts +++ /dev/null @@ -1,13 +0,0 @@ -import type { ApiAccountJSON } from 'mastodon/api_types/accounts'; - -export type ApiSuggestionSourceJSON = - | 'featured' - | 'most_followed' - | 'most_interactions' - | 'similar_to_recently_followed' - | 'friends_of_friends'; - -export interface ApiSuggestionJSON { - sources: [ApiSuggestionSourceJSON, ...ApiSuggestionSourceJSON[]]; - account: ApiAccountJSON; -} diff --git a/app/javascript/mastodon/api_types/tags.ts b/app/javascript/mastodon/api_types/tags.ts deleted file mode 100644 index 0c16c8bd28..0000000000 --- a/app/javascript/mastodon/api_types/tags.ts +++ /dev/null @@ -1,13 +0,0 @@ -interface ApiHistoryJSON { - day: string; - accounts: string; - uses: string; -} - -export interface ApiHashtagJSON { - id: string; - name: string; - url: string; - history: [ApiHistoryJSON, ...ApiHistoryJSON[]]; - following?: boolean; -} diff --git a/app/javascript/mastodon/common.js b/app/javascript/mastodon/common.js index c61e02250c..511568aa0f 100644 --- a/app/javascript/mastodon/common.js +++ b/app/javascript/mastodon/common.js @@ -1,11 +1,12 @@ import Rails from '@rails/ujs'; +import 'font-awesome/css/font-awesome.css'; export function start() { require.context('../images/', true, /\.(jpg|png|svg)$/); try { Rails.start(); - } catch { + } catch (e) { // If called twice } } diff --git a/app/javascript/mastodon/components/__tests__/__snapshots__/avatar-test.jsx.snap b/app/javascript/mastodon/components/__tests__/__snapshots__/avatar-test.jsx.snap index 124b50d8c7..2f0a2de324 100644 --- a/app/javascript/mastodon/components/__tests__/__snapshots__/avatar-test.jsx.snap +++ b/app/javascript/mastodon/components/__tests__/__snapshots__/avatar-test.jsx.snap @@ -2,7 +2,7 @@ exports[` Autoplay renders a animated avatar 1`] = `

Autoplay renders a animated avatar 1`] = ` >
@@ -23,7 +21,7 @@ exports[` Autoplay renders a animated avatar 1`] = ` exports[` Still renders a still avatar 1`] = `
Still renders a still avatar 1`] = ` >
diff --git a/app/javascript/mastodon/components/__tests__/hashtag_bar.tsx b/app/javascript/mastodon/components/__tests__/hashtag_bar.tsx index f86c1a2a6b..b7225fc92e 100644 --- a/app/javascript/mastodon/components/__tests__/hashtag_bar.tsx +++ b/app/javascript/mastodon/components/__tests__/hashtag_bar.tsx @@ -165,7 +165,7 @@ describe('computeHashtagBarForStatus', () => { ); }); - it('does not put the hashtags in the bar if a status content has hashtags in the only line and has a media', () => { + it('puts the hashtags in the bar if a status content has hashtags in the only line and has a media', () => { const status = createStatus( '

This is my content! #hashtag

', ['hashtag'], diff --git a/app/javascript/mastodon/components/account.jsx b/app/javascript/mastodon/components/account.jsx new file mode 100644 index 0000000000..980dc9e100 --- /dev/null +++ b/app/javascript/mastodon/components/account.jsx @@ -0,0 +1,193 @@ +import PropTypes from 'prop-types'; +import { useCallback } from 'react'; + +import { defineMessages, useIntl, FormattedMessage } from 'react-intl'; + +import classNames from 'classnames'; +import { Link } from 'react-router-dom'; + +import ImmutablePropTypes from 'react-immutable-proptypes'; + +import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react'; +import { EmptyAccount } from 'mastodon/components/empty_account'; +import { ShortNumber } from 'mastodon/components/short_number'; +import { VerifiedBadge } from 'mastodon/components/verified_badge'; + +import DropdownMenuContainer from '../containers/dropdown_menu_container'; +import { me } from '../initial_state'; + +import { Avatar } from './avatar'; +import { Button } from './button'; +import { FollowersCounter } from './counters'; +import { DisplayName } from './display_name'; +import { RelativeTimestamp } from './relative_timestamp'; + +const messages = defineMessages({ + follow: { id: 'account.follow', defaultMessage: 'Follow' }, + unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' }, + cancel_follow_request: { id: 'account.cancel_follow_request', defaultMessage: 'Withdraw follow request' }, + unblock: { id: 'account.unblock_short', defaultMessage: 'Unblock' }, + unmute: { id: 'account.unmute_short', defaultMessage: 'Unmute' }, + mute_notifications: { id: 'account.mute_notifications_short', defaultMessage: 'Mute notifications' }, + unmute_notifications: { id: 'account.unmute_notifications_short', defaultMessage: 'Unmute notifications' }, + mute: { id: 'account.mute_short', defaultMessage: 'Mute' }, + block: { id: 'account.block_short', defaultMessage: 'Block' }, + more: { id: 'status.more', defaultMessage: 'More' }, +}); + +const Account = ({ size = 46, account, onFollow, onBlock, onMute, onMuteNotifications, hidden, hideButtons, minimal, defaultAction, children, withBio }) => { + const intl = useIntl(); + + const handleFollow = useCallback(() => { + onFollow(account); + }, [onFollow, account]); + + const handleBlock = useCallback(() => { + onBlock(account); + }, [onBlock, account]); + + const handleMute = useCallback(() => { + onMute(account); + }, [onMute, account]); + + const handleMuteNotifications = useCallback(() => { + onMuteNotifications(account, true); + }, [onMuteNotifications, account]); + + const handleUnmuteNotifications = useCallback(() => { + onMuteNotifications(account, false); + }, [onMuteNotifications, account]); + + if (!account) { + return ; + } + + if (hidden) { + return ( + <> + {account.get('display_name')} + {account.get('username')} + + ); + } + + let buttons; + + if (!hideButtons && account.get('id') !== me && account.get('relationship', null) !== null) { + const following = account.getIn(['relationship', 'following']); + const requested = account.getIn(['relationship', 'requested']); + const blocking = account.getIn(['relationship', 'blocking']); + const muting = account.getIn(['relationship', 'muting']); + + if (requested) { + buttons = - )} - - - ); -}; - -export const AlertsController: React.FC = () => { - const alerts = useAppSelector((state) => state.alerts); - - if (alerts.length === 0) { - return null; - } - - return ( -
- {alerts.map((alert, idx) => ( - - ))} -
- ); -}; diff --git a/app/javascript/mastodon/components/alt_text_badge.tsx b/app/javascript/mastodon/components/alt_text_badge.tsx deleted file mode 100644 index 701cfbe8b4..0000000000 --- a/app/javascript/mastodon/components/alt_text_badge.tsx +++ /dev/null @@ -1,77 +0,0 @@ -import { useState, useCallback, useRef, useId } from 'react'; - -import { FormattedMessage } from 'react-intl'; - -import Overlay from 'react-overlays/Overlay'; -import type { - OffsetValue, - UsePopperOptions, -} from 'react-overlays/esm/usePopper'; - -import { useSelectableClick } from 'mastodon/hooks/useSelectableClick'; - -const offset = [0, 4] as OffsetValue; -const popperConfig = { strategy: 'fixed' } as UsePopperOptions; - -export const AltTextBadge: React.FC<{ - description: string; -}> = ({ description }) => { - const accessibilityId = useId(); - const anchorRef = useRef(null); - const [open, setOpen] = useState(false); - - const handleClick = useCallback(() => { - setOpen((v) => !v); - }, [setOpen]); - - const handleClose = useCallback(() => { - setOpen(false); - }, [setOpen]); - - const [handleMouseDown, handleMouseUp] = useSelectableClick(handleClose); - - return ( - <> - - - - {({ props }) => ( -
-
-

- -

-

{description}

-
-
- )} - - - ); -}; diff --git a/app/javascript/mastodon/components/animated_number.tsx b/app/javascript/mastodon/components/animated_number.tsx index db422f47ce..6c1e0aaec1 100644 --- a/app/javascript/mastodon/components/animated_number.tsx +++ b/app/javascript/mastodon/components/animated_number.tsx @@ -1,6 +1,6 @@ -import { useEffect, useState } from 'react'; +import { useCallback, useState } from 'react'; -import { animated, useSpring, config } from '@react-spring/web'; +import { TransitionMotion, spring } from 'react-motion'; import { reduceMotion } from '../initial_state'; @@ -11,49 +11,53 @@ interface Props { } export const AnimatedNumber: React.FC = ({ value }) => { const [previousValue, setPreviousValue] = useState(value); - const direction = value > previousValue ? -1 : 1; + const [direction, setDirection] = useState<1 | -1>(1); - const [styles, api] = useSpring( - () => ({ - from: { transform: `translateY(${100 * direction}%)` }, - to: { transform: 'translateY(0%)' }, - onRest() { - setPreviousValue(value); - }, - config: { ...config.gentle, duration: 200 }, - immediate: true, // This ensures that the animation is not played when the component is first rendered - }), - [value, previousValue], + if (previousValue !== value) { + setPreviousValue(value); + setDirection(value > previousValue ? 1 : -1); + } + + const willEnter = useCallback(() => ({ y: -1 * direction }), [direction]); + const willLeave = useCallback( + () => ({ y: spring(1 * direction, { damping: 35, stiffness: 400 }) }), + [direction], ); - // When the value changes, start the animation - useEffect(() => { - if (value !== previousValue) { - void api.start({ reset: true }); - } - }, [api, previousValue, value]); - if (reduceMotion) { return ; } + const styles = [ + { + key: `${value}`, + data: value, + style: { y: spring(0, { damping: 35, stiffness: 400 }) }, + }, + ]; + return ( - - - - - {value !== previousValue && ( - - - + + {(items) => ( + + {items.map(({ key, data, style }) => ( + 0 ? 'absolute' : 'static', + transform: `translateY(${(style.y ?? 0) * 100}%)`, + }} + > + + + ))} + )} - + ); }; diff --git a/app/javascript/mastodon/components/attachment_list.jsx b/app/javascript/mastodon/components/attachment_list.jsx index f97e22f2d4..c5ac046751 100644 --- a/app/javascript/mastodon/components/attachment_list.jsx +++ b/app/javascript/mastodon/components/attachment_list.jsx @@ -36,7 +36,7 @@ export default class AttachmentList extends ImmutablePureComponent { return (
  • - + {compact && } {compact && ' ' } {displayUrl ? filename(displayUrl) : } diff --git a/app/javascript/mastodon/components/avatar.tsx b/app/javascript/mastodon/components/avatar.tsx index a2dc0b782e..8f866a3c65 100644 --- a/app/javascript/mastodon/components/avatar.tsx +++ b/app/javascript/mastodon/components/avatar.tsx @@ -1,19 +1,16 @@ -import { useState, useCallback } from 'react'; - import classNames from 'classnames'; -import { useHovering } from 'mastodon/hooks/useHovering'; -import { autoPlayGif } from 'mastodon/initial_state'; import type { Account } from 'mastodon/models/account'; +import { useHovering } from '../../hooks/useHovering'; +import { autoPlayGif } from '../initial_state'; + interface Props { account: Account | undefined; // FIXME: remove `undefined` once we know for sure its always there size: number; style?: React.CSSProperties; inline?: boolean; animate?: boolean; - counter?: number | string; - counterBorderColor?: string; } export const Avatar: React.FC = ({ @@ -22,12 +19,8 @@ export const Avatar: React.FC = ({ size = 20, inline = false, style: styleFromParent, - counter, - counterBorderColor, }) => { const { hovering, handleMouseEnter, handleMouseLeave } = useHovering(animate); - const [loading, setLoading] = useState(true); - const [error, setError] = useState(false); const style = { ...styleFromParent, @@ -40,36 +33,16 @@ export const Avatar: React.FC = ({ ? account?.get('avatar') : account?.get('avatar_static'); - const handleLoad = useCallback(() => { - setLoading(false); - }, [setLoading]); - - const handleError = useCallback(() => { - setError(true); - }, [setError]); - return (
    - {src && !error && ( - - )} - - {counter && ( -
    - {counter} -
    - )} + {src && }
    ); }; diff --git a/app/javascript/mastodon/components/avatar_overlay.tsx b/app/javascript/mastodon/components/avatar_overlay.tsx index 0bd33fea69..f98cfcc38b 100644 --- a/app/javascript/mastodon/components/avatar_overlay.tsx +++ b/app/javascript/mastodon/components/avatar_overlay.tsx @@ -1,7 +1,8 @@ -import { useHovering } from 'mastodon/hooks/useHovering'; -import { autoPlayGif } from 'mastodon/initial_state'; import type { Account } from 'mastodon/models/account'; +import { useHovering } from '../../hooks/useHovering'; +import { autoPlayGif } from '../initial_state'; + interface Props { account: Account | undefined; // FIXME: remove `undefined` once we know for sure its always there friend: Account | undefined; // FIXME: remove `undefined` once we know for sure its always there diff --git a/app/javascript/mastodon/components/button.tsx b/app/javascript/mastodon/components/button.tsx index a527468f65..c76aaea42f 100644 --- a/app/javascript/mastodon/components/button.tsx +++ b/app/javascript/mastodon/components/button.tsx @@ -1,4 +1,4 @@ -import type { PropsWithChildren, JSX } from 'react'; +import type { PropsWithChildren } from 'react'; import { useCallback } from 'react'; import classNames from 'classnames'; @@ -7,8 +7,6 @@ interface BaseProps extends Omit, 'children'> { block?: boolean; secondary?: boolean; - compact?: boolean; - dangerous?: boolean; } interface PropsChildren extends PropsWithChildren { @@ -28,8 +26,6 @@ export const Button: React.FC = ({ disabled, block, secondary, - compact, - dangerous, className, title, text, @@ -49,9 +45,7 @@ export const Button: React.FC = ({ - )} - - ); -}; diff --git a/app/javascript/mastodon/components/compacted_status.jsx b/app/javascript/mastodon/components/compacted_status.jsx index 6986bcd34c..78f031ad2e 100644 --- a/app/javascript/mastodon/components/compacted_status.jsx +++ b/app/javascript/mastodon/components/compacted_status.jsx @@ -9,22 +9,15 @@ import ImmutablePureComponent from 'react-immutable-pure-component'; import { HotKeys } from 'react-hotkeys'; -import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react'; -import PushPinIcon from '@/material-icons/400-24px/push_pin.svg?react'; -import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react'; -import ReplyIcon from '@/material-icons/400-24px/reply.svg?react'; import AttachmentList from 'mastodon/components/attachment_list'; -import { ContentWarning } from 'mastodon/components/content_warning'; import { Icon } from 'mastodon/components/icon'; -import PictureInPicturePlaceholder from 'mastodon/components/picture_in_picture_placeholder'; -import { withOptionalRouter, WithOptionalRouterPropTypes } from 'mastodon/utils/react_router'; +import { WithRouterPropTypes } from 'mastodon/utils/react_router'; import Card from '../features/status/components/card'; // We use the component (and not the container) since we do not want // to use the progress bar to show download progress import Bundle from '../features/ui/components/bundle'; import { MediaGallery, Video, Audio } from '../features/ui/util/async-components'; -import { SensitiveMediaContext } from '../features/ui/util/sensitive_media_context'; import { displayMedia } from '../initial_state'; import { Avatar } from './avatar'; @@ -32,7 +25,6 @@ import { DisplayName } from './display_name'; import { getHashtagBarForStatus } from './hashtag_bar'; import { RelativeTimestamp } from './relative_timestamp'; import StatusContent from './status_content'; -import { VisibilityIcon } from './visibility_icon'; const domParser = new DOMParser(); @@ -70,36 +62,19 @@ export const defaultMediaVisibility = (status) => { }; const messages = defineMessages({ - limited_short: { id: 'privacy.limited.short', defaultMessage: 'Limited' }, edited: { id: 'status.edited', defaultMessage: 'Edited {date}' }, }); class CompactedStatus extends ImmutablePureComponent { - static contextType = SensitiveMediaContext; - static propTypes = { status: ImmutablePropTypes.map, - account: ImmutablePropTypes.record, previousId: PropTypes.string, nextInReplyToId: PropTypes.string, rootId: PropTypes.string, onClick: PropTypes.func, - onReply: PropTypes.func, - onFavourite: PropTypes.func, - onEmojiReact: PropTypes.func, - onUnEmojiReact: PropTypes.func, - onReblog: PropTypes.func, - onReblogForceModal: PropTypes.func, - onDelete: PropTypes.func, - onDirect: PropTypes.func, - onMention: PropTypes.func, - onPin: PropTypes.func, onOpenMedia: PropTypes.func, onOpenVideo: PropTypes.func, - onBlock: PropTypes.func, - onAddFilter: PropTypes.func, - onEmbed: PropTypes.func, onHeightChange: PropTypes.func, onToggleHidden: PropTypes.func, onToggleCollapsed: PropTypes.func, @@ -115,43 +90,33 @@ class CompactedStatus extends ImmutablePureComponent { updateScrollBottom: PropTypes.func, cacheMediaWidth: PropTypes.func, cachedMediaWidth: PropTypes.number, - scrollKey: PropTypes.string, - skipPrepend: PropTypes.bool, - deployPictureInPicture: PropTypes.func, - unfocusable: PropTypes.bool, - pictureInPicture: ImmutablePropTypes.contains({ - inUse: PropTypes.bool, - available: PropTypes.bool, - }), - withoutEmojiReactions: PropTypes.bool, - ...WithOptionalRouterPropTypes, + history: PropTypes.func, + ...WithRouterPropTypes, }; // Avoid checking props that are functions (and whose equality will always // evaluate to false. See react-immutable-pure-component for usage. updateOnProps = [ 'status', - 'account', 'muted', 'hidden', 'unread', - 'pictureInPicture', ]; state = { - showMedia: defaultMediaVisibility(this.props.status) && !(this.context?.hideMediaByDefault), + showMedia: defaultMediaVisibility(this.props.status), + statusId: undefined, + forceFilter: undefined, }; - componentDidUpdate (prevProps) { - // This will potentially cause a wasteful redraw, but in most cases `Status` components are used - // with a `key` directly depending on their `id`, preventing re-use of the component across - // different IDs. - // But just in case this does change, reset the state on status change. - - if (this.props.status?.get('id') !== prevProps.status?.get('id')) { - this.setState({ - showMedia: defaultMediaVisibility(this.props.status) && !(this.context?.hideMediaByDefault), - }); + static getDerivedStateFromProps(nextProps, prevState) { + if (nextProps.status && nextProps.status.get('id') !== prevState.statusId) { + return { + showMedia: defaultMediaVisibility(nextProps.status), + statusId: nextProps.status.get('id'), + }; + } else { + return null; } } @@ -258,31 +223,6 @@ class CompactedStatus extends ImmutablePureComponent { } }; - handleDeployPictureInPicture = (type, mediaProps) => { - const { deployPictureInPicture } = this.props; - const status = this._properStatus(); - - deployPictureInPicture(status, type, mediaProps); - }; - - handleHotkeyReply = e => { - e.preventDefault(); - this.props.onReply(this._properStatus()); - }; - - handleHotkeyFavourite = () => { - this.props.onFavourite(this._properStatus()); - }; - - handleHotkeyBoost = e => { - this.props.onReblog(this._properStatus(), e); - }; - - handleHotkeyMention = e => { - e.preventDefault(); - this.props.onMention(this._properStatus().get('account')); - }; - handleHotkeyOpen = () => { if (this.props.onClick) { this.props.onClick(); @@ -323,10 +263,7 @@ class CompactedStatus extends ImmutablePureComponent { }; handleHotkeyToggleHidden = () => { - const { onToggleHidden } = this.props; - const status = this._properStatus(); - - onToggleHidden(status); + this.props.onToggleHidden(this._properStatus()); }; handleHotkeyToggleSensitive = () => { @@ -348,7 +285,7 @@ class CompactedStatus extends ImmutablePureComponent { }; render () { - const { intl, hidden, featured, unfocusable, unread, showThread, pictureInPicture, previousId, nextInReplyToId, rootId, skipPrepend } = this.props; + const { intl, hidden, featured, unread, showThread, previousId, nextInReplyToId, rootId } = this.props; let { status } = this.props; @@ -357,10 +294,6 @@ class CompactedStatus extends ImmutablePureComponent { } const handlers = this.props.muted ? {} : { - reply: this.handleHotkeyReply, - favourite: this.handleHotkeyFavourite, - boost: this.handleHotkeyBoost, - mention: this.handleHotkeyMention, open: this.handleHotkeyOpen, openProfile: this.handleHotkeyOpenProfile, moveUp: this.handleHotkeyMoveUp, @@ -370,12 +303,12 @@ class CompactedStatus extends ImmutablePureComponent { openMedia: this.handleHotkeyOpenMedia, }; - let media, prepend, rebloggedByText; + let media, isCardMediaWithSensitive, prepend, rebloggedByText; if (hidden) { return ( - -
    + +
    {status.getIn(['account', 'display_name']) || status.getIn(['account', 'username'])} {status.get('content')}
    @@ -387,50 +320,36 @@ class CompactedStatus extends ImmutablePureComponent { const connectToRoot = rootId && rootId === status.get('in_reply_to_id'); const connectReply = nextInReplyToId && nextInReplyToId === status.get('id'); - let visibilityName = status.get('limited_scope') || status.get('visibility_ex') || status.get('visibility'); - - if (featured) { - prepend = ( -
    -
    - -
    - ); - } else if (status.get('reblog', null) !== null && typeof status.get('reblog') === 'object') { + if (showThread && status.get('in_reply_to_id') && status.get('in_reply_to_account_id') === status.getIn(['account', 'id'])) { const display_name_html = { __html: status.getIn(['account', 'display_name_html']) }; prepend = (
    -
    -
    -     }} /> -
    - ); - - rebloggedByText = intl.formatMessage({ id: 'status.reblogged_by', defaultMessage: '{name} boosted' }, { name: status.getIn(['account', 'acct']) }); - - status = status.get('reblog'); - } else if (status.get('visibility') === 'direct') { - prepend = ( -
    -
    - -
    - ); - } else if (showThread && status.get('in_reply_to_id') && status.get('in_reply_to_account_id') === status.getIn(['account', 'id'])) { - const display_name_html = { __html: status.getIn(['account', 'display_name_html']) }; - - prepend = ( -
    -
    - }} /> +
    + }} />
    ); } - if (pictureInPicture.get('inUse')) { - media = ; - } else if (status.get('media_attachments').size > 0) { + if (status.get('quote_muted')) { + const minHandlers = { + moveUp: this.handleHotkeyMoveUp, + moveDown: this.handleHotkeyMoveDown, + }; + + return ( + + {/* eslint-disable-next-line jsx-a11y/no-static-element-interactions */} +
    + +
    +     + ); + } + + isCardMediaWithSensitive = false; + + if (status.get('media_attachments').size > 0) { const language = status.getIn(['translation', 'language']) || status.get('language'); if (this.props.muted) { @@ -459,7 +378,6 @@ class CompactedStatus extends ImmutablePureComponent { width={this.props.cachedMediaWidth} height={110} cacheWidth={this.props.cacheMediaWidth} - deployPictureInPicture={pictureInPicture.get('available') ? this.handleDeployPictureInPicture : undefined} sensitive={status.get('sensitive')} blurhash={attachment.get('blurhash')} visible={this.state.showMedia} @@ -485,7 +403,6 @@ class CompactedStatus extends ImmutablePureComponent { lang={language} sensitive={status.get('sensitive')} onOpenVideo={this.handleOpenVideo} - deployPictureInPicture={pictureInPicture.get('available') ? this.handleDeployPictureInPicture : undefined} visible={this.state.showMedia} onToggleVisibility={this.handleToggleMediaVisibility} /> @@ -497,6 +414,7 @@ class CompactedStatus extends ImmutablePureComponent { {Component => ( ); + isCardMediaWithSensitive = status.get('spoiler_text').length > 0; } - visibilityName = status.get('limited_scope') || status.get('visibility_ex') || status.get('visibility'); - const {statusContentProps, hashtagBar} = getHashtagBarForStatus(status); const expanded = !status.get('hidden') || status.get('spoiler_text').length === 0; return ( - -
    - {!skipPrepend && prepend} + +
    + {prepend}
    - {(connectReply || connectUp || connectToRoot) &&
    } {/* eslint-disable-next-line jsx-a11y/no-static-element-interactions */}
    - - {status.get('edited_at') && *} + {status.get('edited_at') && *} - - - {status.get('spoiler_text').length > 0 && } + - {expanded && ( - <> - + {(!isCardMediaWithSensitive || !status.get('hidden')) && media} - {media} - {hashtagBar} - - )} + {(!status.get('spoiler_text') || expanded) && hashtagBar}
    @@ -577,4 +489,4 @@ class CompactedStatus extends ImmutablePureComponent { } -export default withOptionalRouter(injectIntl(CompactedStatus)); +export default injectIntl(CompactedStatus); diff --git a/app/javascript/mastodon/components/content_warning.tsx b/app/javascript/mastodon/components/content_warning.tsx deleted file mode 100644 index c1c879b55d..0000000000 --- a/app/javascript/mastodon/components/content_warning.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { StatusBanner, BannerVariant } from './status_banner'; - -export const ContentWarning: React.FC<{ - text: string; - expanded?: boolean; - onClick?: () => void; -}> = ({ text, expanded, onClick }) => ( - -

    - -); diff --git a/app/javascript/mastodon/components/copy_icon_button.tsx b/app/javascript/mastodon/components/copy_icon_button.jsx similarity index 62% rename from app/javascript/mastodon/components/copy_icon_button.tsx rename to app/javascript/mastodon/components/copy_icon_button.jsx index 29f5f34430..0c3c6c290b 100644 --- a/app/javascript/mastodon/components/copy_icon_button.tsx +++ b/app/javascript/mastodon/components/copy_icon_button.jsx @@ -1,36 +1,29 @@ +import PropTypes from 'prop-types'; import { useState, useCallback } from 'react'; import { defineMessages } from 'react-intl'; import classNames from 'classnames'; +import { useDispatch } from 'react-redux'; + import ContentCopyIcon from '@/material-icons/400-24px/content_copy.svg?react'; import { showAlert } from 'mastodon/actions/alerts'; import { IconButton } from 'mastodon/components/icon_button'; -import { useAppDispatch } from 'mastodon/store'; const messages = defineMessages({ - copied: { - id: 'copy_icon_button.copied', - defaultMessage: 'Copied to clipboard', - }, + copied: { id: 'copy_icon_button.copied', defaultMessage: 'Copied to clipboard' }, }); -export const CopyIconButton: React.FC<{ - title: string; - value: string; - className: string; -}> = ({ title, value, className }) => { +export const CopyIconButton = ({ title, value, className }) => { const [copied, setCopied] = useState(false); - const dispatch = useAppDispatch(); + const dispatch = useDispatch(); const handleClick = useCallback(() => { - void navigator.clipboard.writeText(value); + navigator.clipboard.writeText(value); setCopied(true); dispatch(showAlert({ message: messages.copied })); - setTimeout(() => { - setCopied(false); - }, 700); + setTimeout(() => setCopied(false), 700); }, [setCopied, value, dispatch]); return ( @@ -38,8 +31,13 @@ export const CopyIconButton: React.FC<{ className={classNames(className, copied ? 'copied' : 'copyable')} title={title} onClick={handleClick} - icon='' iconComponent={ContentCopyIcon} /> ); }; + +CopyIconButton.propTypes = { + title: PropTypes.string, + value: PropTypes.string, + className: PropTypes.string, +}; diff --git a/app/javascript/mastodon/components/copy_paste_text.tsx b/app/javascript/mastodon/components/copy_paste_text.tsx deleted file mode 100644 index e6eba765ab..0000000000 --- a/app/javascript/mastodon/components/copy_paste_text.tsx +++ /dev/null @@ -1,90 +0,0 @@ -import { useRef, useState, useCallback } from 'react'; - -import { FormattedMessage } from 'react-intl'; - -import classNames from 'classnames'; - -import ContentCopyIcon from '@/material-icons/400-24px/content_copy.svg?react'; -import { Icon } from 'mastodon/components/icon'; -import { useTimeout } from 'mastodon/hooks/useTimeout'; - -export const CopyPasteText: React.FC<{ value: string }> = ({ value }) => { - const inputRef = useRef(null); - const [copied, setCopied] = useState(false); - const [focused, setFocused] = useState(false); - const [setAnimationTimeout] = useTimeout(); - - const handleInputClick = useCallback(() => { - setCopied(false); - - if (inputRef.current) { - inputRef.current.focus(); - inputRef.current.select(); - inputRef.current.setSelectionRange(0, value.length); - } - }, [setCopied, value]); - - const handleButtonClick = useCallback( - (e: React.MouseEvent) => { - e.stopPropagation(); - void navigator.clipboard.writeText(value); - inputRef.current?.blur(); - setCopied(true); - setAnimationTimeout(() => { - setCopied(false); - }, 700); - }, - [setCopied, setAnimationTimeout, value], - ); - - const handleKeyUp = useCallback( - (e: React.KeyboardEvent) => { - if (e.key !== ' ') return; - void navigator.clipboard.writeText(value); - setCopied(true); - setAnimationTimeout(() => { - setCopied(false); - }, 700); - }, - [setCopied, setAnimationTimeout, value], - ); - - const handleFocus = useCallback(() => { - setFocused(true); - }, [setFocused]); - - const handleBlur = useCallback(() => { - setFocused(false); - }, [setFocused]); - - return ( -

    -