DEV: skip topic deletion staff log when user skip new user tips.
Previously, every time when a user skipped the "new user tips" it will add a staff action log since the discobot's welcome post is destroyed.
This commit is contained in:
parent
1504fe7231
commit
18f0cef72e
|
@ -153,12 +153,16 @@ class PostDestroyer
|
||||||
trash_user_actions
|
trash_user_actions
|
||||||
remove_associated_replies
|
remove_associated_replies
|
||||||
remove_associated_notifications
|
remove_associated_notifications
|
||||||
if @post.topic && @post.is_first_post?
|
|
||||||
StaffActionLogger.new(@user).log_topic_delete_recover(@post.topic, "delete_topic", @opts.slice(:context)) if @user.id != @post.user_id
|
if @user.id != @post.user_id && !@opts[:skip_staff_log]
|
||||||
@post.topic.trash!(@user)
|
if @post.topic && @post.is_first_post?
|
||||||
elsif @user.id != @post.user_id
|
StaffActionLogger.new(@user).log_topic_delete_recover(@post.topic, "delete_topic", @opts.slice(:context))
|
||||||
StaffActionLogger.new(@user).log_post_deletion(@post, @opts.slice(:context))
|
else
|
||||||
|
StaffActionLogger.new(@user).log_post_deletion(@post, @opts.slice(:context))
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@post.topic.trash!(@user) if @post.topic && @post.is_first_post?
|
||||||
update_associated_category_latest_topic
|
update_associated_category_latest_topic
|
||||||
update_user_counts
|
update_user_counts
|
||||||
TopicUser.update_post_action_cache(post_id: @post.id)
|
TopicUser.update_post_action_cache(post_id: @post.id)
|
||||||
|
|
|
@ -154,7 +154,6 @@ en:
|
||||||
reset_trigger: "tutorial"
|
reset_trigger: "tutorial"
|
||||||
title: "New user tutorial completion certificate"
|
title: "New user tutorial completion certificate"
|
||||||
cert_title: "In recognition of successful completion of the new user tutorial"
|
cert_title: "In recognition of successful completion of the new user tutorial"
|
||||||
delete_reason: "User skipped the new user tips"
|
|
||||||
|
|
||||||
hello:
|
hello:
|
||||||
title: "Greetings!"
|
title: "Greetings!"
|
||||||
|
|
|
@ -194,7 +194,7 @@ after_initialize do
|
||||||
return if topic.blank?
|
return if topic.blank?
|
||||||
|
|
||||||
first_post = topic.ordered_posts.first
|
first_post = topic.ordered_posts.first
|
||||||
PostDestroyer.new(Discourse.system_user, first_post, context: I18n.t('discourse_narrative_bot.new_user_narrative.delete_reason')).destroy
|
PostDestroyer.new(Discourse.system_user, first_post, skip_staff_log: true).destroy
|
||||||
DiscourseNarrativeBot::Store.remove(self.id)
|
DiscourseNarrativeBot::Store.remove(self.id)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -119,7 +119,10 @@ describe User do
|
||||||
it 'should delete the existing PM' do
|
it 'should delete the existing PM' do
|
||||||
user.user_option.skip_new_user_tips = true
|
user.user_option.skip_new_user_tips = true
|
||||||
|
|
||||||
expect { user.user_option.save! }.to change { Topic.count }.by(-1)
|
expect {
|
||||||
|
user.user_option.save!
|
||||||
|
}.to change { Topic.count }.by(-1)
|
||||||
|
.and change { UserHistory.count }.by(0)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue