A platform for community discussion. Free, open, simple.
DEV: retire solved badges upcoming change (#42925)
David Battersby497d925fba8a
diff --git a/db/structure.sql b/db/structure.sqlindex 2169b8ffa09..1f5ecc2e7ab 100644--- a/db/structure.sql+++ b/db/structure.sql@@ -24417,6 +24417,7 @@ INSERT INTO "schema_migrations" (version) VALUES('20260831162602'),('20260828145150'),('20260827064809'),+('20260826133816'),('20260826124054'),('20260826090055'),('20260824214608'),diff --git a/plugins/discourse-solved/app/services/discourse_solved/enable_solved_badges_toggled.rb b/plugins/discourse-solved/app/services/discourse_solved/enable_solved_badges_toggled.rbdeleted file mode 100644index b8ccaef461f..00000000000--- a/plugins/discourse-solved/app/services/discourse_solved/enable_solved_badges_toggled.rb+++ /dev/null@@ -1,23 +0,0 @@-# frozen_string_literal: true--# Reacts to the `enable_solved_badges` upcoming change being enabled or disabled-# (manually or via auto-promotion). See the on(:upcoming_change_enabled) /-# on(:upcoming_change_disabled) subscriptions in plugin.rb for the dispatch.-#-# Enabling turns on the four seeded Solved badges; disabling turns them back off.-#-# New sites are handled separately by the badge seed fixture-# (db/fixtures/001_badges.rb): the promotion event does not fire on brand-new-# sites (UpcomingChanges.should_notify_admins? is false there), so the seed is-# what gives freshly provisioned sites their enabled-by-default badges.-module DiscourseSolved- class EnableSolvedBadgesToggled < Service::ActionBase- BADGE_NAMES = ["Solved 1", "Solved 2", "Solved 3", "Solved 4"].freeze-- option :enabled-- def call- Badge.where(name: BADGE_NAMES).update_all(enabled:)- end- end-enddiff --git a/plugins/discourse-solved/config/locales/server.en.yml b/plugins/discourse-solved/config/locales/server.en.ymlindex 43788b6e3ef..689ff994832 100644--- a/plugins/discourse-solved/config/locales/server.en.yml+++ b/plugins/discourse-solved/config/locales/server.en.yml@@ -47,7 +47,6 @@ en:prioritize_solved_topics_in_search: "Prioritize solved topics in search results."enable_support_category_type_setup: "Enables the Support category type option during category creation setup."enable_solved_shared_issues: "Adds a “Me too” button to unsolved topics in support categories, letting members signal they’re experiencing the same issue and opt-in to notifications about the topic's solution."- enable_solved_badges: "Enables the Solved badges awarded to members when they provide solutions to others’ questions."show_who_marked_solved: "Show who marked the topic as solved. This is indicated in the topic's first post, and the answer post in a tooltip."keywords:diff --git a/plugins/discourse-solved/config/settings.yml b/plugins/discourse-solved/config/settings.ymlindex 8faa9bcdf20..124fb0b3237 100644--- a/plugins/discourse-solved/config/settings.yml+++ b/plugins/discourse-solved/config/settings.yml@@ -82,15 +82,6 @@ discourse_solved:impact: "feature,all_members"learn_more_url: "https://meta.discourse.org/t/-/402498"permanent_warning: false- enable_solved_badges:- default: false- hidden: true- client: true- upcoming_change:- status: "stable"- impact: "site_setting_default,all_members"- learn_more_url: "https://meta.discourse.org/t/-/406386"- permanent_warning: falsediscourse_solved_admin_dashboard_seeded:default: falsehidden: truediff --git a/plugins/discourse-solved/db/post_migrate/20260826133816_remove_enable_solved_badges_setting.rb b/plugins/discourse-solved/db/post_migrate/20260826133816_remove_enable_solved_badges_setting.rbnew file mode 100644index 00000000000..bf1b22e5154--- /dev/null+++ b/plugins/discourse-solved/db/post_migrate/20260826133816_remove_enable_solved_badges_setting.rb@@ -0,0 +1,12 @@+# frozen_string_literal: true++class RemoveEnableSolvedBadgesSetting < ActiveRecord::Migration[8.0]+ def up+ execute "DELETE FROM site_settings WHERE name = 'enable_solved_badges'"+ execute "DELETE FROM site_setting_groups WHERE name = 'enable_solved_badges'"+ end++ def down+ raise ActiveRecord::IrreversibleMigration+ end+enddiff --git a/plugins/discourse-solved/plugin.rb b/plugins/discourse-solved/plugin.rbindex e2a927b4148..339c1837eb9 100644--- a/plugins/discourse-solved/plugin.rb+++ b/plugins/discourse-solved/plugin.rb@@ -357,18 +357,6 @@ after_initialize doscope.shared_issue_visible?(object.topic)end- on(:upcoming_change_enabled) do |setting_name|- if setting_name == :enable_solved_badges- DiscourseSolved::EnableSolvedBadgesToggled.call(enabled: true)- end- end-- on(:upcoming_change_disabled) do |setting_name|- if setting_name == :enable_solved_badges- DiscourseSolved::EnableSolvedBadgesToggled.call(enabled: false)- end- end-on(:post_destroyed) do |post|DiscourseSolved::UnacceptAnswer.call(params: {diff --git a/plugins/discourse-solved/spec/integration/enable_solved_badges_spec.rb b/plugins/discourse-solved/spec/integration/solved_badges_seed_spec.rbsimilarity index 87%rename from plugins/discourse-solved/spec/integration/enable_solved_badges_spec.rbrename to plugins/discourse-solved/spec/integration/solved_badges_seed_spec.rbindex d3b086fef58..f59cfdf00f8 100644--- a/plugins/discourse-solved/spec/integration/enable_solved_badges_spec.rb+++ b/plugins/discourse-solved/spec/integration/solved_badges_seed_spec.rb@@ -1,6 +1,6 @@# frozen_string_literal: true-RSpec.describe "Enable Solved badges by default upcoming change" do+RSpec.describe "Solved badge seeds" dolet(:badge_names) { ["Solved 1", "Solved 2", "Solved 3", "Solved 4"] }describe "seeding the Solved badges on a new site" dodiff --git a/plugins/discourse-solved/spec/services/discourse_solved/enable_solved_badges_toggled_spec.rb b/plugins/discourse-solved/spec/services/discourse_solved/enable_solved_badges_toggled_spec.rbdeleted file mode 100644index 209e582d24a..00000000000--- a/plugins/discourse-solved/spec/services/discourse_solved/enable_solved_badges_toggled_spec.rb+++ /dev/null@@ -1,26 +0,0 @@-# frozen_string_literal: true--RSpec.describe DiscourseSolved::EnableSolvedBadgesToggled do- let(:badge_names) { DiscourseSolved::EnableSolvedBadgesToggled::BADGE_NAMES }- let(:solved_badges) { Badge.where(name: badge_names) }-- describe "enabling" do- before { solved_badges.update_all(enabled: false) }-- it "enables all four Solved badges" do- described_class.call(enabled: true)-- expect(solved_badges.where(enabled: true).count).to eq(4)- end- end-- describe "disabling" do- before { solved_badges.update_all(enabled: true) }-- it "disables all four Solved badges" do- described_class.call(enabled: false)-- expect(solved_badges.where(enabled: false).count).to eq(4)- end- end-end