github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-10 17:43:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: new 'auto_respond_to_flag_actions' site setting

Browse Source
This commit is contained in:
Régis Hanol
2015-03-11 19:29:09 +01:00
parent c8631a7a8b
commit afd2417945
4 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/post_action.rb
View File

@ -183,6 +183,7 @@ class PostAction < ActiveRecord::Base
end end
def add_moderator_post_if_needed(moderator, disposition, delete_post=false) def add_moderator_post_if_needed(moderator, disposition, delete_post=false)
return if !SiteSetting.auto_respond_to_flag_actions
return if related_post.nil? || related_post.topic.nil? return if related_post.nil? || related_post.topic.nil?
return if moderator_already_replied?(related_post.topic, moderator) return if moderator_already_replied?(related_post.topic, moderator)
message_key = "flags_dispositions.#{disposition}" message_key = "flags_dispositions.#{disposition}"

2
config/locales/server.en.yml
View File

@ -1036,6 +1036,8 @@ en:
num_flaggers_to_close_topic: "Minimum number of unique flaggers that is required to automatically pause a topic for intervention" num_flaggers_to_close_topic: "Minimum number of unique flaggers that is required to automatically pause a topic for intervention"
num_flags_to_close_topic: "Minimum number of active flags that is required to automatically pause a topic for intervention" num_flags_to_close_topic: "Minimum number of active flags that is required to automatically pause a topic for intervention"
auto_respond_to_flag_actions: "Enable automatic reply when disposing a flag."
reply_by_email_enabled: "Enable replying to topics via email." reply_by_email_enabled: "Enable replying to topics via email."
reply_by_email_address: "Template for reply by email incoming email address, for example: %{reply_key}@reply.example.com or replies+%{reply_key}@example.com" reply_by_email_address: "Template for reply by email incoming email address, for example: %{reply_key}@reply.example.com or replies+%{reply_key}@example.com"

1
config/site_settings.yml
View File

@ -622,6 +622,7 @@ spam:
max_age_unmatched_ips: 365 max_age_unmatched_ips: 365
num_flaggers_to_close_topic: 5 num_flaggers_to_close_topic: 5
num_flags_to_close_topic: 12 num_flags_to_close_topic: 12
auto_respond_to_flag_actions: true
rate_limits: rate_limits:
unique_posts_mins: unique_posts_mins:

16
spec/models/post_action_spec.rb
View File

@ -460,9 +460,23 @@ describe PostAction do
describe ".add_moderator_post_if_needed" do describe ".add_moderator_post_if_needed" do
it "should not generate a notification for auto-message" do it "should not add a moderator post when it's disabled" do
post = create_post post = create_post
action = PostAction.act(moderator, post, PostActionType.types[:spam], message: "WAT")
action.reload
topic = action.related_post.topic
expect(topic.posts.count).to eq(1)
SiteSetting.expects(:auto_respond_to_flag_actions).returns(false)
PostAction.agree_flags!(post, admin)
topic.reload
expect(topic.posts.count).to eq(1)
end
it "should not generate a notification for auto-message" do
post = create_post
PostAction.act(moderator, post, PostActionType.types[:spam], message: "WAT") PostAction.act(moderator, post, PostActionType.types[:spam], message: "WAT")
PostAlerter.expects(:post_created).never PostAlerter.expects(:post_created).never