github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 08:43:25 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Message for bulk closing topics silently (#27400)

Browse Source 
We were using `autoclose` as the topic status update
when silently closing topics using the bulk
actions (introduced in 0464ddcd9b).

However, this resulted in a message like this showing in
the topic as a small moderator post:

> This topic was automatically closed after X days.

This is not accurate, the topic was bulk closed by someone.
Instead, we can use `closed` as the status, and a more accurate

> Closed on DATE

message is used. `TopicStatusUpdater` needed an additional
option to keep the same "fake read" behaviour as autoclose
so we can keep the same functionality for silently closing
topics in bulk actions.
This commit is contained in:
Martin Brennan 2024-06-11 09:36:54 +10:00 committed by GitHub
parent eb6a12b920
commit 10b9a32abb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/app/components/modal/bulk-topic-actions.gjs
View File

@ -87,7 +87,9 @@ export default class BulkTopicActions extends Component {
const options = {}; const options = {};
if (this.isSilent) { if (this.isSilent) {
operation = { type: "silent_close" }; const newType =
operation.type === "close" ? "silent_close" : operation.type;
operation.type = newType;
} }
if (this.isCloseAction && this.closeNote) { if (this.isCloseAction && this.closeNote) {

10
app/services/topic_status_updater.rb
View File

@ -13,7 +13,11 @@ TopicStatusUpdater =
if updated if updated
highest_post_number = topic.highest_post_number highest_post_number = topic.highest_post_number
create_moderator_post_for(status, opts) create_moderator_post_for(status, opts)
update_read_state_for(status, highest_post_number) update_read_state_for(
status,
highest_post_number,
silent_tracking: opts[:silent_tracking],
)
end end
end end
@ -90,8 +94,8 @@ TopicStatusUpdater =
topic.reload topic.reload
end end
def update_read_state_for(status, old_highest_read) def update_read_state_for(status, old_highest_read, silent_tracking: false)
if status.autoclosed? && status.enabled? if (status.autoclosed? && status.enabled?) || (status.closed? && silent_tracking)
# let's pretend all the people that read up to the autoclose message # let's pretend all the people that read up to the autoclose message
# actually read the topic # actually read the topic
PostTiming.pretend_read(topic.id, old_highest_read, topic.highest_post_number) PostTiming.pretend_read(topic.id, old_highest_read, topic.highest_post_number)

7
lib/topics_bulk_action.rb
View File

@ -174,7 +174,12 @@ class TopicsBulkAction
def silent_close def silent_close
topics.each do |t| topics.each do |t|
if guardian.can_moderate?(t) if guardian.can_moderate?(t)
t.update_status("autoclosed", true, @user, { message: @operation[:message] }) t.update_status(
"closed",
true,
@user,
{ message: @operation[:message], silent_tracking: true },
)
@changed_ids << t.id @changed_ids << t.id
end end
end end