Merge remote-tracking branch 'parent/main' into upstream-20241113

lib/mastodon/cli/accounts.rb

@@ -321,7 +321,9 @@ module Mastodon::CLI
 
       unless skip_domains.empty?
         say('The following domains were not available during the check:', :yellow)
-        skip_domains.each { |domain| say("    #{domain}") }
+        shell.indent(2) do
+          skip_domains.each { |domain| say(domain) }
+        end
       end
     end
 

lib/mastodon/cli/cache.rb

@@ -52,7 +52,7 @@ module Mastodon::CLI
       account.account_stat.tap do |account_stat|
         account_stat.following_count = account.active_relationships.count
         account_stat.followers_count = account.passive_relationships.count
-        account_stat.statuses_count  = account.statuses.where.not(visibility: :direct).count
+        account_stat.statuses_count  = account.statuses.not_direct_visibility.count
 
         account_stat.save if account_stat.changed?
       end
@@ -60,7 +60,7 @@ module Mastodon::CLI
 
     def recount_status_stats(status)
       status.status_stat.tap do |status_stat|
-        status_stat.replies_count    = status.replies.where.not(visibility: :direct).count
+        status_stat.replies_count    = status.replies.not_direct_visibility.count
         status_stat.reblogs_count    = status.reblogs.count
         status_stat.favourites_count = status.favourites.count
         status_stat.emoji_reactions  = status.generate_emoji_reactions_grouped_by_name

lib/mastodon/cli/email_domain_blocks.rb

@@ -7,11 +7,13 @@ module Mastodon::CLI
   class EmailDomainBlocks < Base
     desc 'list', 'List blocked e-mail domains'
     def list
-      EmailDomainBlock.where(parent_id: nil).find_each do |entry|
-        say(entry.domain.to_s, :white)
+      EmailDomainBlock.parents.find_each do |parent|
+        say(parent.domain.to_s, :white)
 
-        EmailDomainBlock.where(parent_id: entry.id).find_each do |child|
-          say("  #{child.domain}", :cyan)
+        shell.indent do
+          EmailDomainBlock.where(parent_id: parent.id).find_each do |child|
+            say(child.domain, :cyan)
+          end
         end
       end
     end

lib/mastodon/cli/emoji.rb

@@ -62,7 +62,9 @@ module Mastodon::CLI
             failed += 1
             say('Failure/Error: ', :red)
             say(entry.full_name)
-            say("    #{custom_emoji.errors[:image].join(', ')}", :red)
+            shell.indent(2) do
+              say(custom_emoji.errors[:image].join(', '), :red)
+            end
           end
         end
       end

lib/mastodon/cli/ip_blocks.rb

@@ -80,9 +80,9 @@ module Mastodon::CLI
         end
 
         ip_blocks = if options[:force]
-                      IpBlock.where('ip >>= ?', address)
+                      IpBlock.containing(address)
                     else
-                      IpBlock.where('ip <<= ?', address)
+                      IpBlock.contained_by(address)
                     end
 
         if ip_blocks.empty?

lib/mastodon/cli/progress_helper.rb

@@ -5,7 +5,7 @@ dev_null = Logger.new('/dev/null')
 Rails.logger                 = dev_null
 ActiveRecord::Base.logger    = dev_null
 ActiveJob::Base.logger       = dev_null
-HttpLog.configuration.logger = dev_null
+HttpLog.configuration.logger = dev_null if defined?(HttpLog)
 Paperclip.options[:log]      = false
 Chewy.logger                 = dev_null