Merge commit 'b896b16cb3c8626fbee12a7eda7f882114b1a040' into glitch-soc/merge-upstream

.rubocop.yml

@@ -43,7 +43,7 @@ Layout/LineLength:
     - !ruby/regexp / \# .*$/
     - !ruby/regexp /^\# .*$/
   Exclude:
-    - lib/**/*cli*.rb
+    - 'lib/mastodon/cli/*.rb'
     - db/*migrate/**/*
     - db/seeds/**/*
 
@@ -57,7 +57,7 @@ Lint/UselessAccessModifier:
 # https://docs.rubocop.org/rubocop/cops_metrics.html#metricsabcsize
 Metrics/AbcSize:
   Exclude:
-    - 'lib/**/*cli*.rb'
+    - 'lib/mastodon/cli/*.rb'
     - db/*migrate/**/*
 
 # Reason: Some functions cannot be broken up, but others may be refactor candidates
@@ -66,7 +66,7 @@ Metrics/BlockLength:
   CountAsOne: ['array', 'hash', 'heredoc', 'method_call']
   Exclude:
     - 'config/routes.rb'
-    - 'lib/mastodon/*_cli.rb'
+    - 'lib/mastodon/cli/*.rb'
     - 'lib/tasks/*.rake'
     - 'app/models/concerns/account_associations.rb'
     - 'app/models/concerns/account_interactions.rb'
@@ -95,14 +95,14 @@ Metrics/BlockLength:
 # https://docs.rubocop.org/rubocop/cops_metrics.html#metricsblocknesting
 Metrics/BlockNesting:
   Exclude:
-    - 'lib/mastodon/*_cli.rb'
+    - 'lib/mastodon/cli/*.rb'
 
 # Reason: Some Excluded files would be candidates for refactoring but not currently addressed
 # https://docs.rubocop.org/rubocop/cops_metrics.html#metricsclasslength
 Metrics/ClassLength:
   CountAsOne: ['array', 'hash', 'heredoc', 'method_call']
   Exclude:
-    - 'lib/mastodon/*_cli.rb'
+    - 'lib/mastodon/cli/*.rb'
     - 'app/controllers/admin/accounts_controller.rb'
     - 'app/controllers/api/base_controller.rb'
     - 'app/controllers/api/v1/admin/accounts_controller.rb'
@@ -146,7 +146,7 @@ Metrics/ClassLength:
 # https://docs.rubocop.org/rubocop/cops_metrics.html#metricscyclomaticcomplexity
 Metrics/CyclomaticComplexity:
   Exclude:
-    - lib/mastodon/*cli*.rb
+    - lib/mastodon/cli/*.rb
     - db/*migrate/**/*
 
 # Reason: Currently disabled in .rubocop_todo.yml
@@ -154,7 +154,7 @@ Metrics/CyclomaticComplexity:
 Metrics/MethodLength:
   CountAsOne: [array, heredoc]
   Exclude:
-    - 'lib/mastodon/*_cli.rb'
+    - 'lib/mastodon/cli/*.rb'
 
 # Reason:
 # https://docs.rubocop.org/rubocop/cops_metrics.html#metricsmodulelength
@@ -171,13 +171,12 @@ Rails/FilePath:
 Rails/HttpStatus:
   EnforcedStyle: numeric
 
-# Reason: Allowed only in the `tootctl` CLI application code
+# Reason: Allowed in `tootctl` CLI code and in boot ENV checker
 # https://docs.rubocop.org/rubocop-rails/cops_rails.html#railsexit
 Rails/Exit:
   Exclude:
-    - 'lib/mastodon/*_cli.rb'
+    - 'config/boot.rb'
-    - 'lib/mastodon/cli_helper.rb'
+    - 'lib/mastodon/cli/*.rb'
-    - 'lib/cli.rb'
 
 # Reason: Some single letter camel case files shouldn't be split
 # https://docs.rubocop.org/rubocop-rspec/cops_rspec.html#rspecfilepath

.rubocop_todo.yml

@@ -396,12 +396,6 @@ RSpec/ExpectChange:
     - 'spec/services/unsuspend_account_service_spec.rb'
     - 'spec/workers/scheduler/accounts_statuses_cleanup_scheduler_spec.rb'
 
-RSpec/ExpectInHook:
-  Exclude:
-    - 'spec/controllers/api/v1/media_controller_spec.rb'
-    - 'spec/controllers/settings/applications_controller_spec.rb'
-    - 'spec/lib/status_filter_spec.rb'
-
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: implicit, each, example
@@ -565,15 +559,6 @@ RSpec/PendingWithoutReason:
   Exclude:
     - 'spec/models/account_spec.rb'
 
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Strict, EnforcedStyle, AllowedExplicitMatchers.
-# SupportedStyles: inflected, explicit
-RSpec/PredicateMatcher:
-  Exclude:
-    - 'spec/controllers/api/v1/accounts/notes_controller_spec.rb'
-    - 'spec/models/user_spec.rb'
-    - 'spec/services/post_status_service_spec.rb'
-
 RSpec/StubbedMock:
   Exclude:
     - 'spec/controllers/api/base_controller_spec.rb'
@@ -715,12 +700,6 @@ Rails/DuplicateAssociation:
     - 'app/serializers/activitypub/collection_serializer.rb'
     - 'app/serializers/activitypub/note_serializer.rb'
 
-# Configuration parameters: Include.
-# Include: app/**/*.rb, config/**/*.rb, lib/**/*.rb
-Rails/Exit:
-  Exclude:
-    - 'config/boot.rb'
-
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/HasAndBelongsToMany:
@@ -855,9 +834,9 @@ Rails/SkipsModelValidations:
     - 'db/post_migrate/20220617202502_migrate_roles.rb'
     - 'db/post_migrate/20221101190723_backfill_admin_action_logs.rb'
     - 'db/post_migrate/20221206114142_backfill_admin_action_logs_again.rb'
-    - 'lib/cli.rb'
+    - 'lib/mastodon/cli/accounts.rb'
-    - 'lib/mastodon/accounts_cli.rb'
+    - 'lib/mastodon/cli/main.rb'
-    - 'lib/mastodon/maintenance_cli.rb'
+    - 'lib/mastodon/cli/maintenance.rb'
     - 'spec/controllers/api/v1/admin/accounts_controller_spec.rb'
     - 'spec/lib/activitypub/activity/follow_spec.rb'
     - 'spec/services/follow_service_spec.rb'
@@ -939,7 +918,7 @@ Rails/WhereExists:
     - 'app/validators/vote_validator.rb'
     - 'app/workers/move_worker.rb'
     - 'db/migrate/20190529143559_preserve_old_layout_for_existing_users.rb'
-    - 'lib/mastodon/email_domain_blocks_cli.rb'
+    - 'lib/mastodon/cli/email_domain_blocks.rb'
     - 'lib/tasks/tests.rake'
     - 'spec/controllers/api/v1/accounts/notes_controller_spec.rb'
     - 'spec/controllers/api/v1/tags_controller_spec.rb'
@@ -1001,7 +980,7 @@ Style/FormatStringToken:
   Exclude:
     - 'app/models/privacy_policy.rb'
     - 'config/initializers/devise.rb'
-    - 'lib/mastodon/maintenance_cli.rb'
+    - 'lib/mastodon/cli/maintenance.rb'
     - 'lib/paperclip/color_extractor.rb'
 
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -1446,9 +1425,9 @@ Style/GuardClause:
     - 'db/post_migrate/20220704024901_migrate_settings_to_user_roles.rb'
     - 'lib/devise/two_factor_ldap_authenticatable.rb'
     - 'lib/devise/two_factor_pam_authenticatable.rb'
-    - 'lib/mastodon/accounts_cli.rb'
+    - 'lib/mastodon/cli/accounts.rb'
-    - 'lib/mastodon/maintenance_cli.rb'
+    - 'lib/mastodon/cli/maintenance.rb'
-    - 'lib/mastodon/media_cli.rb'
+    - 'lib/mastodon/cli/media.rb'
     - 'lib/paperclip/attachment_extensions.rb'
     - 'lib/tasks/repo.rake'
 

app/controllers/api/v1/featured_tags_controller.rb

@@ -31,8 +31,4 @@ class Api::V1::FeaturedTagsController < Api::BaseController
   def set_featured_tags
     @featured_tags = current_account.featured_tags.order(statuses_count: :desc)
   end
-
-  def featured_tag_params
-    params.require(:name)
-  end
 end

app/controllers/media_controller.rb

@@ -46,7 +46,7 @@ class MediaController < ApplicationController
   end
 
   def allow_iframing
-    response.headers['X-Frame-Options'] = 'ALLOWALL'
+    response.headers.delete('X-Frame-Options')
   end
 
   def set_pack

app/controllers/statuses_controller.rb

@@ -46,7 +46,7 @@ class StatusesController < ApplicationController
     return not_found if @status.hidden? || @status.reblog?
 
     expires_in 180, public: true
-    response.headers['X-Frame-Options'] = 'ALLOWALL'
+    response.headers.delete('X-Frame-Options')
 
     render layout: 'embedded'
   end

app/helpers/application_helper.rb

@@ -52,7 +52,7 @@ module ApplicationHelper
     if closed_registrations? || omniauth_only?
       'https://joinmastodon.org/#getting-started'
     else
-      new_user_registration_path
+      ENV.fetch('SSO_ACCOUNT_SIGN_UP', new_user_registration_path)
     end
   end
 

app/javascript/mastodon/containers/media_container.jsx

@@ -73,6 +73,13 @@ export default class MediaContainer extends PureComponent {
   render () {
     const { locale, components } = this.props;
 
+    let handleOpenVideo;
+
+    // Don't offer to expand the video in a lightbox if we're in a frame
+    if (window.self === window.top) {
+      handleOpenVideo = this.handleOpenVideo;
+    }
+
     return (
       <IntlProvider locale={locale} messages={messages}>
         <>
@@ -89,7 +96,7 @@ export default class MediaContainer extends PureComponent {
 
               ...(componentName === 'Video' ? {
                 componentIndex: i,
-                onOpenVideo: this.handleOpenVideo,
+                onOpenVideo: handleOpenVideo,
               } : {
                 onOpenMedia: this.handleOpenMedia,
               }),

app/javascript/mastodon/features/interaction_modal/index.jsx

@@ -9,6 +9,7 @@ import { openModal, closeModal } from 'mastodon/actions/modal';
 
 const mapStateToProps = (state, { accountId }) => ({
   displayNameHtml: state.getIn(['accounts', accountId, 'display_name_html']),
+  signupUrl: state.getIn(['server', 'server', 'registrations', 'url'], '/auth/sign_up'),
 });
 
 const mapDispatchToProps = (dispatch) => ({
@@ -81,6 +82,7 @@ class InteractionModal extends PureComponent {
     url: PropTypes.string,
     type: PropTypes.oneOf(['reply', 'reblog', 'favourite', 'follow']),
     onSignupClick: PropTypes.func.isRequired,
+    signupUrl: PropTypes.string.isRequired,
   };
 
   handleSignupClick = () => {
@@ -88,7 +90,7 @@ class InteractionModal extends PureComponent {
   };
 
   render () {
-    const { url, type, displayNameHtml } = this.props;
+    const { url, type, displayNameHtml, signupUrl } = this.props;
 
     const name = <bdi dangerouslySetInnerHTML={{ __html: displayNameHtml }} />;
 
@@ -121,7 +123,7 @@ class InteractionModal extends PureComponent {
 
     if (registrationsOpen) {
       signupButton = (
-        <a href='/auth/sign_up' className='button button--block button-tertiary'>
+        <a href={signupUrl} className='button button--block button-tertiary'>
           <FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' />
         </a>
       );

app/javascript/mastodon/features/ui/components/header.jsx

@@ -16,6 +16,10 @@ const Account = connect(state => ({
   </Link>
 ));
 
+const mapStateToProps = (state) => ({
+  signupUrl: state.getIn(['server', 'server', 'registrations', 'url'], '/auth/sign_up'),
+});
+
 const mapDispatchToProps = (dispatch) => ({
   openClosedRegistrationsModal() {
     dispatch(openModal('CLOSED_REGISTRATIONS'));
@@ -31,11 +35,12 @@ class Header extends PureComponent {
   static propTypes = {
     openClosedRegistrationsModal: PropTypes.func,
     location: PropTypes.object,
+    signupUrl: PropTypes.string.isRequired,
   };
 
   render () {
     const { signedIn } = this.context.identity;
-    const { location, openClosedRegistrationsModal } = this.props;
+    const { location, openClosedRegistrationsModal, signupUrl } = this.props;
 
     let content;
 
@@ -51,7 +56,7 @@ class Header extends PureComponent {
 
       if (registrationsOpen) {
         signupButton = (
-          <a href='/auth/sign_up' className='button'>
+          <a href={signupUrl} className='button'>
             <FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' />
           </a>
         );
@@ -87,4 +92,4 @@ class Header extends PureComponent {
 
 }
 
-export default withRouter(connect(null, mapDispatchToProps)(Header));
+export default withRouter(connect(mapStateToProps, mapDispatchToProps)(Header));

app/javascript/mastodon/features/ui/components/sign_in_banner.jsx

@@ -1,11 +1,11 @@
 import { useCallback } from 'react';
 import { FormattedMessage } from 'react-intl';
-import { useDispatch } from 'react-redux';
+import { useAppDispatch, useAppSelector } from 'mastodon/store';
 import { registrationsOpen } from 'mastodon/initial_state';
 import { openModal } from 'mastodon/actions/modal';
 
 const SignInBanner = () => {
-  const dispatch = useDispatch();
+  const dispatch = useAppDispatch();
 
   const openClosedRegistrationsModal = useCallback(
     () => dispatch(openModal('CLOSED_REGISTRATIONS')),
@@ -14,9 +14,11 @@ const SignInBanner = () => {
 
   let signupButton;
 
+  const signupUrl = useAppSelector((state) => state.getIn(['server', 'server', 'registrations', 'url'], '/auth/sign_up'));
+
   if (registrationsOpen) {
     signupButton = (
-      <a href='/auth/sign_up' className='button button--block'>
+      <a href={signupUrl} className='button button--block'>
         <FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' />
       </a>
     );

app/models/identity.rb

@@ -13,7 +13,7 @@
 #
 
 class Identity < ApplicationRecord
-  belongs_to :user, dependent: :destroy
+  belongs_to :user
   validates :uid, presence: true, uniqueness: { scope: :provider }
   validates :provider, presence: true
 

app/serializers/rest/instance_serializer.rb

@@ -86,6 +86,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer
       enabled: registrations_enabled?,
       approval_required: Setting.registrations_mode == 'approved',
       message: registrations_enabled? ? nil : registrations_message,
+      url: ENV.fetch('SSO_ACCOUNT_SIGN_UP', nil),
     }
   end
 

bin/tootctl

@@ -2,11 +2,11 @@
 APP_PATH = File.expand_path('../config/application', __dir__)
 
 require_relative '../config/boot'
-require_relative '../lib/cli'
+require_relative '../lib/mastodon/cli/main'
 
 begin
   Chewy.strategy(:mastodon) do
-    Mastodon::CLI.start(ARGV)
+    Mastodon::CLI::Main.start(ARGV)
   end
 rescue Interrupt
   exit(130)

lib/mastodon/cli/accounts.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 require 'set'
-require_relative '../../config/boot'
+require_relative '../../../config/boot'
-require_relative '../../config/environment'
+require_relative '../../../config/environment'
-require_relative 'cli_helper'
+require_relative 'helper'
 
-module Mastodon
+module Mastodon::CLI
-  class AccountsCLI < Thor
+  class Accounts < Thor
-    include CLIHelper
+    include Helper
 
     def self.exit_on_failure?
       true

lib/mastodon/cli/cache.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative '../../config/boot'
+require_relative '../../../config/boot'
-require_relative '../../config/environment'
+require_relative '../../../config/environment'
-require_relative 'cli_helper'
+require_relative 'helper'
 
-module Mastodon
+module Mastodon::CLI
-  class CacheCLI < Thor
+  class Cache < Thor
-    include CLIHelper
+    include Helper
 
     def self.exit_on_failure?
       true

lib/mastodon/cli/canonical_email_blocks.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 require 'concurrent'
-require_relative '../../config/boot'
+require_relative '../../../config/boot'
-require_relative '../../config/environment'
+require_relative '../../../config/environment'
-require_relative 'cli_helper'
+require_relative 'helper'
 
-module Mastodon
+module Mastodon::CLI
-  class CanonicalEmailBlocksCLI < Thor
+  class CanonicalEmailBlocks < Thor
-    include CLIHelper
+    include Helper
 
     def self.exit_on_failure?
       true

lib/mastodon/cli/domains.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 require 'concurrent'
-require_relative '../../config/boot'
+require_relative '../../../config/boot'
-require_relative '../../config/environment'
+require_relative '../../../config/environment'
-require_relative 'cli_helper'
+require_relative 'helper'
 
-module Mastodon
+module Mastodon::CLI
-  class DomainsCLI < Thor
+  class Domains < Thor
-    include CLIHelper
+    include Helper
 
     def self.exit_on_failure?
       true

lib/mastodon/cli/email_domain_blocks.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 require 'concurrent'
-require_relative '../../config/boot'
+require_relative '../../../config/boot'
-require_relative '../../config/environment'
+require_relative '../../../config/environment'
-require_relative 'cli_helper'
+require_relative 'helper'
 
-module Mastodon
+module Mastodon::CLI
-  class EmailDomainBlocksCLI < Thor
+  class EmailDomainBlocks < Thor
-    include CLIHelper
+    include Helper
 
     def self.exit_on_failure?
       true

lib/mastodon/cli/emoji.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 require 'rubygems/package'
-require_relative '../../config/boot'
+require_relative '../../../config/boot'
-require_relative '../../config/environment'
+require_relative '../../../config/environment'
-require_relative 'cli_helper'
+require_relative 'helper'
 
-module Mastodon
+module Mastodon::CLI
-  class EmojiCLI < Thor
+  class Emoji < Thor
     def self.exit_on_failure?
       true
     end

lib/mastodon/cli/feeds.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative '../../config/boot'
+require_relative '../../../config/boot'
-require_relative '../../config/environment'
+require_relative '../../../config/environment'
-require_relative 'cli_helper'
+require_relative 'helper'
 
-module Mastodon
+module Mastodon::CLI
-  class FeedsCLI < Thor
+  class Feeds < Thor
-    include CLIHelper
+    include Helper
     include Redisable
 
     def self.exit_on_failure?

lib/mastodon/cli/helper.rb

@@ -9,8 +9,8 @@ HttpLog.configuration.logger = dev_null
 Paperclip.options[:log]      = false
 Chewy.logger                 = dev_null
 
-module Mastodon
+module Mastodon::CLI
-  module CLIHelper
+  module Helper
     def dry_run?
       options[:dry_run]
     end

lib/mastodon/cli/ip_blocks.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 require 'rubygems/package'
-require_relative '../../config/boot'
+require_relative '../../../config/boot'
-require_relative '../../config/environment'
+require_relative '../../../config/environment'
-require_relative 'cli_helper'
+require_relative 'helper'
 
-module Mastodon
+module Mastodon::CLI
-  class IpBlocksCLI < Thor
+  class IpBlocks < Thor
     def self.exit_on_failure?
       true
     end

lib/mastodon/cli/main.rb

@@ -1,73 +1,73 @@
 # frozen_string_literal: true
 
 require 'thor'
-require_relative 'mastodon/media_cli'
+require_relative 'media'
-require_relative 'mastodon/emoji_cli'
+require_relative 'emoji'
-require_relative 'mastodon/accounts_cli'
+require_relative 'accounts'
-require_relative 'mastodon/feeds_cli'
+require_relative 'feeds'
-require_relative 'mastodon/search_cli'
+require_relative 'search'
-require_relative 'mastodon/settings_cli'
+require_relative 'settings'
-require_relative 'mastodon/statuses_cli'
+require_relative 'statuses'
-require_relative 'mastodon/domains_cli'
+require_relative 'domains'
-require_relative 'mastodon/preview_cards_cli'
+require_relative 'preview_cards'
-require_relative 'mastodon/cache_cli'
+require_relative 'cache'
-require_relative 'mastodon/upgrade_cli'
+require_relative 'upgrade'
-require_relative 'mastodon/email_domain_blocks_cli'
+require_relative 'email_domain_blocks'
-require_relative 'mastodon/canonical_email_blocks_cli'
+require_relative 'canonical_email_blocks'
-require_relative 'mastodon/ip_blocks_cli'
+require_relative 'ip_blocks'
-require_relative 'mastodon/maintenance_cli'
+require_relative 'maintenance'
-require_relative 'mastodon/version'
+require_relative '../version'
 
-module Mastodon
+module Mastodon::CLI
-  class CLI < Thor
+  class Main < Thor
     def self.exit_on_failure?
       true
     end
 
     desc 'media SUBCOMMAND ...ARGS', 'Manage media files'
-    subcommand 'media', Mastodon::MediaCLI
+    subcommand 'media', Media
 
     desc 'emoji SUBCOMMAND ...ARGS', 'Manage custom emoji'
-    subcommand 'emoji', Mastodon::EmojiCLI
+    subcommand 'emoji', Emoji
 
     desc 'accounts SUBCOMMAND ...ARGS', 'Manage accounts'
-    subcommand 'accounts', Mastodon::AccountsCLI
+    subcommand 'accounts', Accounts
 
     desc 'feeds SUBCOMMAND ...ARGS', 'Manage feeds'
-    subcommand 'feeds', Mastodon::FeedsCLI
+    subcommand 'feeds', Feeds
 
     desc 'search SUBCOMMAND ...ARGS', 'Manage the search engine'
-    subcommand 'search', Mastodon::SearchCLI
+    subcommand 'search', Search
 
     desc 'settings SUBCOMMAND ...ARGS', 'Manage dynamic settings'
-    subcommand 'settings', Mastodon::SettingsCLI
+    subcommand 'settings', Settings
 
     desc 'statuses SUBCOMMAND ...ARGS', 'Manage statuses'
-    subcommand 'statuses', Mastodon::StatusesCLI
+    subcommand 'statuses', Statuses
 
     desc 'domains SUBCOMMAND ...ARGS', 'Manage account domains'
-    subcommand 'domains', Mastodon::DomainsCLI
+    subcommand 'domains', Domains
 
     desc 'preview_cards SUBCOMMAND ...ARGS', 'Manage preview cards'
-    subcommand 'preview_cards', Mastodon::PreviewCardsCLI
+    subcommand 'preview_cards', PreviewCards
 
     desc 'cache SUBCOMMAND ...ARGS', 'Manage cache'
-    subcommand 'cache', Mastodon::CacheCLI
+    subcommand 'cache', Cache
 
     desc 'upgrade SUBCOMMAND ...ARGS', 'Various version upgrade utilities'
-    subcommand 'upgrade', Mastodon::UpgradeCLI
+    subcommand 'upgrade', Upgrade
 
     desc 'email_domain_blocks SUBCOMMAND ...ARGS', 'Manage e-mail domain blocks'
-    subcommand 'email_domain_blocks', Mastodon::EmailDomainBlocksCLI
+    subcommand 'email_domain_blocks', EmailDomainBlocks
 
     desc 'ip_blocks SUBCOMMAND ...ARGS', 'Manage IP blocks'
-    subcommand 'ip_blocks', Mastodon::IpBlocksCLI
+    subcommand 'ip_blocks', IpBlocks
 
     desc 'canonical_email_blocks SUBCOMMAND ...ARGS', 'Manage canonical e-mail blocks'
-    subcommand 'canonical_email_blocks', Mastodon::CanonicalEmailBlocksCLI
+    subcommand 'canonical_email_blocks', CanonicalEmailBlocks
 
     desc 'maintenance SUBCOMMAND ...ARGS', 'Various maintenance utilities'
-    subcommand 'maintenance', Mastodon::MaintenanceCLI
+    subcommand 'maintenance', Maintenance
 
     option :dry_run, type: :boolean
     desc 'self-destruct', 'Erase the server from the federation'

lib/mastodon/cli/maintenance.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 require 'tty-prompt'
-require_relative '../../config/boot'
+require_relative '../../../config/boot'
-require_relative '../../config/environment'
+require_relative '../../../config/environment'
-require_relative 'cli_helper'
+require_relative 'helper'
 
-module Mastodon
+module Mastodon::CLI
-  class MaintenanceCLI < Thor
+  class Maintenance < Thor
-    include CLIHelper
+    include Helper
 
     def self.exit_on_failure?
       true

lib/mastodon/cli/media.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require_relative '../../config/boot'
+require_relative '../../../config/boot'
-require_relative '../../config/environment'
+require_relative '../../../config/environment'
-require_relative 'cli_helper'
+require_relative 'helper'
 
-module Mastodon
+module Mastodon::CLI
-  class MediaCLI < Thor
+  class Media < Thor
     include ActionView::Helpers::NumberHelper
-    include CLIHelper
+    include Helper
 
     VALID_PATH_SEGMENTS_SIZE = [7, 10].freeze
 

lib/mastodon/cli/preview_cards.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 require 'tty-prompt'
-require_relative '../../config/boot'
+require_relative '../../../config/boot'
-require_relative '../../config/environment'
+require_relative '../../../config/environment'
-require_relative 'cli_helper'
+require_relative 'helper'
 
-module Mastodon
+module Mastodon::CLI
-  class PreviewCardsCLI < Thor
+  class PreviewCards < Thor
     include ActionView::Helpers::NumberHelper
-    include CLIHelper
+    include Helper
 
     def self.exit_on_failure?
       true

lib/mastodon/cli/search.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative '../../config/boot'
+require_relative '../../../config/boot'
-require_relative '../../config/environment'
+require_relative '../../../config/environment'
-require_relative 'cli_helper'
+require_relative 'helper'
 
-module Mastodon
+module Mastodon::CLI
-  class SearchCLI < Thor
+  class Search < Thor
-    include CLIHelper
+    include Helper
 
     # Indices are sorted by amount of data to be expected in each, so that
     # smaller indices can go online sooner

lib/mastodon/cli/settings.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative '../../config/boot'
+require_relative '../../../config/boot'
-require_relative '../../config/environment'
+require_relative '../../../config/environment'
-require_relative 'cli_helper'
+require_relative 'helper'
 
-module Mastodon
+module Mastodon::CLI
-  class RegistrationsCLI < Thor
+  class Registrations < Thor
     def self.exit_on_failure?
       true
     end
@@ -37,8 +37,8 @@ module Mastodon
     end
   end
 
-  class SettingsCLI < Thor
+  class Settings < Thor
     desc 'registrations SUBCOMMAND ...ARGS', 'Manage state of registrations'
-    subcommand 'registrations', RegistrationsCLI
+    subcommand 'registrations', Registrations
   end
 end

lib/mastodon/cli/statuses.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative '../../config/boot'
+require_relative '../../../config/boot'
-require_relative '../../config/environment'
+require_relative '../../../config/environment'
-require_relative 'cli_helper'
+require_relative 'helper'
 
-module Mastodon
+module Mastodon::CLI
-  class StatusesCLI < Thor
+  class Statuses < Thor
-    include CLIHelper
+    include Helper
     include ActionView::Helpers::NumberHelper
 
     def self.exit_on_failure?

lib/mastodon/cli/upgrade.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative '../../config/boot'
+require_relative '../../../config/boot'
-require_relative '../../config/environment'
+require_relative '../../../config/environment'
-require_relative 'cli_helper'
+require_relative 'helper'
 
-module Mastodon
+module Mastodon::CLI
-  class UpgradeCLI < Thor
+  class Upgrade < Thor
-    include CLIHelper
+    include Helper
 
     def self.exit_on_failure?
       true

spec/controllers/api/v1/accounts/notes_controller_spec.rb

@@ -43,7 +43,7 @@ describe Api::V1::Accounts::NotesController do
 
       it 'does not create account note' do
         subject
-        expect(AccountNote.where(account_id: user.account.id, target_account_id: account.id).exists?).to be_falsey
+        expect(AccountNote.where(account_id: user.account.id, target_account_id: account.id)).to_not exist
       end
     end
   end

spec/controllers/api/v1/media_controller_spec.rb

@@ -15,23 +15,19 @@ RSpec.describe Api::V1::MediaController do
   describe 'POST #create' do
     describe 'with paperclip errors' do
       context 'when imagemagick cant identify the file type' do
-        before do
+        it 'returns http 422' do
           expect_any_instance_of(Account).to receive_message_chain(:media_attachments, :create!).and_raise(Paperclip::Errors::NotIdentifiedByImageMagickError)
           post :create, params: { file: fixture_file_upload('attachment.jpg', 'image/jpeg') }
-        end
 
-        it 'returns http 422' do
           expect(response).to have_http_status(422)
         end
       end
 
       context 'when there is a generic error' do
-        before do
+        it 'returns http 422' do
           expect_any_instance_of(Account).to receive_message_chain(:media_attachments, :create!).and_raise(Paperclip::Error)
           post :create, params: { file: fixture_file_upload('attachment.jpg', 'image/jpeg') }
-        end
 
-        it 'returns http 422' do
           expect(response).to have_http_status(500)
         end
       end

spec/controllers/settings/applications_controller_spec.rb

@@ -182,12 +182,10 @@ describe Settings::ApplicationsController do
   describe 'regenerate' do
     let(:token) { user.token_for_app(app) }
 
-    before do
+    it 'creates new token' do
       expect(token).to_not be_nil
       post :regenerate, params: { id: app.id }
-    end
 
-    it 'creates new token' do
       expect(user.token_for_app(app)).to_not eql(token)
     end
   end

spec/lib/mastodon/cli/ip_blocks_spec.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
-require 'mastodon/ip_blocks_cli'
+require 'mastodon/cli/ip_blocks'
 
-RSpec.describe Mastodon::IpBlocksCLI do
+RSpec.describe Mastodon::CLI::IpBlocks do
   let(:cli) { described_class.new }
 
   describe '#add' do

spec/lib/mastodon/cli/main_spec.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
-require 'cli'
+require 'mastodon/cli/main'
 
-describe Mastodon::CLI do
+describe Mastodon::CLI::Main do
   describe 'version' do
     it 'returns the Mastodon version' do
       expect { described_class.new.invoke(:version) }.to output(

spec/lib/mastodon/cli/settings_spec.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
-require 'mastodon/settings_cli'
+require 'mastodon/cli/settings'
 
-RSpec.describe Mastodon::SettingsCLI do
+RSpec.describe Mastodon::CLI::Settings do
   describe 'subcommand "registrations"' do
-    let(:cli) { Mastodon::RegistrationsCLI.new }
+    let(:cli) { Mastodon::CLI::Registrations.new }
 
     before do
       Setting.registrations_mode = nil

spec/lib/status_filter_spec.rb

@@ -7,7 +7,7 @@ describe StatusFilter do
     let(:status) { Fabricate(:status) }
 
     context 'without an account' do
-      subject { described_class.new(status, nil) }
+      subject(:filter) { described_class.new(status, nil) }
 
       context 'when there are no connections' do
         it { is_expected.to_not be_filtered }
@@ -22,16 +22,16 @@ describe StatusFilter do
       end
 
       context 'when status policy does not allow show' do
-        before do
+        it 'filters the status' do
           expect_any_instance_of(StatusPolicy).to receive(:show?).and_return(false)
-        end
 
-        it { is_expected.to be_filtered }
+          expect(filter).to be_filtered
+        end
       end
     end
 
     context 'with real account' do
-      subject { described_class.new(status, account) }
+      subject(:filter) { described_class.new(status, account) }
 
       let(:account) { Fabricate(:account) }
 
@@ -73,11 +73,11 @@ describe StatusFilter do
       end
 
       context 'when status policy does not allow show' do
-        before do
+        it 'filters the status' do
           expect_any_instance_of(StatusPolicy).to receive(:show?).and_return(false)
-        end
 
-        it { is_expected.to be_filtered }
+          expect(filter).to be_filtered
+        end
       end
     end
   end

spec/models/user_spec.rb

@@ -115,19 +115,19 @@ RSpec.describe User do
     it 'allows a non-blacklisted user to be created' do
       user = User.new(email: 'foo@example.com', account: account, password: password, agreement: true)
 
-      expect(user.valid?).to be_truthy
+      expect(user).to be_valid
     end
 
     it 'does not allow a blacklisted user to be created' do
       user = User.new(email: 'foo@mvrht.com', account: account, password: password, agreement: true)
 
-      expect(user.valid?).to be_falsey
+      expect(user).to_not be_valid
     end
 
     it 'does not allow a subdomain blacklisted user to be created' do
       user = User.new(email: 'foo@mvrht.com.topdomain.tld', account: account, password: password, agreement: true)
 
-      expect(user.valid?).to be_falsey
+      expect(user).to_not be_valid
     end
   end
 
@@ -350,17 +350,17 @@ RSpec.describe User do
 
     it 'does not allow a user to be created unless they are whitelisted' do
       user = User.new(email: 'foo@example.com', account: account, password: password, agreement: true)
-      expect(user.valid?).to be_falsey
+      expect(user).to_not be_valid
     end
 
     it 'allows a user to be created if they are whitelisted' do
       user = User.new(email: 'foo@mastodon.space', account: account, password: password, agreement: true)
-      expect(user.valid?).to be_truthy
+      expect(user).to be_valid
     end
 
     it 'does not allow a user with a whitelisted top domain as subdomain in their email address to be created' do
       user = User.new(email: 'foo@mastodon.space.userdomain.com', account: account, password: password, agreement: true)
-      expect(user.valid?).to be_falsey
+      expect(user).to_not be_valid
     end
 
     context do
@@ -374,7 +374,7 @@ RSpec.describe User do
         Rails.configuration.x.email_domains_blacklist = 'blacklisted.mastodon.space'
 
         user = User.new(email: 'foo@blacklisted.mastodon.space', account: account, password: password)
-        expect(user.valid?).to be_falsey
+        expect(user).to_not be_valid
       end
     end
   end

spec/requests/backups_spec.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Backups' do
+  include RoutingHelper
+
+  describe 'GET backups#download' do
+    let(:user) { Fabricate(:user) }
+    let(:backup) { Fabricate(:backup, user: user) }
+
+    before do
+      sign_in user
+    end
+
+    it 'Downloads a user backup' do
+      get download_backup_path(backup)
+
+      expect(response).to redirect_to(backup_dump_url)
+    end
+
+    def backup_dump_url
+      full_asset_url(backup.dump.url)
+    end
+  end
+end

spec/services/post_status_service_spec.rb

@@ -48,7 +48,7 @@ RSpec.describe PostStatusService, type: :service do
       expect(status.params['text']).to eq 'Hi future!'
       expect(status.params['media_ids']).to eq [media.id]
       expect(media.reload.status).to be_nil
-      expect(Status.where(text: 'Hi future!').exists?).to be_falsey
+      expect(Status.where(text: 'Hi future!')).to_not exist
     end
 
     it 'does not change statuses count' do