discourse
/
discourse-solved
mirror of https://github.com/discourse/discourse-solved.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FEATURE: silently auto close solved topic (#104) 

Topic solved should be closed silently as system user involvement may be confusing.

In addition, old rescue block was dropped.

Meta: https://meta.discourse.org/t/discourse-encrypt-unable-to-see-close-message/135235
This commit is contained in:
Krzysztof Kotlarek 2020-12-03 15:01:42 +11:00 committed by GitHub
parent 1fa612f3e6
commit 5840601025
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugin.rb
View File

@ -137,22 +137,13 @@ SQL
auto_close_hours = SiteSetting.solved_topics_auto_close_hours auto_close_hours = SiteSetting.solved_topics_auto_close_hours
if (auto_close_hours > 0) && !topic.closed if (auto_close_hours > 0) && !topic.closed
begin
topic_timer = topic.set_or_create_timer( topic_timer = topic.set_or_create_timer(
TopicTimer.types[:close], # Fallback to TopicTimer.types[:close] can be removed after discourse stable version > 2.7
TopicTimer.types[:silent_close] || TopicTimer.types[:close],
nil, nil,
based_on_last_post: true, based_on_last_post: true,
duration: auto_close_hours duration: auto_close_hours
) )
rescue ArgumentError
# https://github.com/discourse/discourse/commit/aad12822b7d7c9c6ecd976e23d3a83626c052dce#diff-4d0afa19fa7752955f36089bca420ab4L1135
# this rescue block can be deleted after discourse stable version > 2.4
topic_timer = topic.set_or_create_timer(
TopicTimer.types[:close],
auto_close_hours,
based_on_last_post: true
)
end
topic.custom_fields[ topic.custom_fields[
AUTO_CLOSE_TOPIC_TIMER_CUSTOM_FIELD AUTO_CLOSE_TOPIC_TIMER_CUSTOM_FIELD

2
spec/integration/solved_spec.rb
View File

@ -52,7 +52,7 @@ RSpec.describe "Managing Posts solved status" do
expect(p1.reload.custom_fields["is_accepted_answer"]).to eq("true") expect(p1.reload.custom_fields["is_accepted_answer"]).to eq("true")
expect(topic.public_topic_timer.status_type) expect(topic.public_topic_timer.status_type)
.to eq(TopicTimer.types[:close]) .to eq(TopicTimer.types[:silent_close])
expect(topic.custom_fields[ expect(topic.custom_fields[
DiscourseSolved::AUTO_CLOSE_TOPIC_TIMER_CUSTOM_FIELD DiscourseSolved::AUTO_CLOSE_TOPIC_TIMER_CUSTOM_FIELD