FEATURE: automatically handle flags and posts that have been waiting in a queue for a long time. Flags will be deferred. Posts waiting for approval will be rejected. Control how old the records need to be with the auto_handle_queued_age site setting.

This commit is contained in:
Neil Lalonde 2017-09-14 12:00:37 -04:00
parent 42aea15070
commit 16fe7aa307
4 changed files with 83 additions and 0 deletions

View File

@ -0,0 +1,31 @@
# This job will automatically act on records that have gone unhandled on a
# queue for a long time.
module Jobs
class AutoQueueHandler < Jobs::Scheduled
every 1.day
def execute(args)
return unless SiteSetting.auto_handle_queued_age.to_i > 0
guardian = Guardian.new(Discourse.system_user)
# Flags
flags = FlagQuery.flagged_post_actions('active')
.where('post_actions.created_at < ?', SiteSetting.auto_handle_queued_age.to_i.days.ago)
Post.where(id: flags.pluck(:post_id).uniq).each do |post|
PostAction.defer_flags!(post, Discourse.system_user)
end
# Posts
queued_posts = QueuedPost.visible
.where(state: QueuedPost.states[:new])
.where('created_at < ?', SiteSetting.auto_handle_queued_age.to_i.days.ago)
queued_posts.each do |queued_post|
queued_post.reject!(Discourse.system_user)
end
end
end
end

View File

@ -1472,6 +1472,8 @@ en:
share_anonymized_statistics: "Share anonymized usage statistics." share_anonymized_statistics: "Share anonymized usage statistics."
auto_handle_queued_age: "Automatically handle records that are waiting to be reviewed after this many days. Flags will be deferred. Queued posts and users will be rejected. Set to 0 to disable this feature."
max_prints_per_hour_per_user: "Maximum number of /print page impressions (set to 0 to disable)" max_prints_per_hour_per_user: "Maximum number of /print page impressions (set to 0 to disable)"
full_name_required: "Full name is a required field of a user's profile." full_name_required: "Full name is a required field of a user's profile."
@ -1753,6 +1755,7 @@ en:
max_new_accounts_per_registration_ip: "New registrations are not allowed from your IP address (maximum limit reached). Contact a staff member." max_new_accounts_per_registration_ip: "New registrations are not allowed from your IP address (maximum limit reached). Contact a staff member."
website: website:
domain_not_allowed: "Website is invalid. Allowed domains are: %{domains}" domain_not_allowed: "Website is invalid. Allowed domains are: %{domains}"
auto_rejected: "Rejected automatically due to age. See auto_handle_queued_age site setting."
flags_reminder: flags_reminder:
flags_were_submitted: flags_were_submitted:

View File

@ -1358,6 +1358,10 @@ uncategorized:
share_anonymized_statistics: true share_anonymized_statistics: true
auto_handle_queued_age:
default: 60
min: 0
user_preferences: user_preferences:
default_email_digest_frequency: default_email_digest_frequency:
enum: 'DigestEmailSiteSetting' enum: 'DigestEmailSiteSetting'

View File

@ -0,0 +1,45 @@
require 'rails_helper'
describe Jobs::AutoQueueHandler do
subject { Jobs::AutoQueueHandler.new.execute({}) }
context "old flag" do
let!(:old) { Fabricate(:flag, created_at: 61.days.ago) }
let!(:not_old) { Fabricate(:flag, created_at: 59.days.ago) }
it "defers the old flag if auto_handle_queued_age is 60" do
SiteSetting.auto_handle_queued_age = 60
subject
expect(not_old.reload.deferred_at).to be_nil
expect(old.reload.deferred_at).to_not be_nil
end
it "doesn't defer the old flag if auto_handle_queued_age is 0" do
SiteSetting.auto_handle_queued_age = 0
subject
expect(not_old.reload.deferred_at).to be_nil
expect(old.reload.deferred_at).to be_nil
end
end
context "old queued post" do
let!(:old) { Fabricate(:queued_post, created_at: 61.days.ago, queue: 'default') }
let!(:not_old) { Fabricate(:queued_post, created_at: 59.days.ago, queue: 'default') }
it "rejects the post when auto_handle_queued_age is 60" do
SiteSetting.auto_handle_queued_age = 60
subject
expect(not_old.reload.state).to eq(QueuedPost.states[:new])
expect(old.reload.state).to eq(QueuedPost.states[:rejected])
end
it "doesn't reject the post when auto_handle_queued_age is 0" do
SiteSetting.auto_handle_queued_age = 0
subject
expect(not_old.reload.state).to eq(QueuedPost.states[:new])
expect(old.reload.state).to eq(QueuedPost.states[:new])
end
end
end