From d033920b7ed9a01f31b367a67551094b1856eb12 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 11 Nov 2024 03:29:55 -0500
Subject: [PATCH] Move account silence-related methods to concern (#28866)

---
 app/models/account.rb                         | 15 +------------
 app/models/concerns/account/silences.rb       | 22 +++++++++++++++++++
 spec/models/account_spec.rb                   |  8 -------
 spec/models/concerns/account/silences_spec.rb | 18 +++++++++++++++
 4 files changed, 41 insertions(+), 22 deletions(-)
 create mode 100644 app/models/concerns/account/silences.rb
 create mode 100644 spec/models/concerns/account/silences_spec.rb

diff --git a/app/models/account.rb b/app/models/account.rb
index 957ccc73c4..007fad7830 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -90,6 +90,7 @@ class Account < ApplicationRecord
   include Account::Interactions
   include Account::Merging
   include Account::Search
+  include Account::Silences
   include Account::StatusesSearch
   include Account::Suspensions
   include Account::AttributionDomains
@@ -129,9 +130,7 @@ class Account < ApplicationRecord
   scope :remote, -> { where.not(domain: nil) }
   scope :local, -> { where(domain: nil) }
   scope :partitioned, -> { order(Arel.sql('row_number() over (partition by domain)')) }
-  scope :silenced, -> { where.not(silenced_at: nil) }
   scope :sensitized, -> { where.not(sensitized_at: nil) }
-  scope :without_silenced, -> { where(silenced_at: nil) }
   scope :without_instance_actor, -> { where.not(id: INSTANCE_ACTOR_ID) }
   scope :recent, -> { reorder(id: :desc) }
   scope :bots, -> { where(actor_type: AUTOMATED_ACTOR_TYPES) }
@@ -244,18 +243,6 @@ class Account < ApplicationRecord
     ResolveAccountService.new.call(acct) unless local?
   end
 
-  def silenced?
-    silenced_at.present?
-  end
-
-  def silence!(date = Time.now.utc)
-    update!(silenced_at: date)
-  end
-
-  def unsilence!
-    update!(silenced_at: nil)
-  end
-
   def sensitized?
     sensitized_at.present?
   end
diff --git a/app/models/concerns/account/silences.rb b/app/models/concerns/account/silences.rb
new file mode 100644
index 0000000000..bd785df311
--- /dev/null
+++ b/app/models/concerns/account/silences.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Account::Silences
+  extend ActiveSupport::Concern
+
+  included do
+    scope :silenced, -> { where.not(silenced_at: nil) }
+    scope :without_silenced, -> { where(silenced_at: nil) }
+  end
+
+  def silenced?
+    silenced_at.present?
+  end
+
+  def silence!(date = Time.now.utc)
+    update!(silenced_at: date)
+  end
+
+  def unsilence!
+    update!(silenced_at: nil)
+  end
+end
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 7a5deed599..77341b7786 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -983,14 +983,6 @@ RSpec.describe Account do
       end
     end
 
-    describe 'silenced' do
-      it 'returns an array of accounts who are silenced' do
-        silenced_account = Fabricate(:account, silenced: true)
-        _account = Fabricate(:account, silenced: false)
-        expect(described_class.silenced).to contain_exactly(silenced_account)
-      end
-    end
-
     describe 'searchable' do
       let!(:suspended_local)        { Fabricate(:account, suspended: true, username: 'suspended_local') }
       let!(:suspended_remote)       { Fabricate(:account, suspended: true, domain: 'example.org', username: 'suspended_remote') }
diff --git a/spec/models/concerns/account/silences_spec.rb b/spec/models/concerns/account/silences_spec.rb
new file mode 100644
index 0000000000..0d8337ce1d
--- /dev/null
+++ b/spec/models/concerns/account/silences_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Account::Silences do
+  describe 'Scopes' do
+    describe '.silenced' do
+      let(:silenced_account) { Fabricate :account, silenced: true }
+
+      before { Fabricate :account, silenced: false }
+
+      it 'returns an array of accounts who are silenced' do
+        expect(Account.silenced)
+          .to contain_exactly(silenced_account)
+      end
+    end
+  end
+end