From 6edfe2b352757103f3ca47ff8929bbde4db2b8cd Mon Sep 17 00:00:00 2001
From: Misty De Meo <mistydemeo@gmail.com>
Date: Thu, 11 Dec 2025 19:32:50 -0800
Subject: [PATCH] backend: merge errors identified via rubocop

---
 app/lib/status_cache_hydrator.rb              | 38 -------------------
 app/serializers/rest/status_serializer.rb     |  4 --
 .../process_status_update_service.rb          |  4 --
 spec/models/export_spec.rb                    | 20 ----------
 4 files changed, 66 deletions(-)

diff --git a/app/lib/status_cache_hydrator.rb b/app/lib/status_cache_hydrator.rb
index af38e4a99..b830e509b 100644
--- a/app/lib/status_cache_hydrator.rb
+++ b/app/lib/status_cache_hydrator.rb
@@ -114,44 +114,6 @@ class StatusCacheHydrator
     end
   end
 
-  def fill_status_payload(payload, status, account_id, nested: false)
-    payload[:favourited] = Favourite.exists?(account_id: account_id, status_id: status.id)
-    payload[:reblogged]  = Status.exists?(account_id: account_id, reblog_of_id: status.id)
-    payload[:muted]      = ConversationMute.exists?(account_id: account_id, conversation_id: status.conversation_id)
-    payload[:bookmarked] = Bookmark.exists?(account_id: account_id, status_id: status.id)
-    payload[:pinned]     = StatusPin.exists?(account_id: account_id, status_id: status.id) if status.account_id == account_id
-    payload[:filtered]   = mapped_applied_custom_filter(account_id, status)
-    payload[:quote] = hydrate_quote_payload(payload[:quote], status.quote, account_id, nested:) if payload[:quote]
-  end
-
-  def hydrate_quote_payload(empty_payload, quote, account_id, nested: false)
-    return unless quote&.acceptable?
-
-    empty_payload.tap do |payload|
-      payload.delete(:quoted_status) if nested
-
-      # TODO: performance improvements
-      if quote.accepted?
-        if quote.quoted_status.nil?
-          payload[nested ? :quoted_status_id : :quoted_status] = nil
-          payload[:state] = 'deleted'
-        elsif StatusFilter.new(quote.quoted_status, Account.find_by(id: account_id)).filtered?
-          payload[nested ? :quoted_status_id : :quoted_status] = nil
-          payload[:state] = 'unauthorized'
-        else
-          payload[:state] = 'accepted'
-          if nested
-            payload[:quoted_status_id] = quote.quoted_status_id&.to_s
-          else
-            payload[:quoted_status] = StatusCacheHydrator.new(quote.quoted_status).hydrate(account_id, nested: true)
-          end
-        end
-      else
-        payload[nested ? :quoted_status_id : :quoted_status] = nil
-      end
-    end
-  end
-
   def mapped_applied_custom_filter(account_id, status)
     CustomFilter
       .apply_cached_filters(CustomFilter.cached_filters_for(account_id), status)
diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb
index 31da7f190..092818752 100644
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@@ -41,10 +41,6 @@ class REST::StatusSerializer < ActiveModel::Serializer
     object.quote if object.quote&.acceptable?
   end
 
-  def quote
-    object.quote if object.quote&.acceptable?
-  end
-
   def id
     object.id.to_s
   end
diff --git a/app/services/activitypub/process_status_update_service.rb b/app/services/activitypub/process_status_update_service.rb
index 6db4ddf3e..1cdf0b483 100644
--- a/app/services/activitypub/process_status_update_service.rb
+++ b/app/services/activitypub/process_status_update_service.rb
@@ -81,10 +81,6 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
     @status.update(quote_approval_policy: @status_parser.quote_policy)
   end
 
-  def update_interaction_policies!
-    @status.quote_approval_policy = @status_parser.quote_policy
-  end
-
   def update_media_attachments!
     previous_media_attachments     = @status.media_attachments.to_a
     previous_media_attachments_ids = @status.ordered_media_attachment_ids || previous_media_attachments.map(&:id)
diff --git a/spec/models/export_spec.rb b/spec/models/export_spec.rb
index fba09a712..ce4c96608 100644
--- a/spec/models/export_spec.rb
+++ b/spec/models/export_spec.rb
@@ -22,26 +22,6 @@ RSpec.describe Export do
     before do
       bookmark_of_soft_deleted.status.discard
     end
-  end
-
-  describe '#to_blocked_accounts_csv' do
-    before { target_accounts.each { |target_account| account.block!(target_account) } }
-
-    let(:export) { CSV.parse(subject.to_blocked_accounts_csv) }
-
-    it 'returns a csv of the blocked accounts' do
-      expect(export)
-        .to contain_exactly(
-          include('one@local.host'),
-          include(be_present)
-        )
-    end
-  end
-
-  describe '#to_muted_accounts_csv' do
-    before { target_accounts.each { |target_account| account.mute!(target_account) } }
-
-    let(:export) { CSV.parse(subject.to_muted_accounts_csv) }
 
     it 'returns a csv of bookmarks' do
       expect(export)