A platform for community discussion. Free, open, simple.
FEATURE: Link staff action log entries to originating reviewable (#39519)
Krzysztof Kotlarekd792c7789515
diff --git a/app/models/concerns/reviewable_action_builder.rb b/app/models/concerns/reviewable_action_builder.rbindex d67bc8bc016..55a22c6b5e6 100644--- a/app/models/concerns/reviewable_action_builder.rb+++ b/app/models/concerns/reviewable_action_builder.rb@@ -82,7 +82,7 @@ module ReviewableActionBuilderenddef perform_delete_post(performed_by, _args)- PostDestroyer.new(performed_by, target_post, reviewable: self).destroy+ PostDestroyer.new(performed_by, target_post, reviewable_id: self.id).destroycreate_result(:success, :rejected, [created_by_id], false)end@@ -149,7 +149,7 @@ module ReviewableActionBuilderdef delete_user(user, delete_options, performed_by)email = user.email- UserDestroyer.new(performed_by).destroy(user, delete_options)+ UserDestroyer.new(performed_by).destroy(user, delete_options.merge(reviewable_id: self.id))message = UserNotifications.account_deleted(email, self)Email::Sender.new(message, :account_deleted).senddiff --git a/app/models/reviewable_flagged_post.rb b/app/models/reviewable_flagged_post.rbindex 5aaeec2b677..16797acc5ce 100644--- a/app/models/reviewable_flagged_post.rb+++ b/app/models/reviewable_flagged_post.rb@@ -257,7 +257,7 @@ class ReviewableFlaggedPost < Reviewabledef perform_delete_and_ignore_replies(performed_by, args)result = perform_ignore_and_do_nothing(performed_by, args)- PostDestroyer.delete_with_replies(performed_by, post, self)+ PostDestroyer.delete_with_replies(performed_by, post, self.id)resultend@@ -270,7 +270,7 @@ class ReviewableFlaggedPost < Reviewabledef perform_delete_and_agree_replies(performed_by, args)result = agree(performed_by, args)- PostDestroyer.delete_with_replies(performed_by, post, self)+ PostDestroyer.delete_with_replies(performed_by, post, self.id)resultend@@ -345,7 +345,7 @@ class ReviewableFlaggedPost < Reviewableprivatedef destroyer(performed_by, post)- PostDestroyer.new(performed_by, post, reviewable: self)+ PostDestroyer.new(performed_by, post, reviewable_id: self.id)enddef notify_poster(performed_by)diff --git a/app/models/reviewable_post.rb b/app/models/reviewable_post.rbindex 3566299a78e..5f921b635a5 100644--- a/app/models/reviewable_post.rb+++ b/app/models/reviewable_post.rb@@ -115,7 +115,7 @@ class ReviewablePost < Reviewableenddef perform_reject_and_delete(performed_by, _args)- PostDestroyer.new(performed_by, post, reviewable: self).destroy+ PostDestroyer.new(performed_by, post, reviewable_id: self.id).destroycreate_result(:success, :rejected, [created_by_id], false)enddiff --git a/app/models/reviewable_queued_post.rb b/app/models/reviewable_queued_post.rbindex 4442751228c..ca130433d0b 100644--- a/app/models/reviewable_queued_post.rb+++ b/app/models/reviewable_queued_post.rb@@ -114,9 +114,13 @@ class ReviewableQueuedPost < Reviewableself.topic_id = created_post.topic_id if topic_id.nil?save- UserSilencer.unsilence(target_created_by, performed_by) if target_created_by.silenced?+ if target_created_by.silenced?+ UserSilencer.unsilence(target_created_by, performed_by, reviewable_id: self.id)+ end- StaffActionLogger.new(performed_by).log_post_approved(created_post) if performed_by.staff?+ if performed_by.staff?+ StaffActionLogger.new(performed_by).log_post_approved(created_post, reviewable_id: self.id)+ end# Backwards compatibility, new code should listen for `reviewable_transitioned_to`DiscourseEvent.trigger(:approved_post, self, created_post)diff --git a/app/models/reviewable_user.rb b/app/models/reviewable_user.rbindex 55b356903e6..c90b63a094d 100644--- a/app/models/reviewable_user.rb+++ b/app/models/reviewable_user.rb@@ -59,7 +59,7 @@ class ReviewableUser < Reviewableif args[:send_email] != false && SiteSetting.must_approve_users?Jobs.enqueue(:critical_user_email, type: "signup_after_approval", user_id: target.id)end- StaffActionLogger.new(performed_by).log_user_approve(target)+ StaffActionLogger.new(performed_by).log_user_approve(target, reviewable_id: self.id)create_result(:success, :approved)end@@ -126,7 +126,7 @@ class ReviewableUser < ReviewableelseI18n.t("user.destroy_reasons.reviewable_reject")end- delete_args[:from_reviewable] = true+ delete_args[:reviewable_id] = self.iddestroyer.destroy(target, delete_args)rescue UserDestroyer::PostsExistError, Discourse::InvalidAccessdiff --git a/app/models/user_history.rb b/app/models/user_history.rbindex 1394e53ca6b..4ca231a86a2 100644--- a/app/models/user_history.rb+++ b/app/models/user_history.rb@@ -10,6 +10,7 @@ class UserHistory < ActiveRecord::Basebelongs_to :postbelongs_to :topicbelongs_to :category+ belongs_to :reviewable, optional: true# Each value in the context should be shorter than thisMAX_CONTEXT_LENGTH = 50_000@@ -485,6 +486,7 @@ end# post_id :integer# custom_type :string# category_id :integer+# reviewable_id :bigint## Indexes#@@ -492,6 +494,7 @@ end# index_user_histories_on_action_and_id (action,id)# index_user_histories_on_category_id (category_id)# index_user_histories_on_post_id (post_id)+# index_user_histories_on_reviewable_id (reviewable_id)# index_user_histories_on_subject_and_id (subject,id)# index_user_histories_on_target_user_id_and_id (target_user_id,id)# index_user_histories_on_topic_id_and_target_user_id_and_action (topic_id,target_user_id,action)diff --git a/app/serializers/user_history_serializer.rb b/app/serializers/user_history_serializer.rbindex fc1a394a3f7..0a1698cbc9a 100644--- a/app/serializers/user_history_serializer.rb+++ b/app/serializers/user_history_serializer.rb@@ -13,6 +13,7 @@ class UserHistorySerializer < ApplicationSerializer:topic_id,:post_id,:category_id,+ :reviewable_id,:action,:custom_type,:id@@ -56,6 +57,10 @@ class UserHistorySerializer < ApplicationSerializerobject.ip_address.try(:to_s)end+ def include_reviewable_id?+ object.reviewable_id.present?+ end+privatedef redact_content?diff --git a/app/services/staff_action_logger.rb b/app/services/staff_action_logger.rbindex a1eb8892f58..485c31be1a2 100644--- a/app/services/staff_action_logger.rb+++ b/app/services/staff_action_logger.rb@@ -3,7 +3,17 @@# Responsible for logging the actions of admins and moderators.class StaffActionLoggerdef self.base_attrs- %i[topic_id post_id category_id context subject ip_address previous_value new_value]+ %i[+ topic_id+ post_id+ category_id+ context+ subject+ ip_address+ previous_value+ new_value+ reviewable_id+ ]enddef initialize(admin)@@ -893,6 +903,7 @@ class StaffActionLoggerdetails: details.join("\n"),topic_id: topic&.id,category_id: reviewable.category_id,+ reviewable_id: reviewable.id,),)end@@ -1185,7 +1196,12 @@ class StaffActionLoggerdef params(opts = nil)opts ||= {}- { acting_user_id: @admin.id, context: opts[:context], details: opts[:details] }+ {+ acting_user_id: @admin.id,+ context: opts[:context],+ details: opts[:details],+ reviewable_id: opts[:reviewable_id],+ }enddef validate_category(category)diff --git a/app/services/user/action/silence_all.rb b/app/services/user/action/silence_all.rbindex 4136972a807..b619829001b 100644--- a/app/services/user/action/silence_all.rb+++ b/app/services/user/action/silence_all.rb@@ -5,7 +5,7 @@ class User::Action::SilenceAll < Service::ActionBaseoption :actoroption :params- delegate :message, :post_id, :silenced_till, :reason, to: :params, private: true+ delegate :message, :post_id, :silenced_till, :reason, :reviewable_id, to: :params, private: truedef callsilenced_users.first.try(:user_history).try(:details)@@ -24,6 +24,7 @@ class User::Action::SilenceAll < Service::ActionBasesilenced_till:,reason:,post_id:,+ reviewable_id:,).tap do |silencer|next unless silencer.silencediff --git a/app/services/user/action/suspend_all.rb b/app/services/user/action/suspend_all.rbindex 791feb3cff7..72da2717c8f 100644--- a/app/services/user/action/suspend_all.rb+++ b/app/services/user/action/suspend_all.rb@@ -5,7 +5,7 @@ class User::Action::SuspendAll < Service::ActionBaseoption :actoroption :params- delegate :message, :post_id, :suspend_until, :reason, to: :params, private: true+ delegate :message, :post_id, :suspend_until, :reason, :reviewable_id, to: :params, private: truedef callsuspended_users.first.try(:user_history).try(:details)@@ -22,6 +22,7 @@ class User::Action::SuspendAll < Service::ActionBaseby_user: actor,message: message,post_id: post_id,+ reviewable_id: reviewable_id,).tap(&:suspend)rescue => errDiscourse.warn_exception(err, message: "failed to suspend user with ID #{user.id}")diff --git a/app/services/user/action/trigger_post_action.rb b/app/services/user/action/trigger_post_action.rbindex 0e4129a873e..934f26108ad 100644--- a/app/services/user/action/trigger_post_action.rb+++ b/app/services/user/action/trigger_post_action.rb@@ -5,7 +5,7 @@ class User::Action::TriggerPostAction < Service::ActionBaseoption :postoption :params- delegate :post_action, to: :params, private: true+ delegate :post_action, :reviewable_id, to: :params, private: truedelegate :user, to: :guardian, private: truedef call@@ -18,12 +18,12 @@ class User::Action::TriggerPostAction < Service::ActionBasedef deletereturn unless guardian.can_delete_post_or_topic?(post)- PostDestroyer.new(user, post).destroy+ PostDestroyer.new(user, post, reviewable_id: reviewable_id).destroyenddef delete_repliesreturn unless guardian.can_delete_post_or_topic?(post)- PostDestroyer.delete_with_replies(user, post)+ PostDestroyer.delete_with_replies(user, post, reviewable_id)enddef editdiff --git a/app/services/user/silence.rb b/app/services/user/silence.rbindex 56e4ce53663..3658ce290dc 100644--- a/app/services/user/silence.rb+++ b/app/services/user/silence.rb@@ -12,6 +12,7 @@ class User::Silenceattribute :post_id, :integerattribute :post_action, :stringattribute :post_edit, :string+ attribute :reviewable_id, :integervalidates :user_id, presence: truevalidates :reason, presence: true, length: { maximum: 300 }diff --git a/app/services/user/suspend.rb b/app/services/user/suspend.rbindex c7c3c402c67..0bc69dd1757 100644--- a/app/services/user/suspend.rb+++ b/app/services/user/suspend.rb@@ -12,6 +12,7 @@ class User::Suspendattribute :post_id, :integerattribute :post_action, :stringattribute :post_edit, :string+ attribute :reviewable_id, :integervalidates :user_id, presence: truevalidates :reason, presence: true, length: { maximum: 300 }diff --git a/app/services/user_destroyer.rb b/app/services/user_destroyer.rbindex e582ad5ac8a..03b4f1a53a4 100644--- a/app/services/user_destroyer.rb+++ b/app/services/user_destroyer.rb@@ -110,7 +110,10 @@ class UserDestroyerelsedeleted_by = @actorend- StaffActionLogger.new(deleted_by).log_user_deletion(user, opts.slice(:context))+ StaffActionLogger.new(deleted_by).log_user_deletion(+ user,+ opts.slice(:context, :reviewable_id),+ )if opts.slice(:context).blank?Rails.logger.warn("User destroyed without context from: #{caller_locations(14, 1)[0]}")end@@ -120,7 +123,7 @@ class UserDestroyerend# After the user is deleted, remove the reviewable unless request comes from reviewable- return result if opts[:from_reviewable]+ return result if opts[:reviewable_id]reviewable = ReviewableUser.pending.find_by(target: user)reviewable.perform(@actor, :delete_user) if reviewable@@ -165,6 +168,7 @@ class UserDestroyer@actor.staff? ? @actor : Discourse.system_user,post,context: I18n.t("staff_action_logs.user_associated_posts_deleted"),+ reviewable_id: opts[:reviewable_id],).destroyenddiff --git a/app/services/user_silencer.rb b/app/services/user_silencer.rbindex 419ba36a0a1..d1d613aa8d5 100644--- a/app/services/user_silencer.rb+++ b/app/services/user_silencer.rb@@ -37,7 +37,7 @@ class UserSilencercontext = "#{message_type}: #{@opts[:reason]}"if @by_user- log_params = { context: context, details: details }+ log_params = { context: context, details: details, reviewable_id: @opts[:reviewable_id] }log_params[:post_id] = @opts[:post_id].to_i if @opts[:post_id]@user_history = StaffActionLogger.new(@by_user).log_silence_user(@user, log_params)@@ -97,7 +97,12 @@ class UserSilencerif @user.saveDiscourseEvent.trigger(:user_unsilenced, user: @user, by_user: @by_user)SystemMessage.create(@user, :unsilenced)- StaffActionLogger.new(@by_user).log_unsilence_user(@user) if @by_user+ if @by_user+ StaffActionLogger.new(@by_user).log_unsilence_user(+ @user,+ reviewable_id: @opts[:reviewable_id],+ )+ endendenddiff --git a/app/services/user_suspender.rb b/app/services/user_suspender.rbindex ad18291a93d..ba7fe1fa3d0 100644--- a/app/services/user_suspender.rb+++ b/app/services/user_suspender.rb@@ -3,13 +3,22 @@class UserSuspenderattr_reader :user_history- def initialize(user, suspended_till:, reason:, by_user:, message: nil, post_id: nil)+ def initialize(+ user,+ suspended_till:,+ reason:,+ by_user:,+ message: nil,+ post_id: nil,+ reviewable_id: nil+ )@user = user@suspended_till = suspended_till@reason = reason@by_user = by_user@message = message@post_id = post_id+ @reviewable_id = reviewable_idenddef suspend@@ -27,6 +36,7 @@ class UserSuspender@reason,message: @message,post_id: @post_id,+ reviewable_id: @reviewable_id,)endPushNotificationPusher.clear_subscriptions(@user)diff --git a/config/locales/client.en.yml b/config/locales/client.en.ymlindex f0c71201df1..694ec195f7f 100644--- a/config/locales/client.en.yml+++ b/config/locales/client.en.yml@@ -8088,6 +8088,7 @@ en:topic_id: "Topic ID"post_id: "Post ID"category_id: "Category ID"+ reviewable_id: "Review"delete: "Delete"edit: "Edit"save: "Save"diff --git a/db/migrate/20260415082426_add_reviewable_id_to_user_histories.rb b/db/migrate/20260415082426_add_reviewable_id_to_user_histories.rbnew file mode 100644index 00000000000..8221e9bb382--- /dev/null+++ b/db/migrate/20260415082426_add_reviewable_id_to_user_histories.rb@@ -0,0 +1,7 @@+# frozen_string_literal: true++class AddReviewableIdToUserHistories < ActiveRecord::Migration[8.0]+ def change+ add_column :user_histories, :reviewable_id, :bigint+ end+enddiff --git a/db/migrate/20260428072232_add_index_on_reviewable_id_to_user_histories.rb b/db/migrate/20260428072232_add_index_on_reviewable_id_to_user_histories.rbnew file mode 100644index 00000000000..434d71485de--- /dev/null+++ b/db/migrate/20260428072232_add_index_on_reviewable_id_to_user_histories.rb@@ -0,0 +1,10 @@+# frozen_string_literal: true++class AddIndexOnReviewableIdToUserHistories < ActiveRecord::Migration[8.0]+ disable_ddl_transaction!++ def change+ remove_index :user_histories, :reviewable_id, algorithm: :concurrently, if_exists: true+ add_index :user_histories, :reviewable_id, algorithm: :concurrently+ end+enddiff --git a/frontend/discourse/admin/components/modal/penalize-user.gjs b/frontend/discourse/admin/components/modal/penalize-user.gjsindex 04f6b19dc91..db5dc9d5e84 100644--- a/frontend/discourse/admin/components/modal/penalize-user.gjs+++ b/frontend/discourse/admin/components/modal/penalize-user.gjs@@ -103,6 +103,7 @@ export default class PenalizeUser extends Component {post_action: this.postAction,post_edit: this.postEdit,other_user_ids: this.otherUserIds,+ reviewable_id: this.args.model.reviewableId,};if (this.args.model.penaltyType === "suspend") {diff --git a/frontend/discourse/admin/models/staff-action-log.js b/frontend/discourse/admin/models/staff-action-log.jsindex f675692679a..da03ee62028 100644--- a/frontend/discourse/admin/models/staff-action-log.js+++ b/frontend/discourse/admin/models/staff-action-log.js@@ -48,6 +48,7 @@ export default class StaffActionLog extends RestModel {"topic_id","post_id","category_id",+ "reviewable_id","new_value","previous_value","details",@@ -63,12 +64,17 @@ export default class StaffActionLog extends RestModel {? `<a href data-link-topic-id="${this.topic_id}">${this.topic_id}</a>`: null;+ const reviewableLink = this.reviewable_id+ ? `<a href="/review/${this.reviewable_id}">${this.reviewable_id}</a>`+ : null;+let lines = [format("email", this.email),format("admin.logs.ip_address", this.ip_address),format("admin.logs.topic_id", topicLink, false),format("admin.logs.post_id", postLink, false),format("admin.logs.category_id", this.category_id),+ format("admin.logs.reviewable_id", reviewableLink, false),];if (!this.useCustomModalForDetails) {diff --git a/frontend/discourse/admin/services/admin-tools.js b/frontend/discourse/admin/services/admin-tools.jsindex 73eaae840c2..dab9ee37897 100644--- a/frontend/discourse/admin/services/admin-tools.js+++ b/frontend/discourse/admin/services/admin-tools.js@@ -51,6 +51,7 @@ export default class AdminToolsService extends Service {penaltyType: type,postId: opts.postId,postEdit: opts.postEdit,+ reviewableId: opts.reviewableId,user: loadedUser,before: opts.before,successCallback: async (result) => {diff --git a/frontend/discourse/app/components/reviewable/item.gjs b/frontend/discourse/app/components/reviewable/item.gjsindex fd61969da64..67b1867edc4 100644--- a/frontend/discourse/app/components/reviewable/item.gjs+++ b/frontend/discourse/app/components/reviewable/item.gjs@@ -562,6 +562,7 @@ export default class ReviewableItem extends Component {return adminTools[adminToolMethod](createdBy, {postId,postEdit,+ reviewableId: reviewable.get("id"),before: performAction,});}diff --git a/lib/post_destroyer.rb b/lib/post_destroyer.rbindex ea1ab993424..e538399650b 100644--- a/lib/post_destroyer.rb+++ b/lib/post_destroyer.rb@@ -46,14 +46,14 @@ class PostDestroyer.find_each { |post| PostDestroyer.new(Discourse.system_user, post, context: context).destroy }end- def self.delete_with_replies(performed_by, post, reviewable = nil, defer_reply_flags: true)+ def self.delete_with_replies(performed_by, post, reviewable_id = nil, defer_reply_flags: true)reply_ids = post.reply_ids(Guardian.new(performed_by), only_replies_to_single_post: false)replies = Post.where(id: reply_ids.map { |r| r[:id] })- PostDestroyer.new(performed_by, post, reviewable: reviewable).destroy+ PostDestroyer.new(performed_by, post, reviewable_id: reviewable_id).destroyoptions = { defer_flags: defer_reply_flags }if SiteSetting.notify_users_after_responses_deleted_on_flagged_post- options.merge!({ reviewable: reviewable, notify_responders: true, parent_post: post })+ options.merge!({ reviewable_id: reviewable_id, notify_responders: true, parent_post: post })endreplies.each { |reply| PostDestroyer.new(performed_by, reply, options).destroy }end@@ -205,16 +205,18 @@ class PostDestroyerremove_associated_notificationsif @user.id != @post.user_id && !@opts[:skip_staff_log]+ logger = StaffActionLogger.new(@user)+if @post.topic && @post.is_first_post?- StaffActionLogger.new(@user).log_topic_delete_recover(+ logger.log_topic_delete_recover(@post.topic,permanent? ? "delete_topic_permanently" : "delete_topic",- @opts.slice(:context),+ @opts.slice(:context, :reviewable_id),)else- StaffActionLogger.new(@user).log_post_deletion(+ logger.log_post_deletion(@post,- **@opts.slice(:context),+ **@opts.slice(:context, :reviewable_id),permanent: permanent?,)end@@ -390,7 +392,7 @@ class PostDestroyerenddef handle_reviewable_after_deletion- if @opts[:reviewable]+ if @opts[:reviewable_id]handle_explicit_reviewableelsif @post.reviewable_flaghandle_post_reviewable_flag@@ -398,8 +400,11 @@ class PostDestroyerenddef handle_explicit_reviewable+ reviewable = Reviewable.find_by(id: @opts[:reviewable_id])+ return unless reviewable+notify_deletion(- @opts[:reviewable],+ reviewable,{ notify_responders: @opts[:notify_responders], parent_post: @opts[:parent_post] },)diff --git a/plugins/discourse-ai/app/models/reviewable_ai_post.rb b/plugins/discourse-ai/app/models/reviewable_ai_post.rbindex d79be42728d..01e4040d46d 100644--- a/plugins/discourse-ai/app/models/reviewable_ai_post.rb+++ b/plugins/discourse-ai/app/models/reviewable_ai_post.rb@@ -138,25 +138,25 @@ class ReviewableAiPost < Reviewableenddef perform_delete_and_ignore_replies(performed_by, args)- PostDestroyer.delete_with_replies(performed_by, post, self)+ PostDestroyer.delete_with_replies(performed_by, post, id)perform_ignore(performed_by, args)enddef perform_delete_and_agree_replies(performed_by, args)- PostDestroyer.delete_with_replies(performed_by, post, self)+ PostDestroyer.delete_with_replies(performed_by, post, id)agreeenddef perform_delete_user(performed_by, args)- UserDestroyer.new(performed_by).destroy(post.user, delete_opts)+ UserDestroyer.new(performed_by).destroy(post.user, delete_opts.merge(reviewable_id: id))agreeenddef perform_delete_user_block(performed_by, args)- delete_options = delete_opts+ delete_options = delete_opts.merge(reviewable_id: id)delete_options.merge!(block_email: true, block_ip: true) if Rails.env.production?@@ -172,7 +172,7 @@ class ReviewableAiPost < Reviewableenddef destroyer(performed_by)- PostDestroyer.new(performed_by, post, reviewable: self)+ PostDestroyer.new(performed_by, post, reviewable_id: id)enddef agreediff --git a/plugins/discourse-ai/spec/models/reviewable_ai_post_spec.rb b/plugins/discourse-ai/spec/models/reviewable_ai_post_spec.rbindex fe125a65c48..fe2559ccc83 100644--- a/plugins/discourse-ai/spec/models/reviewable_ai_post_spec.rb+++ b/plugins/discourse-ai/spec/models/reviewable_ai_post_spec.rb@@ -234,6 +234,15 @@ describe ReviewableAiPost doexpect(result.transition_to).to eq :approvedexpect { target.user.reload }.to raise_error(ActiveRecord::RecordNotFound)end++ it "links the staff action log to the reviewable" do+ expect { reviewable.perform(admin, :delete_user) }.to change {+ UserHistory.where(+ action: UserHistory.actions[:delete_user],+ reviewable_id: reviewable.id,+ ).count+ }.by(1)+ endendit "ignores the reviewable" dodiff --git a/spec/lib/post_destroyer_spec.rb b/spec/lib/post_destroyer_spec.rbindex 2cd58b1e0b0..3fcd3c7229a 100644--- a/spec/lib/post_destroyer_spec.rb+++ b/spec/lib/post_destroyer_spec.rb@@ -719,6 +719,20 @@ RSpec.describe PostDestroyer doexpect(author.post_count).to eq(post_count - 1)expect(UserHistory.count).to eq(history_count + 1)end++ it "links the staff action log to the reviewable when passed via opts" do+ reply = create_post(topic_id: post.topic_id, user: post.user)+ reviewable = Fabricate(:reviewable_flagged_post, target: reply)++ expect {+ PostDestroyer.new(moderator, reply, reviewable_id: reviewable.id).destroy+ }.to change {+ UserHistory.where(+ action: UserHistory.actions[:delete_post],+ reviewable_id: reviewable.id,+ ).count+ }.by(1)+ endendcontext "when deleted by user with access to moderate topic category" do@@ -1125,7 +1139,7 @@ RSpec.describe PostDestroyer doit "does not ignore a potentially illegal flag on the reply" doexpect {- PostDestroyer.new(moderator, second_post, reviewable: parent_reviewable).destroy+ PostDestroyer.new(moderator, second_post, reviewable_id: parent_reviewable.id).destroy}.not_to change { reply_reviewable.reload.pending? }endend@@ -1143,7 +1157,7 @@ RSpec.describe PostDestroyer dois_warning: false,flag_topic: true,).perform- PostDestroyer.new(moderator, third_post, { reviewable: Reviewable.last }).destroy+ PostDestroyer.new(moderator, third_post, { reviewable_id: Reviewable.last.id }).destroyjobs = Jobs::SendSystemMessage.jobsexpect(jobs.size).to eq(1)diff --git a/spec/models/reviewable_flagged_post_spec.rb b/spec/models/reviewable_flagged_post_spec.rbindex 53eea9615fc..18c4fdd2897 100644--- a/spec/models/reviewable_flagged_post_spec.rb+++ b/spec/models/reviewable_flagged_post_spec.rb@@ -334,6 +334,30 @@ RSpec.describe ReviewableFlaggedPost, type: :model doexpect(nested_reply.reload.deleted_at).to be_presentend+ it "delete_and_ignore_replies links the staff action log to the reviewable" do+ create_reply(post)+ post.reload++ expect { reviewable.perform(moderator, :delete_and_ignore_replies) }.to change {+ UserHistory.where(+ action: UserHistory.actions[:delete_topic],+ reviewable_id: reviewable.id,+ ).count+ }.by(1)+ end++ it "delete_and_agree_replies links the staff action log to the reviewable" do+ create_reply(post)+ post.reload++ expect { reviewable.perform(moderator, :delete_and_agree_replies) }.to change {+ UserHistory.where(+ action: UserHistory.actions[:delete_topic],+ reviewable_id: reviewable.id,+ ).count+ }.by(1)+ end+it "disagrees with the flags" doreviewable.perform(moderator, :disagree)expect(reviewable).to be_rejecteddiff --git a/spec/models/reviewable_queued_post_spec.rb b/spec/models/reviewable_queued_post_spec.rbindex 091a39e2334..2b5df68b4ce 100644--- a/spec/models/reviewable_queued_post_spec.rb+++ b/spec/models/reviewable_queued_post_spec.rb@@ -102,6 +102,15 @@ RSpec.describe ReviewableQueuedPost, type: :model doresult = reviewable.perform(moderator, :approve_post)expect(result.success?).to eq(true)end++ it "logs a staff action linked to the reviewable" do+ expect { reviewable.perform(moderator, :approve_post) }.to change {+ UserHistory.where(+ action: UserHistory.actions[:post_approved],+ reviewable_id: reviewable.id,+ ).count+ }.by(1)+ endendcontext "with reject_post" do@@ -124,6 +133,15 @@ RSpec.describe ReviewableQueuedPost, type: :model doReviewable::InvalidAction,)end++ it "logs a staff action linked to the reviewable" do+ expect { reviewable.perform(moderator, :reject_post) }.to change {+ UserHistory.where(+ action: UserHistory.actions[:post_rejected],+ reviewable_id: reviewable.id,+ ).count+ }.by(1)+ endendcontext "with revise_and_reject_post" dodiff --git a/spec/models/reviewable_user_spec.rb b/spec/models/reviewable_user_spec.rbindex 99ca11aebfb..94b4f7403e6 100644--- a/spec/models/reviewable_user_spec.rb+++ b/spec/models/reviewable_user_spec.rb@@ -92,6 +92,15 @@ RSpec.describe ReviewableUser, type: :model doexpect(reviewable.target.approved_at).to be_presentexpect(reviewable.version > 0).to eq(true)end++ it "logs a staff action linked to the reviewable" do+ expect { reviewable.perform(moderator, :approve_user) }.to change {+ UserHistory.where(+ action: UserHistory.actions[:approve_user],+ reviewable_id: reviewable.id,+ ).count+ }.by(1)+ endendcontext "when rejecting" do@@ -189,6 +198,17 @@ RSpec.describe ReviewableUser, type: :model doexpect(reviewable.target).to be_presentexpect(reviewable.target.approved).to eq(false)end++ it "logs a staff action linked to the reviewable" do+ expect {+ reviewable.perform(moderator, :delete_user, reject_reason: "reject reason")+ }.to change {+ UserHistory.where(+ action: UserHistory.actions[:delete_user],+ reviewable_id: reviewable.id,+ ).count+ }.by(1)+ endendenddiff --git a/spec/requests/admin/staff_action_logs_controller_spec.rb b/spec/requests/admin/staff_action_logs_controller_spec.rbindex f067aa8e9f4..cdffd14a368 100644--- a/spec/requests/admin/staff_action_logs_controller_spec.rb+++ b/spec/requests/admin/staff_action_logs_controller_spec.rb@@ -128,6 +128,37 @@ RSpec.describe Admin::StaffActionLogsController doexpect(response.parsed_body["staff_action_logs"].first["details"]).to include(pm.title)end+ describe "reviewable_id" do+ it "is included when the staff action log is linked to a reviewable" do+ reviewable = Fabricate(:reviewable_queued_post_topic)+ UserHistory.create!(+ action: UserHistory.actions[:post_approved],+ acting_user_id: admin.id,+ reviewable_id: reviewable.id,+ )++ get "/admin/logs/staff_action_logs.json",+ params: {+ action_id: UserHistory.actions[:post_approved],+ }++ expect(response.parsed_body["staff_action_logs"].first["reviewable_id"]).to eq(+ reviewable.id,+ )+ end++ it "is omitted when the staff action log has no reviewable" do+ StaffActionLogger.new(admin).log_site_setting_change("title", "old", "new")++ get "/admin/logs/staff_action_logs.json",+ params: {+ action_id: UserHistory.actions[:change_site_setting],+ }++ expect(response.parsed_body["staff_action_logs"].first).not_to have_key("reviewable_id")+ end+ end+context "when staff actions are extended" dolet(:plugin_extended_action) { :confirmed_ham }before { UserHistory.stubs(:staff_actions).returns([plugin_extended_action]) }diff --git a/spec/services/user_destroyer_spec.rb b/spec/services/user_destroyer_spec.rbindex 48a6073eda9..9dc00480d66 100644--- a/spec/services/user_destroyer_spec.rb+++ b/spec/services/user_destroyer_spec.rb@@ -157,6 +157,17 @@ RSpec.describe UserDestroyer doexpect(reviewable.reload).to be_rejectedend++ it "links the staff action log to the reviewable when passed via opts" do+ expect {+ UserDestroyer.new(admin).destroy(reviewable.target, reviewable_id: reviewable.id)+ }.to change {+ UserHistory.where(+ action: UserHistory.actions[:delete_user],+ reviewable_id: reviewable.id,+ ).count+ }.by(1)+ endendcontext "with a directory item record" dodiff --git a/spec/services/user_silencer_spec.rb b/spec/services/user_silencer_spec.rbindex c4f66015f94..8ec8e1fdf29 100644--- a/spec/services/user_silencer_spec.rb+++ b/spec/services/user_silencer_spec.rb@@ -68,6 +68,17 @@ RSpec.describe UserSilencer doexpect(old_post.topic).to be_visibleend+ it "links the staff action log to the reviewable when passed via opts" do+ reviewable = Fabricate(:reviewable_flagged_post, target_created_by: user)++ expect { UserSilencer.silence(user, admin, reviewable_id: reviewable.id) }.to change {+ UserHistory.where(+ action: UserHistory.actions[:silence_user],+ reviewable_id: reviewable.id,+ ).count+ }.by(1)+ end+context "with a plugin hook" dobefore do@override_silence_message = ->(opts) dodiff --git a/spec/services/user_suspender_spec.rb b/spec/services/user_suspender_spec.rbindex 1ca55870215..bb99866068f 100644--- a/spec/services/user_suspender_spec.rb+++ b/spec/services/user_suspender_spec.rb@@ -37,6 +37,27 @@ RSpec.describe UserSuspender do}.from(0).to(1)end+ it "links the staff action log to the reviewable when passed via opts" do+ reviewable = Fabricate(:reviewable_flagged_post, target_created_by: user)+ suspender =+ UserSuspender.new(+ user,+ suspended_till: 5.hours.from_now,+ reason: "because",+ by_user: admin,+ post_id: post.id,+ message: "you have been suspended",+ reviewable_id: reviewable.id,+ )++ expect { suspender.suspend }.to change {+ UserHistory.where(+ action: UserHistory.actions[:suspend_user],+ reviewable_id: reviewable.id,+ ).count+ }.by(1)+ end+it "logs the user out" domessages = MessageBus.track_publish("/logout/#{user.id}") { suspend_user }expect(messages.size).to eq(1)