Skip to content

A platform for community discussion. Free, open, simple.

FIX: Do not show new upcoming change dot on new sites and new staff (#39682)

Martin Brennan9a6fe5c37090
diff --git a/AI-AGENTS.md b/AI-AGENTS.md
index 080040c8a74..2ae806df33f 100644
--- a/AI-AGENTS.md
+++ b/AI-AGENTS.md
@@ -114,7 +114,7 @@ ALWAYS lint any changes you make
- XSS: use `{{}}` (escaped) not `{{{ }}}`, sanitize with `sanitize`/`cook`, no `innerHTML`, careful with `@html`
- Auth: Guardian classes (`lib/guardian.rb`), POST/PUT/DELETE for state changes, CSRF tokens, `protect_from_forgery`
- Input: validate client+server, strong parameters, length limits, don't trust client-only validation
-- Authorization: Guardian classes, route+action permissions, scope limiting, `can_see?`/`can_edit?` patterns
+- Authorization: Guardian classes, route+action permissions, scope limiting, `can_see?`/`can_edit?` patterns. Use user.guardian shorthand not Guardian.new(user)
## Knowledge Sharing
- ALWAYS persist information for ALL developers (no conversational-only memory)
diff --git a/app/serializers/current_user_serializer.rb b/app/serializers/current_user_serializer.rb
index fd2ddda623d..8317161ba41 100644
--- a/app/serializers/current_user_serializer.rb
+++ b/app/serializers/current_user_serializer.rb
@@ -189,10 +189,9 @@ class CurrentUserSerializer < BasicUserSerializer
def has_new_upcoming_changes
last_visited = object.custom_fields["last_visited_upcoming_changes_at"]
-
- scope = UpcomingChangeEvent.added
- scope = scope.where("created_at > ?", Time.zone.parse(last_visited)) if last_visited.present?
- scope.exists?
+ return false if last_visited.blank? && object.created_at < Discourse.site_creation_date + 1.hour
+ cutoff = last_visited.present? ? Time.zone.parse(last_visited) : object.created_at
+ UpcomingChangeEvent.added.where("created_at > ?", cutoff).exists?
end
def can_post_anonymously
diff --git a/lib/migration/helpers.rb b/lib/migration/helpers.rb
index 59de478724a..45f338edcf7 100644
--- a/lib/migration/helpers.rb
+++ b/lib/migration/helpers.rb
@@ -3,13 +3,7 @@
module Migration
module Helpers
def self.site_created_at
- result = DB.query_single <<~SQL
- SELECT created_at
- FROM schema_migration_details
- ORDER BY created_at
- LIMIT 1
- SQL
- result.first
+ Discourse.site_creation_date
end
def self.existing_site?
diff --git a/spec/serializers/current_user_serializer_spec.rb b/spec/serializers/current_user_serializer_spec.rb
index 6179e5e0c64..717fc8f96d9 100644
--- a/spec/serializers/current_user_serializer_spec.rb
+++ b/spec/serializers/current_user_serializer_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe CurrentUserSerializer do
fab!(:user)
subject(:serializer) { described_class.new(user, scope: guardian, root: false) }
- let(:guardian) { Guardian.new(user) }
+ let(:guardian) { user.guardian }
context "when SSO is not enabled" do
it "should not include the external_id field" do
@@ -82,7 +82,7 @@ RSpec.describe CurrentUserSerializer do
end
describe "#second_factor_enabled" do
- let(:guardian) { Guardian.new(user) }
+ let(:guardian) { user.guardian }
let(:json) { serializer.as_json }
it "is false by default" do
@@ -127,7 +127,7 @@ RSpec.describe CurrentUserSerializer do
end
describe "#can_ignore_users" do
- let(:guardian) { Guardian.new(user) }
+ let(:guardian) { user.guardian }
let(:payload) { serializer.as_json }
context "when user is a regular one" do
@@ -148,7 +148,7 @@ RSpec.describe CurrentUserSerializer do
end
describe "#can_review" do
- let(:guardian) { Guardian.new(user) }
+ let(:guardian) { user.guardian }
let(:payload) { serializer.as_json }
context "when user is a regular one" do
@@ -183,7 +183,7 @@ RSpec.describe CurrentUserSerializer do
describe "#status" do
fab!(:user_status)
fab!(:user) { Fabricate(:user, user_status: user_status) }
- let(:serializer) { described_class.new(user, scope: Guardian.new(user), root: false) }
+ let(:serializer) { described_class.new(user, scope: user.guardian, root: false) }
it "adds user status when enabled" do
SiteSetting.enable_user_status = true
@@ -206,7 +206,7 @@ RSpec.describe CurrentUserSerializer do
SiteSetting.enable_user_status = true
user.user_status.ends_at = 1.minute.ago
- serializer = described_class.new(user, scope: Guardian.new(user), root: false)
+ serializer = described_class.new(user, scope: user.guardian, root: false)
json = serializer.as_json
expect(json.keys).not_to include :status
@@ -298,11 +298,11 @@ RSpec.describe CurrentUserSerializer do
Fabricate(:custom_sidebar_section_link, user: user, sidebar_section: sidebar_section)
# warmup
- described_class.new(user, scope: Guardian.new(user), root: false).as_json
+ described_class.new(user, scope: user.guardian, root: false).as_json
initial_count =
track_sql_queries do
- serialized = described_class.new(user, scope: Guardian.new(user), root: false).as_json
+ serialized = described_class.new(user, scope: user.guardian, root: false).as_json
expect(serialized[:sidebar_sections].count).to eq(2)
@@ -316,7 +316,7 @@ RSpec.describe CurrentUserSerializer do
final_count =
track_sql_queries do
- serialized = described_class.new(user, scope: Guardian.new(user), root: false).as_json
+ serialized = described_class.new(user, scope: user.guardian, root: false).as_json
expect(serialized[:sidebar_sections].count).to eq(2)
@@ -483,4 +483,69 @@ RSpec.describe CurrentUserSerializer do
end
end
end
+
+ describe "#has_new_upcoming_changes" do
+ def serialize_for(user)
+ described_class.new(user, scope: user.guardian, root: false).as_json
+ end
+
+ it "is false for an admin created during the new-site window, regardless of `added` events" do
+ Discourse.stubs(:site_creation_date).returns(10.minutes.ago)
+ admin = Fabricate(:admin)
+ UpcomingChangeEvent.create!(
+ event_type: :added,
+ upcoming_change_name: "some_setting",
+ created_at: 5.minutes.ago,
+ )
+ UpcomingChangeEvent.create!(
+ event_type: :added,
+ upcoming_change_name: "future_setting",
+ created_at: 1.minute.from_now,
+ )
+ expect(serialize_for(admin)[:has_new_upcoming_changes]).to eq(false)
+ end
+
+ it "ignores `added` events that predate the user when no last_visited is set" do
+ Discourse.stubs(:site_creation_date).returns(2.years.ago)
+ UpcomingChangeEvent.create!(
+ event_type: :added,
+ upcoming_change_name: "old_setting",
+ created_at: 1.year.ago,
+ )
+ admin = Fabricate(:admin)
+ expect(serialize_for(admin)[:has_new_upcoming_changes]).to eq(false)
+ end
+
+ it "shows `added` events created after the user when no last_visited is set" do
+ Discourse.stubs(:site_creation_date).returns(2.years.ago)
+ admin = Fabricate(:admin)
+ UpcomingChangeEvent.create!(
+ event_type: :added,
+ upcoming_change_name: "fresh_setting",
+ created_at: 1.minute.from_now,
+ )
+ expect(serialize_for(admin)[:has_new_upcoming_changes]).to eq(true)
+ end
+
+ it "honors last_visited_upcoming_changes_at when set" do
+ Discourse.stubs(:site_creation_date).returns(2.years.ago)
+ admin = Fabricate(:admin)
+ admin.custom_fields["last_visited_upcoming_changes_at"] = 1.hour.ago.iso8601
+ admin.save_custom_fields
+
+ UpcomingChangeEvent.create!(
+ event_type: :added,
+ upcoming_change_name: "before_visit",
+ created_at: 2.hours.ago,
+ )
+ expect(serialize_for(admin)[:has_new_upcoming_changes]).to eq(false)
+
+ UpcomingChangeEvent.create!(
+ event_type: :added,
+ upcoming_change_name: "after_visit",
+ created_at: 1.minute.ago,
+ )
+ expect(serialize_for(admin)[:has_new_upcoming_changes]).to eq(true)
+ end
+ end
end