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

lib/mastodon/cli/accounts.rb

@@ -295,7 +295,7 @@ module Mastodon::CLI
       skip_threshold = 7.days.ago
       skip_domains   = Concurrent::Set.new
 
-      query = Account.remote.where(protocol: :activitypub)
+      query = Account.remote.activitypub
       query = query.where(domain: domains) unless domains.empty?
 
       processed, culled = parallelize_with_progress(query.partitioned) do |account|

lib/mastodon/cli/ip_blocks.rb

@@ -105,7 +105,7 @@ module Mastodon::CLI
       tools. Only blocks with no_access severity are returned.
     LONG_DESC
     def export
-      IpBlock.where(severity: :no_access).find_each do |ip_block|
+      IpBlock.severity_no_access.find_each do |ip_block|
         case options[:format]
         when 'nginx'
           say "deny #{ip_block.ip}/#{ip_block.ip.prefix};"

lib/mastodon/cli/media.rb

@@ -277,7 +277,7 @@ module Mastodon::CLI
 
     desc 'usage', 'Calculate disk space consumed by Mastodon'
     def usage
-      say("Attachments:\t#{number_to_human_size(MediaAttachment.sum(Arel.sql('COALESCE(file_file_size, 0) + COALESCE(thumbnail_file_size, 0)')))} (#{number_to_human_size(MediaAttachment.where(account: Account.local).sum(Arel.sql('COALESCE(file_file_size, 0) + COALESCE(thumbnail_file_size, 0)')))} local)")
+      say("Attachments:\t#{number_to_human_size(media_attachment_storage_size)} (#{number_to_human_size(local_media_attachment_storage_size)} local)")
       say("Custom emoji:\t#{number_to_human_size(CustomEmoji.sum(:image_file_size))} (#{number_to_human_size(CustomEmoji.local.sum(:image_file_size))} local)")
       say("Preview cards:\t#{number_to_human_size(PreviewCard.sum(:image_file_size))}")
       say("Avatars:\t#{number_to_human_size(Account.sum(:avatar_file_size))} (#{number_to_human_size(Account.local.sum(:avatar_file_size))} local)")
@@ -317,6 +317,22 @@ module Mastodon::CLI
 
     private
 
+    def media_attachment_storage_size
+      MediaAttachment.sum(file_and_thumbnail_size_sql)
+    end
+
+    def local_media_attachment_storage_size
+      MediaAttachment.where(account: Account.local).sum(file_and_thumbnail_size_sql)
+    end
+
+    def file_and_thumbnail_size_sql
+      Arel.sql(
+        <<~SQL.squish
+          COALESCE(file_file_size, 0) + COALESCE(thumbnail_file_size, 0)
+        SQL
+      )
+    end
+
     PRELOAD_MODEL_WHITELIST = %w(
       Account
       Backup