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

Conflicts:
- `config/settings.yml`:
  Not a real conflict, upstream removed settings that are identical in glitch-soc
  but textually adjacent to glitch-soc-only settings.
  Removed what upstream removed.

lib/exceptions.rb

@@ -14,6 +14,7 @@ module Mastodon
   class InvalidParameterError < Error; end
   class SignatureVerificationError < Error; end
   class MalformedHeaderError < Error; end
+  class RecursionLimitExceededError < Error; end
 
   class UnexpectedResponseError < Error
     attr_reader :response

lib/mastodon/cli/media.rb

@@ -313,9 +313,7 @@ module Mastodon::CLI
     end
 
     def combined_media_sum
-      Arel.sql(<<~SQL.squish)
-        COALESCE(file_file_size, 0) + COALESCE(thumbnail_file_size, 0)
-      SQL
+      MediaAttachment.combined_media_file_size
     end
 
     def preload_records_from_mixed_objects(objects)

lib/mastodon/worker_batch_middleware.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class Mastodon::WorkerBatchMiddleware
+  def call(_worker, msg, _queue, _redis_pool = nil)
+    if (batch = Thread.current[:batch])
+      batch.add_jobs([msg['jid']])
+    end
+
+    yield
+  end
+end