From 127c543a6e59d20de68e6760e952d18ed53578e9 Mon Sep 17 00:00:00 2001
From: trwnh <a@trwnh.com>
Date: Tue, 8 Dec 2020 21:34:17 -0600
Subject: [PATCH] rename replies_policy enumerables (#15304)

---
 app/javascript/mastodon/features/list_timeline/index.js | 8 ++++----
 app/lib/feed_manager.rb                                 | 4 ++--
 app/models/list.rb                                      | 4 ++--
 spec/lib/feed_manager_spec.rb                           | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/javascript/mastodon/features/list_timeline/index.js b/app/javascript/mastodon/features/list_timeline/index.js
index a3be8fbea3..02b0182473 100644
--- a/app/javascript/mastodon/features/list_timeline/index.js
+++ b/app/javascript/mastodon/features/list_timeline/index.js
@@ -20,9 +20,9 @@ import RadioButton from 'mastodon/components/radio_button';
 const messages = defineMessages({
   deleteMessage: { id: 'confirmations.delete_list.message', defaultMessage: 'Are you sure you want to permanently delete this list?' },
   deleteConfirm: { id: 'confirmations.delete_list.confirm', defaultMessage: 'Delete' },
-  all_replies:   { id: 'lists.replies_policy.all_replies', defaultMessage: 'Any followed user' },
-  no_replies:    { id: 'lists.replies_policy.no_replies', defaultMessage: 'No one' },
-  list_replies:  { id: 'lists.replies_policy.list_replies', defaultMessage: 'Members of the list' },
+  followed:   { id: 'lists.replies_policy.followed', defaultMessage: 'Any followed user' },
+  none:    { id: 'lists.replies_policy.none', defaultMessage: 'No one' },
+  list:  { id: 'lists.replies_policy.list', defaultMessage: 'Members of the list' },
 });
 
 const mapStateToProps = (state, props) => ({
@@ -193,7 +193,7 @@ class ListTimeline extends React.PureComponent {
                 <FormattedMessage id='lists.replies_policy.title' defaultMessage='Show replies to:' />
               </span>
               <div className='column-settings__row'>
-                { ['no_replies', 'list_replies', 'all_replies'].map(policy => (
+                { ['none', 'list', 'followed'].map(policy => (
                   <RadioButton name='order' value={policy} label={intl.formatMessage(messages[policy])} checked={replies_policy === policy} onChange={this.handleRepliesPolicyChange} />
                 ))}
               </div>
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index 0876d107bd..5e01ef67a1 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -345,8 +345,8 @@ class FeedManager
   def filter_from_list?(status, list)
     if status.reply? && status.in_reply_to_account_id != status.account_id
       should_filter = status.in_reply_to_account_id != list.account_id
-      should_filter &&= !list.show_all_replies?
-      should_filter &&= !(list.show_list_replies? && ListAccount.where(list_id: list.id, account_id: status.in_reply_to_account_id).exists?)
+      should_filter &&= !list.show_followed?
+      should_filter &&= !(list.show_list? && ListAccount.where(list_id: list.id, account_id: status.in_reply_to_account_id).exists?)
 
       return !!should_filter
     end
diff --git a/app/models/list.rb b/app/models/list.rb
index 8493046e58..655d55ff6f 100644
--- a/app/models/list.rb
+++ b/app/models/list.rb
@@ -8,7 +8,7 @@
 #  title          :string           default(""), not null
 #  created_at     :datetime         not null
 #  updated_at     :datetime         not null
-#  replies_policy :integer          default("list_replies"), not null
+#  replies_policy :integer          default("list"), not null
 #
 
 class List < ApplicationRecord
@@ -16,7 +16,7 @@ class List < ApplicationRecord
 
   PER_ACCOUNT_LIMIT = 50
 
-  enum replies_policy: [:list_replies, :all_replies, :no_replies], _prefix: :show
+  enum replies_policy: [:list, :followed, :none], _prefix: :show
 
   belongs_to :account, optional: true
 
diff --git a/spec/lib/feed_manager_spec.rb b/spec/lib/feed_manager_spec.rb
index 7d775a86d7..0df85e5bcb 100644
--- a/spec/lib/feed_manager_spec.rb
+++ b/spec/lib/feed_manager_spec.rb
@@ -335,7 +335,7 @@ RSpec.describe FeedManager do
 
     context 'when replies policy is set to no replies' do
       before do
-        list.replies_policy = :no_replies
+        list.replies_policy = :none
       end
 
       it 'pushes statuses that are not replies' do
@@ -358,7 +358,7 @@ RSpec.describe FeedManager do
 
     context 'when replies policy is set to list-only replies' do
       before do
-        list.replies_policy = :list_replies
+        list.replies_policy = :list
       end
 
       it 'pushes statuses that are not replies' do
@@ -387,7 +387,7 @@ RSpec.describe FeedManager do
 
     context 'when replies policy is set to any reply' do
       before do
-        list.replies_policy = :all_replies
+        list.replies_policy = :followed
       end
 
       it 'pushes statuses that are not replies' do