alex
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename replies_policy enumerables (#15304)

signup-info-prompt
trwnh 2020-12-08 21:34:17 -06:00 committed by GitHub
parent f379a52d74
commit 127c543a6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/javascript/mastodon/features/list_timeline/index.js
View File

@ -20,9 +20,9 @@ import RadioButton from 'mastodon/components/radio_button';
const messages = defineMessages({ const messages = defineMessages({
deleteMessage: { id: 'confirmations.delete_list.message', defaultMessage: 'Are you sure you want to permanently delete this list?' }, 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' }, deleteConfirm: { id: 'confirmations.delete_list.confirm', defaultMessage: 'Delete' },
all_replies: { id: 'lists.replies_policy.all_replies', defaultMessage: 'Any followed user' }, followed: { id: 'lists.replies_policy.followed', defaultMessage: 'Any followed user' },
no_replies: { id: 'lists.replies_policy.no_replies', defaultMessage: 'No one' }, none: { id: 'lists.replies_policy.none', defaultMessage: 'No one' },
list_replies: { id: 'lists.replies_policy.list_replies', defaultMessage: 'Members of the list' }, list: { id: 'lists.replies_policy.list', defaultMessage: 'Members of the list' },
}); });
const mapStateToProps = (state, props) => ({ const mapStateToProps = (state, props) => ({
@ -193,7 +193,7 @@ class ListTimeline extends React.PureComponent {
<FormattedMessage id='lists.replies_policy.title' defaultMessage='Show replies to:' /> <FormattedMessage id='lists.replies_policy.title' defaultMessage='Show replies to:' />
</span> </span>
<div className='column-settings__row'> <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} /> <RadioButton name='order' value={policy} label={intl.formatMessage(messages[policy])} checked={replies_policy === policy} onChange={this.handleRepliesPolicyChange} />
))} ))}
</div> </div>

4
app/lib/feed_manager.rb
View File

@ -345,8 +345,8 @@ class FeedManager
def filter_from_list?(status, list) def filter_from_list?(status, list)
if status.reply? && status.in_reply_to_account_id != status.account_id 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 = status.in_reply_to_account_id != list.account_id
should_filter &&= !list.show_all_replies? should_filter &&= !list.show_followed?
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_list? && ListAccount.where(list_id: list.id, account_id: status.in_reply_to_account_id).exists?)
return !!should_filter return !!should_filter
end end

4
app/models/list.rb
View File

@ -8,7 +8,7 @@
# title :string default(""), not null # title :string default(""), not null
# created_at :datetime not null # created_at :datetime not null
# updated_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 class List < ApplicationRecord
@ -16,7 +16,7 @@ class List < ApplicationRecord
PER_ACCOUNT_LIMIT = 50 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 belongs_to :account, optional: true

6
spec/lib/feed_manager_spec.rb
View File

@ -335,7 +335,7 @@ RSpec.describe FeedManager do
context 'when replies policy is set to no replies' do context 'when replies policy is set to no replies' do
before do before do
list.replies_policy = :no_replies list.replies_policy = :none
end end
it 'pushes statuses that are not replies' do 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 context 'when replies policy is set to list-only replies' do
before do before do
list.replies_policy = :list_replies list.replies_policy = :list
end end
it 'pushes statuses that are not replies' do 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 context 'when replies policy is set to any reply' do
before do before do
list.replies_policy = :all_replies list.replies_policy = :followed
end end
it 'pushes statuses that are not replies' do it 'pushes statuses that are not replies' do