specter/mastodon
1
0
Fork 0
forked from fedi/mastodon
Code Pull requests Activity

Allow keeping only 1 boosts/favs on auto deleting posts (#16653)

Browse source 
* Allow keeping 1 boosts/favs on auto deleting posts

* Fix tests
This commit is contained in:
Jeong Arm 2021-10-15 04:11:14 +09:00 committed by GitHub
parent 3f5f4273b3
commit f4081d1564
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/account_statuses_cleanup_policy.rb
View file

@ -164,8 +164,8 @@ class AccountStatusesCleanupPolicy < ApplicationRecord
def without_popular_scope def without_popular_scope
scope = Status.left_joins(:status_stat) scope = Status.left_joins(:status_stat)
scope = scope.where('COALESCE(status_stats.reblogs_count, 0) <= ?', min_reblogs) unless min_reblogs.nil? scope = scope.where('COALESCE(status_stats.reblogs_count, 0) < ?', min_reblogs) unless min_reblogs.nil?
scope = scope.where('COALESCE(status_stats.favourites_count, 0) <= ?', min_favs) unless min_favs.nil? scope = scope.where('COALESCE(status_stats.favourites_count, 0) < ?', min_favs) unless min_favs.nil?
scope scope
end end
end end

8
config/locales/en.yml
View file

@ -1332,10 +1332,10 @@ en:
'63113904': 2 years '63113904': 2 years
'7889238': 3 months '7889238': 3 months
min_age_label: Age threshold min_age_label: Age threshold
min_favs: Keep posts favourited more than min_favs: Keep posts favourited at least
min_favs_hint: Doesn't delete any of your posts that has received more than this amount of favourites. Leave blank to delete posts regardless of their number of favourites min_favs_hint: Doesn't delete any of your posts that has received at least this amount of favourites. Leave blank to delete posts regardless of their number of favourites
min_reblogs: Keep posts boosted more than min_reblogs: Keep posts boosted at least
min_reblogs_hint: Doesn't delete any of your posts that has been boosted more than this number of times. Leave blank to delete posts regardless of their number of boosts min_reblogs_hint: Doesn't delete any of your posts that has been boosted at least this number of times. Leave blank to delete posts regardless of their number of boosts
stream_entries: stream_entries:
pinned: Pinned post pinned: Pinned post
reblogged: boosted reblogged: boosted

8
spec/models/account_statuses_cleanup_policy_spec.rb
View file

@ -499,9 +499,9 @@ RSpec.describe AccountStatusesCleanupPolicy, type: :model do
end end
end end
context 'when policy is to keep statuses with more than 4 boosts' do context 'when policy is to keep statuses with at least 5 boosts' do
before do before do
account_statuses_cleanup_policy.min_reblogs = 4 account_statuses_cleanup_policy.min_reblogs = 5
end end
it 'does not return the recent toot' do it 'does not return the recent toot' do
@ -521,9 +521,9 @@ RSpec.describe AccountStatusesCleanupPolicy, type: :model do
end end
end end
context 'when policy is to keep statuses with more than 4 favs' do context 'when policy is to keep statuses with at least 5 favs' do
before do before do
account_statuses_cleanup_policy.min_favs = 4 account_statuses_cleanup_policy.min_favs = 5
end end
it 'does not return the recent toot' do it 'does not return the recent toot' do