A platform for community discussion. Free, open, simple.
FEATURE: Record and display scheduled moderation expiry
Jake Goldsborough6b70ebfe0468
diff --git a/app/models/user_history.rb b/app/models/user_history.rbindex a633217bf65..deb85169f3e 100644--- a/app/models/user_history.rb+++ b/app/models/user_history.rb@@ -502,6 +502,7 @@ end# custom_type :string# details :text# email :string+# expires_at :datetime# ip_address :string# new_value :text# previous_value :textdiff --git a/app/serializers/user_history_serializer.rb b/app/serializers/user_history_serializer.rbindex 0a1698cbc9a..f70fdb49fc4 100644--- a/app/serializers/user_history_serializer.rb+++ b/app/serializers/user_history_serializer.rb@@ -7,6 +7,7 @@ class UserHistorySerializer < ApplicationSerializer:ip_address,:email,:created_at,+ :expires_at,:subject,:previous_value,:new_value,@@ -34,6 +35,10 @@ class UserHistorySerializer < ApplicationSerializerredact_content? ? nil : object.contextend+ def expires_at+ redact_content? ? nil : object.expires_at+ end+def new_valuereturn nil if redact_content?if object.new_valuediff --git a/app/services/staff_action_logger.rb b/app/services/staff_action_logger.rbindex 844ceb4c837..dfdfcb9031c 100644--- a/app/services/staff_action_logger.rb+++ b/app/services/staff_action_logger.rb@@ -556,6 +556,7 @@ class StaffActionLoggeraction: UserHistory.actions[:suspend_user],target_user_id: user.id,details: details,+ expires_at: user.suspended_till,)args[:post_id] = opts[:post_id] if opts[:post_id]UserHistory.create!(args)@@ -821,6 +822,7 @@ class StaffActionLoggeraction: UserHistory.actions[:silence_user],target_user_id: user.id,details: opts[:details],+ expires_at: user.silenced_till,)create_args[:post_id] = opts[:post_id] if opts[:post_id]diff --git a/config/locales/client.en.yml b/config/locales/client.en.ymlindex f0f1d3a0a07..fa3befa34cb 100644--- a/config/locales/client.en.yml+++ b/config/locales/client.en.yml@@ -9572,6 +9572,9 @@ en:previous_value: "Previous"new_value: "New"show: "Show"+ scheduled_duration: "Scheduled duration"+ scheduled_expiry: "Scheduled expiry"+ indefinite: "Indefinite"modal_title: "Details"no_previous: "There is no previous value."deleted: "No new value. The record was deleted."diff --git a/db/migrate/20261018172000_add_expires_at_to_user_histories.rb b/db/migrate/20261018172000_add_expires_at_to_user_histories.rbnew file mode 100644index 00000000000..0fcf7ced45d--- /dev/null+++ b/db/migrate/20261018172000_add_expires_at_to_user_histories.rb@@ -0,0 +1,7 @@+# frozen_string_literal: true++class AddExpiresAtToUserHistories < ActiveRecord::Migration[8.1]+ def change+ add_column :user_histories, :expires_at, :datetime+ end+enddiff --git a/db/structure.sql b/db/structure.sqlindex e9205d2fda8..619060e911a 100644--- a/db/structure.sql+++ b/db/structure.sql@@ -12873,7 +12873,8 @@ CREATE TABLE public.user_histories (post_id integer,custom_type character varying,category_id integer,- reviewable_id bigint+ reviewable_id bigint,+ expires_at timestamp(6) without time zone);@@ -26088,6 +26089,7 @@ ALTER TABLE ONLY public.ad_plugin_house_ads_groupsSET search_path TO "$user", public;INSERT INTO "schema_migrations" (version) VALUES+('20261018172000'),('20261015175355'),('20261015175340'),('20261015121116'),diff --git a/frontend/discourse/admin/models/staff-action-log.js b/frontend/discourse/admin/models/staff-action-log.jsindex f9aad6a1a1a..748884f63e1 100644--- a/frontend/discourse/admin/models/staff-action-log.js+++ b/frontend/discourse/admin/models/staff-action-log.js@@ -1,6 +1,7 @@import { computed } from "@ember/object";import AdminUser from "discourse/admin/models/admin-user";import { ajax } from "discourse/lib/ajax";+import { duration, longDate } from "discourse/lib/formatter";import getURL from "discourse/lib/get-url";import { escapeExpression } from "discourse/lib/utilities";import RestModel from "discourse/models/rest";@@ -55,6 +56,8 @@ export default class StaffActionLog extends RestModel {"new_value","previous_value","details",+ "created_at",+ "expires_at","useCustomModalForDetails","useModalForDetails")@@ -91,6 +94,34 @@ export default class StaffActionLog extends RestModel {lines = [...lines, ...escapeExpression(this.details).split("\n")];}+ if (this.created_at && this.expires_at) {+ const created = moment(this.created_at);+ const expires = moment(this.expires_at);+ if (+ created.isValid() &&+ expires.isValid() &&+ expires.isSameOrAfter(created)+ ) {+ const indefinite = expires.diff(created, "years") > 100;+ lines.push(+ format(+ "admin.logs.staff_actions.scheduled_duration",+ indefinite+ ? i18n("admin.logs.staff_actions.indefinite")+ : duration(expires.diff(created, "seconds"), { format: "medium" })+ )+ );+ if (!indefinite) {+ lines.push(+ format(+ "admin.logs.staff_actions.scheduled_expiry",+ longDate(expires)+ )+ );+ }+ }+ }+const formatted = lines.filter((l) => l.length > 0).join("<br/>");return formatted.length > 0 ? formatted + "<br/>" : "";}diff --git a/frontend/discourse/tests/unit/models/staff-action-log-test.js b/frontend/discourse/tests/unit/models/staff-action-log-test.jsindex 88594e07d39..d8b49aba118 100644--- a/frontend/discourse/tests/unit/models/staff-action-log-test.js+++ b/frontend/discourse/tests/unit/models/staff-action-log-test.js@@ -5,6 +5,50 @@ import { module, test } from "qunit";module("Unit | Model | staff-action-log", function (hooks) {setupTest(hooks);+ test("shows the scheduled duration and expiry alongside the reason", function (assert) {+ const model = getOwner(this)+ .lookup("service:store")+ .createRecord("staff-action-log", {+ created_at: "2026-10-01T12:00:00Z",+ expires_at: "2026-10-08T12:00:00Z",+ details: "Spamming",+ });++ assert.true(model.formattedDetails.includes("Spamming"));+ assert.true(+ model.formattedDetails.includes("<b>Scheduled duration:</b> 7 days")+ );+ assert.true(model.formattedDetails.includes("<b>Scheduled expiry:</b>"));++ model.set("expires_at", null);+ assert.strictEqual(model.formattedDetails, "Spamming<br/>");+ });++ test("shows indefinite restrictions without a far-future date", function (assert) {+ const model = getOwner(this)+ .lookup("service:store")+ .createRecord("staff-action-log", {+ created_at: "2026-10-01T12:00:00Z",+ expires_at: "3026-10-01T12:00:00Z",+ });++ assert.true(model.formattedDetails.includes("Indefinite"));+ assert.false(model.formattedDetails.includes("Scheduled expiry"));+ });++ test("ignores invalid expiry intervals", function (assert) {+ const model = getOwner(this)+ .lookup("service:store")+ .createRecord("staff-action-log", {+ created_at: "2026-10-01T12:00:00Z",+ expires_at: "2026-09-01T12:00:00Z",+ });++ assert.strictEqual(model.formattedDetails, "");+ model.set("expires_at", "invalid");+ assert.strictEqual(model.formattedDetails, "");+ });+test("create", function (assert) {const store = getOwner(this).lookup("service:store");assert.true(diff --git a/spec/serializers/user_history_serializer_spec.rb b/spec/serializers/user_history_serializer_spec.rbnew file mode 100644index 00000000000..5fc3e1a73f3--- /dev/null+++ b/spec/serializers/user_history_serializer_spec.rb@@ -0,0 +1,48 @@+# frozen_string_literal: true++RSpec.describe UserHistorySerializer do+ fab!(:admin)+ fab!(:user)++ it "includes the scheduled expiry" do+ freeze_time+ history =+ Fabricate(+ :user_history,+ action: UserHistory.actions[:suspend_user],+ target_user: user,+ expires_at: 2.days.from_now,+ )++ json = described_class.new(history, scope: admin.guardian, root: false).as_json++ expect(json[:expires_at]).to eq_time(history.expires_at)+ end++ it "leaves expiry unknown for logs without a snapshot" do+ user.update!(suspended_till: 2.days.from_now)+ history =+ Fabricate(:user_history, action: UserHistory.actions[:suspend_user], target_user: user)++ json = described_class.new(history, scope: admin.guardian, root: false).as_json++ expect(json).to have_key(:expires_at)+ expect(json[:expires_at]).to be_nil+ end++ it "redacts expiry when the log content is not visible" do+ post = Fabricate(:private_message_post)+ history =+ Fabricate(+ :user_history,+ action: UserHistory.actions[:silence_user],+ target_user: user,+ post: post,+ expires_at: 2.days.from_now,+ )++ json = described_class.new(history, scope: Fabricate(:moderator).guardian, root: false).as_json++ expect(json[:expires_at]).to be_nil+ end+enddiff --git a/spec/services/user_silencer_spec.rb b/spec/services/user_silencer_spec.rbindex ace4e1a41e3..aa538e30088 100644--- a/spec/services/user_silencer_spec.rb+++ b/spec/services/user_silencer_spec.rb@@ -32,6 +32,28 @@ RSpec.describe UserSilencer doexpect(count).to eq(1)end+ it "preserves the scheduled expiry in the log after an early unsilencing" do+ freeze_time(Time.zone.now.round)+ UserSilencer.silence(user, admin, silenced_till: 2.days.from_now)++ history = user.user_histories.find_by!(action: UserHistory.actions[:silence_user])+ expect(history.expires_at).to eq_time(user.reload.silenced_till)++ UserSilencer.unsilence(user, admin)++ expect(history.reload.expires_at).to eq_time(2.days.from_now)+ expect(+ user.user_histories.find_by!(action: UserHistory.actions[:unsilence_user]).expires_at,+ ).to be_nil+ end++ it "logs the expiry used for an indefinite silence" do+ UserSilencer.silence(user, admin)++ history = user.user_histories.find_by!(action: UserHistory.actions[:silence_user])+ expect(history.expires_at).to eq_time(user.reload.silenced_till)+ end+it "removes featured rows for hidden topics" doCategoryFeaturedTopic.create!(category: post.topic.category, topic: post.topic)diff --git a/spec/services/user_suspender_spec.rb b/spec/services/user_suspender_spec.rbindex e5ef4afe188..d944e47c087 100644--- a/spec/services/user_suspender_spec.rb+++ b/spec/services/user_suspender_spec.rb@@ -47,6 +47,21 @@ RSpec.describe UserSuspender do}.from(0).to(1)end+ it "preserves the scheduled expiry in the log after an early unsuspension" do+ freeze_time(Time.zone.now.round)+ suspend_user++ history = user.user_histories.find_by!(action: UserHistory.actions[:suspend_user])+ expect(history.expires_at).to eq_time(user.reload.suspended_till)++ UserSuspender.unsuspend(user, by_user: admin)++ expect(history.reload.expires_at).to eq_time(5.hours.from_now)+ expect(+ user.user_histories.find_by!(action: UserHistory.actions[:unsuspend_user]).expires_at,+ ).to be_nil+ end+it "links the staff action log to the reviewable when passed via opts" doreviewable = Fabricate(:reviewable_flagged_post, target_created_by: user)suspender =diff --git a/spec/system/admin_staff_action_logs_spec.rb b/spec/system/admin_staff_action_logs_spec.rbindex d2c99eee742..178e67477c1 100644--- a/spec/system/admin_staff_action_logs_spec.rb+++ b/spec/system/admin_staff_action_logs_spec.rb@@ -33,6 +33,64 @@ describe "Admin staff action logs" dobefore { sign_in(current_user) }+ it "shows scheduled restrictions alongside their reasons" do+ user = Fabricate(:user, username: "example_user")+ created_at = 3.hours.ago+ suspension =+ Fabricate(+ :user_history,+ action: UserHistory.actions[:suspend_user],+ acting_user: current_user,+ target_user: user,+ details: "Spamming",+ created_at: created_at,+ expires_at: created_at + 7.days,+ )+ silence =+ Fabricate(+ :user_history,+ action: UserHistory.actions[:silence_user],+ acting_user: current_user,+ target_user: user,+ details: "Advertising",+ created_at: 2.days.ago,+ expires_at: 1.day.ago,+ )+ indefinite =+ Fabricate(+ :user_history,+ action: UserHistory.actions[:silence_user],+ acting_user: current_user,+ target_user: user,+ details: "Repeated spam",+ created_at: 3.days.ago,+ expires_at: 1000.years.from_now,+ )+ legacy =+ Fabricate(+ :user_history,+ action: UserHistory.actions[:suspend_user],+ acting_user: current_user,+ target_user: user,+ details: "Spamming",+ created_at: 5.days.ago,+ )++ filters = { target_user: user.username }.to_json+ visit "/admin/logs/staff_action_logs?filters=#{CGI.escape(filters)}"++ expect(staff_action_logs_page.log_row(suspension)).to have_content("Spamming")+ expect(staff_action_logs_page.log_row(suspension)).to have_content("Scheduled duration: 7 days")+ expect(staff_action_logs_page.log_row(suspension)).to have_content("Scheduled expiry:")+ expect(staff_action_logs_page.log_row(silence)).to have_content("Scheduled duration: 1 day")+ expect(staff_action_logs_page.log_row(indefinite)).to have_content(+ "Scheduled duration: Indefinite",+ )+ expect(staff_action_logs_page.log_row(indefinite)).to have_no_content("Scheduled expiry:")+ expect(staff_action_logs_page.log_row(legacy)).to have_content("Spamming")+ expect(staff_action_logs_page.log_row(legacy)).to have_no_content("Scheduled duration:")+ end+it "shows details for an action" dovisit "/admin/logs/staff_action_logs"