.nvmrc

@@ -1 +1 @@
-20.15
+20.14

.rubocop/rails.yml

@@ -5,6 +5,10 @@ Rails/FilePath:
 Rails/HttpStatus:
   EnforcedStyle: numeric
 
+Rails/LexicallyScopedActionFilter:
+  Exclude:
+    - app/controllers/auth/* # Conflicts with `Lint/UselessMethodDefinition` for inherited controller actions
+
 Rails/NegateInclude:
   Enabled: false
 

.rubocop_todo.yml

@@ -31,6 +31,14 @@ Rails/OutputSafety:
   Exclude:
     - 'config/initializers/simple_form.rb'
 
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AllowedMethods, AllowedPatterns.
+# AllowedMethods: ==, equal?, eql?
+Style/ClassEqualityComparison:
+  Exclude:
+    - 'app/helpers/jsonld_helper.rb'
+    - 'app/serializers/activitypub/outbox_serializer.rb'
+
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowedVars.
 Style/FetchEnvVar:

Dockerfile

@@ -19,9 +19,9 @@ ARG NODE_MAJOR_VERSION="20"
 # Debian image to use for base image, change with [--build-arg DEBIAN_VERSION="bookworm"]
 ARG DEBIAN_VERSION="bookworm"
 # 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
+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
+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
@@ -117,7 +117,7 @@ RUN \
   ;
 
 # Create temporary build layer from base image
-FROM ruby AS build
+FROM ruby as build
 
 # Copy Node package configuration files into working directory
 COPY package.json yarn.lock .yarnrc.yml /opt/mastodon/
@@ -185,7 +185,7 @@ RUN \
   corepack prepare --activate;
 
 # Create temporary libvips specific build layer from build layer
-FROM build AS libvips
+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
@@ -205,7 +205,7 @@ RUN \
   ninja install;
 
 # Create temporary ffmpeg specific build layer from build layer
-FROM build AS ffmpeg
+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
@@ -247,7 +247,7 @@ RUN \
   make install;
 
 # Create temporary bundler specific build layer from build layer
-FROM build AS bundler
+FROM build as bundler
 
 ARG TARGETPLATFORM
 
@@ -269,7 +269,7 @@ RUN \
   bundle install -j"$(nproc)";
 
 # Create temporary node specific build layer from build layer
-FROM build AS yarn
+FROM build as yarn
 
 ARG TARGETPLATFORM
 
@@ -286,7 +286,7 @@ RUN \
   yarn workspaces focus --production @mastodon/mastodon;
 
 # Create temporary assets build layer from build layer
-FROM build AS precompiler
+FROM build as precompiler
 
 # Copy Mastodon sources into precompiler layer
 COPY . /opt/mastodon/
@@ -310,7 +310,7 @@ RUN \
   rm -fr /opt/mastodon/tmp;
 
 # Prep final Mastodon Ruby layer
-FROM ruby AS mastodon
+FROM ruby as mastodon
 
 ARG TARGETPLATFORM
 

Gemfile

@@ -69,7 +69,7 @@ gem 'oj', '~> 3.14'
 gem 'ox', '~> 2.14'
 gem 'parslet'
 gem 'premailer-rails'
-gem 'public_suffix', '~> 6.0'
+gem 'public_suffix', '~> 5.0'
 gem 'pundit', '~> 2.3'
 gem 'rack-attack', '~> 6.6'
 gem 'rack-cors', '~> 2.0', require: 'rack/cors'
@@ -105,7 +105,7 @@ gem 'private_address_check', '~> 0.5'
 gem 'opentelemetry-api', '~> 1.2.5'
 
 group :opentelemetry do
-  gem 'opentelemetry-exporter-otlp', '~> 0.28.0', require: false
+  gem 'opentelemetry-exporter-otlp', '~> 0.27.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

Gemfile.lock

@@ -89,8 +89,8 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
     aes_key_wrap (1.1.0)
     android_key_attestation (0.3.0)
     annotate (3.2.0)
@@ -143,7 +143,7 @@ GEM
     brpoplpush-redis_script (0.1.3)
       concurrent-ruby (~> 1.0, >= 1.0.5)
       redis (>= 1.0, < 6)
-    builder (3.3.0)
+    builder (3.2.4)
     bundler-audit (0.9.1)
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
@@ -195,7 +195,7 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    devise-two-factor (5.1.0)
+    devise-two-factor (5.0.0)
       activesupport (~> 7.0)
       devise (~> 4.0)
       railties (~> 7.0)
@@ -226,7 +226,7 @@ GEM
       htmlentities (~> 4.3.3)
       launchy (~> 2.1)
       mail (~> 2.7)
-    erubi (1.13.0)
+    erubi (1.12.0)
     et-orbi (1.2.11)
       tzinfo
     excon (0.110.0)
@@ -490,8 +490,8 @@ GEM
     opentelemetry-api (1.2.5)
     opentelemetry-common (0.20.1)
       opentelemetry-api (~> 1.0)
-    opentelemetry-exporter-otlp (0.28.0)
-      google-protobuf (>= 3.18)
+    opentelemetry-exporter-otlp (0.27.0)
+      google-protobuf (~> 3.14)
       googleapis-common-protos-types (~> 1.3)
       opentelemetry-api (~> 1.1)
       opentelemetry-common (~> 0.20)
@@ -603,7 +603,7 @@ GEM
       railties (>= 7.0.0)
     psych (5.1.2)
       stringio
-    public_suffix (6.0.0)
+    public_suffix (5.1.1)
     puma (6.4.2)
       nio4r (~> 2.0)
     pundit (2.3.2)
@@ -676,7 +676,7 @@ GEM
       link_header (~> 0.0, >= 0.0.8)
     rdf-normalize (0.7.0)
       rdf (~> 3.3)
-    rdoc (6.7.0)
+    rdoc (6.6.3.1)
       psych (>= 4.0.0)
     redcarpet (3.6.0)
     redis (4.8.1)
@@ -974,7 +974,7 @@ DEPENDENCIES
   omniauth-saml (~> 2.0)
   omniauth_openid_connect (~> 0.6.1)
   opentelemetry-api (~> 1.2.5)
-  opentelemetry-exporter-otlp (~> 0.28.0)
+  opentelemetry-exporter-otlp (~> 0.27.0)
   opentelemetry-instrumentation-active_job (~> 0.7.1)
   opentelemetry-instrumentation-active_model_serializers (~> 0.20.1)
   opentelemetry-instrumentation-concurrent_ruby (~> 0.21.2)
@@ -996,7 +996,7 @@ DEPENDENCIES
   premailer-rails
   private_address_check (~> 0.5)
   propshaft
-  public_suffix (~> 6.0)
+  public_suffix (~> 5.0)
   puma (~> 6.3)
   pundit (~> 2.3)
   rack (~> 2.2.7)

app/controllers/auth/registrations_controller.rb

@@ -25,14 +25,6 @@ class Auth::RegistrationsController < Devise::RegistrationsController
     super(&:build_invite_request)
   end
 
-  def edit # rubocop:disable Lint/UselessMethodDefinition
-    super
-  end
-
-  def create # rubocop:disable Lint/UselessMethodDefinition
-    super
-  end
-
   def update
     super do |resource|
       resource.clear_other_sessions(current_session.session_id) if resource.saved_change_to_encrypted_password?

app/helpers/jsonld_helper.rb

@@ -141,7 +141,7 @@ module JsonLdHelper
   def safe_for_forwarding?(original, compacted)
     original.without('@context', 'signature').all? do |key, value|
       compacted_value = compacted[key]
-      return false unless value.instance_of?(compacted_value.class)
+      return false unless value.class == compacted_value.class
 
       if value.is_a?(Hash)
         safe_for_forwarding?(value, compacted_value)

app/lib/cache_buster.rb

@@ -2,8 +2,13 @@
 
 class CacheBuster
   def initialize(options = {})
-    @secret_header = options[:secret_header]
-    @secret = options[:secret]
+    Rails.application.deprecators[:mastodon].warn('Default values for the cache buster secret header name and values will be removed in Mastodon 4.3. Please set them explicitely if you rely on those.') unless options[:http_method] || (options[:secret] && options[:secret_header])
+
+    @secret_header = options[:secret_header] ||
+                     (options[:http_method] ? nil : 'Secret-Header')
+    @secret = options[:secret] ||
+              (options[:http_method] ? nil : 'True')
+
     @http_method = options[:http_method] || 'GET'
   end
 

app/serializers/activitypub/outbox_serializer.rb

@@ -2,7 +2,7 @@
 
 class ActivityPub::OutboxSerializer < ActivityPub::CollectionSerializer
   def self.serializer_for(model, options)
-    if model.instance_of?(::ActivityPub::ActivityPresenter)
+    if model.class.name == 'ActivityPub::ActivityPresenter'
       ActivityPub::ActivitySerializer
     else
       super

db/migrate/20160227230233_add_attachment_avatar_to_accounts.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class AddAttachmentAvatarToAccounts < ActiveRecord::Migration[4.2]
-  def up
+  def self.up
     change_table :accounts do |t|
       # The following corresponds to `t.attachment :avatar` in an older version of Paperclip
       t.string :avatar_file_name
@@ -11,7 +11,7 @@ class AddAttachmentAvatarToAccounts < ActiveRecord::Migration[4.2]
     end
   end
 
-  def down
+  def self.down
     remove_attachment :accounts, :avatar
   end
 end

db/migrate/20160305115639_add_devise_to_users.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class AddDeviseToUsers < ActiveRecord::Migration[4.2]
-  def up
+  def self.up
     change_table(:users, bulk: true) do |t|
       ## Database authenticatable
       t.string :encrypted_password, null: false, default: ''
@@ -24,7 +24,7 @@ class AddDeviseToUsers < ActiveRecord::Migration[4.2]
     add_index :users, :reset_password_token, unique: true
   end
 
-  def down
+  def self.down
     remove_index :users, :reset_password_token
 
     remove_column :users, :encrypted_password

db/migrate/20160312193225_add_attachment_header_to_accounts.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class AddAttachmentHeaderToAccounts < ActiveRecord::Migration[4.2]
-  def up
+  def self.up
     change_table :accounts do |t|
       # The following corresponds to `t.attachment :header` in an older version of Paperclip
       t.string :header_file_name
@@ -11,7 +11,7 @@ class AddAttachmentHeaderToAccounts < ActiveRecord::Migration[4.2]
     end
   end
 
-  def down
+  def self.down
     remove_attachment :accounts, :header
   end
 end

db/migrate/20161006213403_rails_settings_migration.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class RailsSettingsMigration < ActiveRecord::Migration[5.0]
-  def up
+  def self.up
     create_table :settings do |t|
       t.string     :var, null: false
       t.text       :value
@@ -11,7 +11,7 @@ class RailsSettingsMigration < ActiveRecord::Migration[5.0]
     add_index :settings, [:target_type, :target_id, :var], unique: true
   end
 
-  def down
+  def self.down
     drop_table :settings
   end
 end

db/migrate/20170330164118_add_attachment_data_to_imports.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class AddAttachmentDataToImports < ActiveRecord::Migration[4.2]
-  def up
+  def self.up
     change_table :imports do |t|
       # The following corresponds to `t.attachment :data` in an older version of Paperclip
       t.string :data_file_name
@@ -11,7 +11,7 @@ class AddAttachmentDataToImports < ActiveRecord::Migration[4.2]
     end
   end
 
-  def down
+  def self.down
     remove_attachment :imports, :data
   end
 end

spec/lib/cache_buster_spec.rb

@@ -28,6 +28,14 @@ describe CacheBuster do
     end
 
     context 'when using default options' do
+      around do |example|
+        # Disables the CacheBuster.new deprecation warning about default arguments.
+        # Remove this `silence` block when default arg support is removed from CacheBuster
+        Rails.application.deprecators[:mastodon].silence do
+          example.run
+        end
+      end
+
       include_examples 'makes_request'
     end
 

streaming/Dockerfile

@@ -13,14 +13,7 @@ ARG NODE_MAJOR_VERSION="20"
 # Debian image to use for base image, change with [--build-arg DEBIAN_VERSION="bookworm"]
 ARG DEBIAN_VERSION="bookworm"
 # 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 streaming
-
-# Resulting version string is vX.X.X-MASTODON_VERSION_PRERELEASE+MASTODON_VERSION_METADATA
-# Example: v4.3.0-nightly.2023.11.09+pr-123456
-# Overwrite existence of 'alpha.X' in version.rb [--build-arg MASTODON_VERSION_PRERELEASE="nightly.2023.11.09"]
-ARG MASTODON_VERSION_PRERELEASE=""
-# Append build metadata or fork information to version.rb [--build-arg MASTODON_VERSION_METADATA="pr-123456"]
-ARG MASTODON_VERSION_METADATA=""
+FROM docker.io/node:${NODE_MAJOR_VERSION}-${DEBIAN_VERSION}-slim as streaming
 
 # Timezone used by the Docker container and runtime, change with [--build-arg TZ=Europe/Berlin]
 ARG TZ="Etc/UTC"

yarn.lock

@@ -8924,18 +8924,17 @@ __metadata:
   linkType: hard
 
 "glob@npm:^10.2.2, glob@npm:^10.2.6, glob@npm:^10.3.10":
-  version: 10.4.2
-  resolution: "glob@npm:10.4.2"
+  version: 10.4.1
+  resolution: "glob@npm:10.4.1"
   dependencies:
     foreground-child: "npm:^3.1.0"
     jackspeak: "npm:^3.1.2"
     minimatch: "npm:^9.0.4"
     minipass: "npm:^7.1.2"
-    package-json-from-dist: "npm:^1.0.0"
     path-scurry: "npm:^1.11.1"
   bin:
     glob: dist/esm/bin.mjs
-  checksum: 10c0/2c7296695fa75a935f3ad17dc62e4e170a8bb8752cf64d328be8992dd6ad40777939003754e10e9741ff8fbe43aa52fba32d6930d0ffa0e3b74bc3fb5eebaa2f
+  checksum: 10c0/77f2900ed98b9cc2a0e1901ee5e476d664dae3cd0f1b662b8bfd4ccf00d0edc31a11595807706a274ca10e1e251411bbf2e8e976c82bed0d879a9b89343ed379
   languageName: node
   linkType: hard
 
@@ -12669,13 +12668,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"package-json-from-dist@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "package-json-from-dist@npm:1.0.0"
-  checksum: 10c0/e3ffaf6ac1040ab6082a658230c041ad14e72fabe99076a2081bb1d5d41210f11872403fc09082daf4387fc0baa6577f96c9c0e94c90c394fd57794b66aa4033
-  languageName: node
-  linkType: hard
-
 "pako@npm:~1.0.5":
   version: 1.0.11
   resolution: "pako@npm:1.0.11"