- {{#if showTimeOnly}}
+ {{#if publishToCategory}}
+
+
+ {{category-chooser
+ value=topicTimer.category_id
+ excludeCategoryId=excludeCategoryId
+ onChange=(action (mut topicTimer.category_id))
+ }}
+
+ {{/if}}
+ {{#if showFutureDateInput}}
+
{{future-date-input
input=(readonly topicTimer.updateTime)
+ duration=(readonly topicTimer.duration)
label="topic.topic_status_update.when"
statusType=selection
includeWeekend=true
basedOnLastPost=topicTimer.based_on_last_post
- onChangeInput=onChangeUpdateTime
- }}
- {{else if publishToCategory}}
-
-
- {{category-chooser
- value=topicTimer.category_id
- excludeCategoryId=excludeCategoryId
- onChange=(action (mut topicTimer.category_id))
- }}
-
-
- {{future-date-input
- input=(readonly topicTimer.updateTime)
- label="topic.topic_status_update.when"
- statusType=selection
- includeWeekend=true
+ onChangeInput=onChangeInput
+ onChangeDuration=onChangeDuration
categoryId=topicTimer.category_id
- basedOnLastPost=topicTimer.based_on_last_post
- onChangeInput=onChangeUpdateTime
- }}
- {{else if autoClose}}
- {{future-date-input
- input=topicTimer.updateTime
- label="topic.topic_status_update.when"
- statusType=selection
- includeWeekend=true
- basedOnLastPost=topicTimer.based_on_last_post
lastPostedAt=model.last_posted_at
- onChangeInput=onChangeUpdateTime
+ isBasedOnDuration=autoDeleteReplies
+ durationType=durationType
}}
- {{/if}}
-
+
+ {{#unless isBasedOnDuration}}
{{future-date-input-selector
@@ -16,6 +17,7 @@
onChange=(action (mut selection))
}}
+ {{/unless}}
{{#if displayDateAndTimePicker}}
@@ -33,11 +35,11 @@
{{/if}}
- {{#if isBasedOnLastPost}}
+ {{#if displayNumberInput}}
diff --git a/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs b/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs
index 71d74321139..316e51b00f8 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs
@@ -17,7 +17,8 @@
timerTypes=selections
updateTime=updateTime
onChangeStatusType=(action "onChangeStatusType")
- onChangeUpdateTime=(action "onChangeUpdateTime")
+ onChangeInput=(action "onChangeInput")
+ onChangeDuration=(action "onChangeDuration")
}}
{{/d-modal-body}}
diff --git a/app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6 b/app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6
index 0c588dbdfed..34efa2551c5 100644
--- a/app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6
+++ b/app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6
@@ -203,7 +203,7 @@ export default ComboBoxComponent.extend(DatetimeMixin, {
return "future-date-input-selector/future-date-input-selector-row";
},
- content: computed(function() {
+ content: computed("statusType", function() {
const now = moment();
const opts = {
now,
diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index ee7ba1af180..0deb6b2efdb 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -435,16 +435,19 @@ class TopicsController < ApplicationController
rescue
invalid_param(:status_type)
end
+ based_on_last_post = params[:based_on_last_post]
+ params.require(:duration) if based_on_last_post || TopicTimer.types[:delete_replies] == status_type
topic = Topic.find_by(id: params[:topic_id])
guardian.ensure_can_moderate!(topic)
options = {
by_user: current_user,
- based_on_last_post: params[:based_on_last_post]
+ based_on_last_post: based_on_last_post
}
options.merge!(category_id: params[:category_id]) if !params[:category_id].blank?
+ options.merge!(duration: params[:duration].to_i) if params[:duration].present?
topic_status_update = topic.set_or_create_timer(
status_type,
diff --git a/app/jobs/regular/delete_replies.rb b/app/jobs/regular/delete_replies.rb
new file mode 100644
index 00000000000..b8228c7a047
--- /dev/null
+++ b/app/jobs/regular/delete_replies.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Jobs
+ class DeleteReplies < ::Jobs::Base
+
+ def execute(args)
+ topic_timer = TopicTimer.find_by(id: args[:topic_timer_id] || args[:topic_status_update_id])
+
+ topic = topic_timer&.topic
+
+ if topic_timer.blank? || topic.blank? || topic_timer.execute_at > Time.zone.now
+ return
+ end
+
+ unless Guardian.new(topic_timer.user).is_staff?
+ topic_timer.trash!(Discourse.system_user)
+ return
+ end
+
+ replies = topic.posts.where("posts.post_number > 1")
+ replies.where('posts.created_at < ?', topic_timer.duration.days.ago).each do |post|
+ PostDestroyer.new(topic_timer.user, post, context: I18n.t("topic_statuses.auto_deleted_by_timer")).destroy
+ end
+
+ topic_timer.execute_at = (replies.minimum(:created_at) || Time.zone.now) + topic_timer.duration.days.ago
+ topic_timer.save
+ end
+
+ end
+end
diff --git a/app/models/topic.rb b/app/models/topic.rb
index 7947900b133..13f3a8a798b 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -1132,8 +1132,8 @@ class Topic < ActiveRecord::Base
# * by_user: User who is setting the topic's status update.
# * based_on_last_post: True if time should be based on timestamp of the last post.
# * category_id: Category that the update will apply to.
- def set_or_create_timer(status_type, time, by_user: nil, based_on_last_post: false, category_id: SiteSetting.uncategorized_category_id)
- return delete_topic_timer(status_type, by_user: by_user) if time.blank?
+ def set_or_create_timer(status_type, time, by_user: nil, based_on_last_post: false, category_id: SiteSetting.uncategorized_category_id, duration: nil)
+ return delete_topic_timer(status_type, by_user: by_user) if time.blank? && duration.blank?
public_topic_timer = !!TopicTimer.public_types[status_type]
topic_timer_options = { topic: self, public_type: public_topic_timer }
@@ -1143,19 +1143,24 @@ class Topic < ActiveRecord::Base
time_now = Time.zone.now
topic_timer.based_on_last_post = !based_on_last_post.blank?
+ topic_timer.duration = duration
if status_type == TopicTimer.types[:publish_to_category]
topic_timer.category = Category.find_by(id: category_id)
end
if topic_timer.based_on_last_post
- num_hours = time.to_f
-
- if num_hours > 0
+ if duration > 0
last_post_created_at = self.ordered_posts.last.present? ? self.ordered_posts.last.created_at : time_now
- topic_timer.execute_at = last_post_created_at + num_hours.hours
+ topic_timer.execute_at = last_post_created_at + duration.hours
topic_timer.created_at = last_post_created_at
end
+ elsif topic_timer.status_type == TopicTimer.types[:delete_replies]
+ if duration > 0
+ first_reply_created_at = (self.ordered_posts.where("post_number > 1").minimum(:created_at) || time_now)
+ topic_timer.execute_at = first_reply_created_at + duration.days
+ topic_timer.created_at = first_reply_created_at
+ end
else
utc = Time.find_zone("UTC")
is_float = (Float(time) rescue nil)
diff --git a/app/models/topic_timer.rb b/app/models/topic_timer.rb
index 1599f77ce54..c8274da9f56 100644
--- a/app/models/topic_timer.rb
+++ b/app/models/topic_timer.rb
@@ -49,7 +49,8 @@ class TopicTimer < ActiveRecord::Base
publish_to_category: 3,
delete: 4,
reminder: 5,
- bump: 6
+ bump: 6,
+ delete_replies: 7
)
end
@@ -73,14 +74,6 @@ class TopicTimer < ActiveRecord::Base
end
end
- def duration
- if (self.execute_at && self.created_at)
- ((self.execute_at - self.created_at) / 1.hour).round(2)
- else
- 0
- end
- end
-
def public_type?
!!self.class.public_types[self.status_type]
end
@@ -120,6 +113,14 @@ class TopicTimer < ActiveRecord::Base
Jobs.cancel_scheduled_job(:bump_topic, topic_timer_id: id)
end
+ def cancel_auto_delete_replies_job
+ Jobs.cancel_scheduled_job(:delete_replies, topic_timer_id: id)
+ end
+
+ def schedule_auto_delete_replies_job(time)
+ Jobs.enqueue_at(time, :delete_replies, topic_timer_id: id)
+ end
+
def schedule_auto_bump_job(time)
Jobs.enqueue_at(time, :bump_topic, topic_timer_id: id)
end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index ef241f4e166..27d207efb74 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -2139,6 +2139,7 @@ en:
title: "Topic Timer"
save: "Set Timer"
num_of_hours: "Number of hours:"
+ num_of_days: "Number of days:"
remove: "Remove Timer"
publish_to: "Publish To:"
when: "When:"
@@ -2181,6 +2182,8 @@ en:
title: "Auto-Bump Topic"
reminder:
title: "Remind Me"
+ auto_delete_replies:
+ title: "Auto-Delete Replies"
status_update_notice:
auto_open: "This topic will automatically open %{timeLeft}."
@@ -2190,6 +2193,7 @@ en:
auto_delete: "This topic will be automatically deleted %{timeLeft}."
auto_bump: "This topic will be automatically bumped %{timeLeft}."
auto_reminder: "You will be reminded about this topic %{timeLeft}."
+ auto_delete_replies: "Replies on this topic are automatically deleted after %{duration}."
auto_close_title: "Auto-Close Settings"
auto_close_immediate:
one: "The last post in the topic is already %{count} hour old, so the topic will be closed immediately."
diff --git a/db/migrate/20200312122846_add_duration_to_topic_timers.rb b/db/migrate/20200312122846_add_duration_to_topic_timers.rb
new file mode 100644
index 00000000000..bc4ba1a35f4
--- /dev/null
+++ b/db/migrate/20200312122846_add_duration_to_topic_timers.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddDurationToTopicTimers < ActiveRecord::Migration[6.0]
+ def change
+ add_column :topic_timers, :duration, :integer, null: true
+ end
+end
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index 845a7e1930a..0f0a921e9e8 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -2644,6 +2644,28 @@ RSpec.describe TopicsController do
expect(json['closed']).to eq(topic.closed)
end
+ it 'should be able to create a topic status update with duration' do
+ post "/t/#{topic.id}/timer.json", params: {
+ duration: 5,
+ status_type: TopicTimer.types[7]
+ }
+
+ expect(response.status).to eq(200)
+
+ topic_status_update = TopicTimer.last
+
+ expect(topic_status_update.topic).to eq(topic)
+ expect(topic_status_update.execute_at).to eq_time(5.days.from_now)
+ expect(topic_status_update.duration).to eq(5)
+
+ json = JSON.parse(response.body)
+
+ expect(DateTime.parse(json['execute_at']))
+ .to eq_time(DateTime.parse(topic_status_update.execute_at.to_s))
+
+ expect(json['duration']).to eq(topic_status_update.duration)
+ end
+
describe 'publishing topic to category in the future' do
it 'should be able to create the topic status update' do
post "/t/#{topic.id}/timer.json", params: {