Merge tag 'v4.1.9' into features/4.1.9

app/models/account_statuses_filter.rb

@@ -1,134 +0,0 @@
-# frozen_string_literal: true
-
-class AccountStatusesFilter
-  KEYS = %i(
-    pinned
-    tagged
-    only_media
-    exclude_replies
-    exclude_reblogs
-  ).freeze
-
-  attr_reader :params, :account, :current_account
-
-  def initialize(account, current_account, params = {})
-    @account         = account
-    @current_account = current_account
-    @params          = params
-  end
-
-  def results
-    scope = initial_scope
-
-    scope.merge!(pinned_scope)     if pinned?
-    scope.merge!(only_media_scope) if only_media?
-    scope.merge!(no_replies_scope) if exclude_replies?
-    scope.merge!(no_reblogs_scope) if exclude_reblogs?
-    scope.merge!(hashtag_scope)    if tagged?
-
-    scope
-  end
-
-  private
-
-  def initial_scope
-    if suspended?
-      Status.none
-    elsif anonymous?
-      account.statuses.where(visibility: %i(public unlisted))
-    elsif author?
-      account.statuses.all # NOTE: #merge! does not work without the #all
-    elsif blocked?
-      Status.none
-    else
-      filtered_scope
-    end
-  end
-
-  def filtered_scope
-    scope = account.statuses.left_outer_joins(:mentions)
-
-    scope.merge!(scope.where(visibility: follower? ? %i(public unlisted private) : %i(public unlisted)).or(scope.where(mentions: { account_id: current_account.id })).group(Status.arel_table[:id]))
-    scope.merge!(filtered_reblogs_scope) if reblogs_may_occur?
-
-    scope
-  end
-
-  def filtered_reblogs_scope
-    Status.left_outer_joins(:reblog).where(reblog_of_id: nil).or(Status.where.not(reblogs_statuses: { account_id: current_account.excluded_from_timeline_account_ids }))
-  end
-
-  def only_media_scope
-    Status.joins(:media_attachments).merge(account.media_attachments.reorder(nil)).group(Status.arel_table[:id])
-  end
-
-  def no_replies_scope
-    Status.without_replies
-  end
-
-  def no_reblogs_scope
-    Status.without_reblogs
-  end
-
-  def pinned_scope
-    account.pinned_statuses.group(Status.arel_table[:id], StatusPin.arel_table[:created_at])
-  end
-
-  def hashtag_scope
-    tag = Tag.find_normalized(params[:tagged])
-
-    if tag
-      Status.tagged_with(tag.id)
-    else
-      Status.none
-    end
-  end
-
-  def suspended?
-    account.suspended?
-  end
-
-  def anonymous?
-    current_account.nil?
-  end
-
-  def author?
-    current_account.id == account.id
-  end
-
-  def blocked?
-    account.blocking?(current_account) || (current_account.domain.present? && account.domain_blocking?(current_account.domain))
-  end
-
-  def follower?
-    current_account.following?(account)
-  end
-
-  def reblogs_may_occur?
-    !exclude_reblogs? && !only_media? && !tagged?
-  end
-
-  def pinned?
-    truthy_param?(:pinned)
-  end
-
-  def only_media?
-    truthy_param?(:only_media)
-  end
-
-  def exclude_replies?
-    truthy_param?(:exclude_replies)
-  end
-
-  def exclude_reblogs?
-    truthy_param?(:exclude_reblogs)
-  end
-
-  def tagged?
-    params[:tagged].present?
-  end
-
-  def truthy_param?(key)
-    ActiveModel::Type::Boolean.new.cast(params[key])
-  end
-end

app/models/admin/status_batch_action.rb

@@ -140,6 +140,6 @@ class Admin::StatusBatchAction
   end
 
   def allowed_status_ids
-    AccountStatusesFilter.new(@report.target_account, current_account).results.with_discarded.where(id: status_ids).pluck(:id)
+    Admin::AccountStatusesFilter.new(@report.target_account, current_account).results.with_discarded.where(id: status_ids).pluck(:id)
   end
 end

app/models/report.rb

@@ -39,7 +39,10 @@ class Report < ApplicationRecord
   scope :resolved,   -> { where.not(action_taken_at: nil) }
   scope :with_accounts, -> { includes([:account, :target_account, :action_taken_by_account, :assigned_account].index_with({ user: [:invite_request, :invite] })) }
 
-  validates :comment, length: { maximum: 1_000 }
+  # A report is considered local if the reporter is local
+  delegate :local?, to: :account
+
+  validates :comment, length: { maximum: 1_000 }, if: :local?
   validates :rule_ids, absence: true, unless: :violation?
 
   validate :validate_rule_ids
@@ -50,10 +53,6 @@ class Report < ApplicationRecord
     violation: 2_000,
   }
 
-  def local?
-    false # Force uri_for to use uri attribute
-  end
-
   before_validation :set_uri, only: :create
 
   after_create_commit :trigger_webhooks

app/models/status.rb

@@ -371,13 +371,25 @@ class Status < ApplicationRecord
 
       account_ids.uniq!
 
+      status_ids = cached_items.map { |item| item.reblog? ? item.reblog_of_id : item.id }.uniq
+
       return if account_ids.empty?
 
       accounts = Account.where(id: account_ids).includes(:account_stat, :user).index_by(&:id)
 
+      status_stats = StatusStat.where(status_id: status_ids).index_by(&:status_id)
+
       cached_items.each do |item|
         item.account = accounts[item.account_id]
         item.reblog.account = accounts[item.reblog.account_id] if item.reblog?
+
+        if item.reblog?
+          status_stat = status_stats[item.reblog.id]
+          item.reblog.status_stat = status_stat if status_stat.present?
+        else
+          status_stat = status_stats[item.id]
+          item.status_stat = status_stat if status_stat.present?
+        end
       end
     end