Skip to content

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

DEV: Improve banner topic permissions for read-restricted and unlisted topics (#38556)

Isaac Janzen4f3613eefbbd
diff --git a/app/serializers/topic_view_details_serializer.rb b/app/serializers/topic_view_details_serializer.rb
index 22ae968e3fb..feb31a83dba 100644
--- a/app/serializers/topic_view_details_serializer.rb
+++ b/app/serializers/topic_view_details_serializer.rb
@@ -23,6 +23,7 @@ class TopicViewDetailsSerializer < ApplicationSerializer
can_edit_staff_notes
can_toggle_topic_visibility
can_pin_unpin_topic
+ can_banner_topic
can_moderate_category
]
end
@@ -159,6 +160,10 @@ class TopicViewDetailsSerializer < ApplicationSerializer
scope.can_pin_unpin_topic?(object.topic)
end
+ def include_can_banner_topic?
+ scope.can_banner_topic?(object.topic)
+ end
+
def can_perform_action_available_to_group_moderators?
@can_perform_action_available_to_group_moderators ||=
scope.can_perform_action_available_to_group_moderators?(object.topic)
diff --git a/frontend/discourse/app/components/modal/feature-topic.gjs b/frontend/discourse/app/components/modal/feature-topic.gjs
index 7f79c98c228..710a9f827c4 100644
--- a/frontend/discourse/app/components/modal/feature-topic.gjs
+++ b/frontend/discourse/app/components/modal/feature-topic.gjs
@@ -376,7 +376,7 @@ export default class FeatureTopic extends Component {
{{/if}}
{{/if}}
<hr />
- {{#if this.currentUser.staff}}
+ {{#if @model.topic.details.can_banner_topic}}
<div class="feature-section">
<div class="desc">
<p>
diff --git a/frontend/discourse/app/components/topic-admin-menu.gjs b/frontend/discourse/app/components/topic-admin-menu.gjs
index 2c1132fb797..e9b7be346f6 100644
--- a/frontend/discourse/app/components/topic-admin-menu.gjs
+++ b/frontend/discourse/app/components/topic-admin-menu.gjs
@@ -161,7 +161,7 @@ export default class TopicAdminMenu extends Component {
(and
this.details.can_pin_unpin_topic
(not this.isPrivateMessage)
- (or this.visible this.featured)
+ (or this.visible this.featured this.details.can_banner_topic)
)
}}
<dropdown.item class="topic-admin-pin">
diff --git a/frontend/discourse/tests/acceptance/topic-test.js b/frontend/discourse/tests/acceptance/topic-test.js
index beea82f501e..e4775dba6b8 100644
--- a/frontend/discourse/tests/acceptance/topic-test.js
+++ b/frontend/discourse/tests/acceptance/topic-test.js
@@ -321,7 +321,26 @@ acceptance(`Topic featured links`, function (needs) {
await click(".topic-admin-visible .btn");
await click(".toggle-admin-menu");
- assert.dom(".topic-admin-pin").exists("should show the multi select menu");
+ assert.dom(".topic-admin-pin").exists("should show the pin menu item");
+ });
+
+ test("Bannering unlisted topic", async function (assert) {
+ await visit("/t/internationalization-localization/280");
+
+ await click(".toggle-admin-menu");
+ await click(".topic-admin-visible .btn");
+
+ await click(".toggle-admin-menu");
+ assert
+ .dom(".topic-admin-pin")
+ .exists(
+ "should show the pin menu item for unlisted topics with can_banner_topic"
+ );
+
+ await click(".topic-admin-pin .btn");
+ assert
+ .dom(".make-banner")
+ .exists("should show the banner button for unlisted topics");
});
test("selecting posts", async function (assert) {
@@ -481,6 +500,11 @@ acceptance(`Topic pinning/unpinning as a staff member`, function (needs) {
acceptance(`Topic pinning/unpinning as a group moderator`, function (needs) {
needs.user({ moderator: false, admin: false, trust_level: 1 });
+ needs.pretender((server, helper) => {
+ const topicResponse = cloneJSON(topicFixtures["/t/2480/1.json"]);
+ delete topicResponse.details.can_banner_topic;
+ server.get("/t/2480.json", () => helper.response(topicResponse));
+ });
test("Group category moderator pinning topic", async function (assert) {
await visit("/t/topic-for-group-moderators/2480");
diff --git a/frontend/discourse/tests/acceptance/topic-timeline-test.js b/frontend/discourse/tests/acceptance/topic-timeline-test.js
index 0d25e8abde0..05afcccb3d8 100644
--- a/frontend/discourse/tests/acceptance/topic-timeline-test.js
+++ b/frontend/discourse/tests/acceptance/topic-timeline-test.js
@@ -294,6 +294,7 @@ acceptance("Glimmer Topic Timeline", function (needs) {
can_edit_staff_notes: true,
can_toggle_topic_visibility: true,
can_pin_unpin_topic: true,
+ can_banner_topic: true,
can_moderate_category: true,
can_remove_self_id: 7,
participants: [
diff --git a/frontend/discourse/tests/fixtures/topic.js b/frontend/discourse/tests/fixtures/topic.js
index d467493f222..1e4ffbc55ca 100644
--- a/frontend/discourse/tests/fixtures/topic.js
+++ b/frontend/discourse/tests/fixtures/topic.js
@@ -2188,6 +2188,7 @@ export default {
can_invite_via_email: true,
can_toggle_topic_visibility: true,
can_pin_unpin_topic: true,
+ can_banner_topic: true,
auto_close_at: null,
auto_close_hours: null,
auto_close_based_on_last_post: false,
@@ -5765,6 +5766,7 @@ export default {
can_split_merge_topic: true,
can_edit_staff_notes: true,
can_pin_unpin_topic: true,
+ can_banner_topic: true,
can_moderate_category: true,
participants: [
{
@@ -6113,6 +6115,7 @@ export default {
can_split_merge_topic: true,
can_edit_staff_notes: true,
can_pin_unpin_topic: true,
+ can_banner_topic: true,
can_moderate_category: true,
participants: [
{
@@ -6297,6 +6300,7 @@ export default {
can_invite_via_email: true,
can_toggle_topic_visibility: true,
can_pin_unpin_topic: true,
+ can_banner_topic: true,
auto_close_at: null,
auto_close_hours: null,
auto_close_based_on_last_post: false,
@@ -6643,6 +6647,7 @@ export default {
can_invite_via_email: true,
can_toggle_topic_visibility: true,
can_pin_unpin_topic: true,
+ can_banner_topic: true,
auto_close_at: null,
auto_close_hours: null,
auto_close_based_on_last_post: false,
@@ -6980,6 +6985,7 @@ export default {
can_invite_via_email: true,
can_toggle_topic_visibility: true,
can_pin_unpin_topic: true,
+ can_banner_topic: true,
auto_close_at: null,
auto_close_hours: null,
auto_close_based_on_last_post: false,
diff --git a/plugins/automation/lib/discourse_automation/scripts/banner_topic.rb b/plugins/automation/lib/discourse_automation/scripts/banner_topic.rb
index 18c921395c2..b7aff82810e 100644
--- a/plugins/automation/lib/discourse_automation/scripts/banner_topic.rb
+++ b/plugins/automation/lib/discourse_automation/scripts/banner_topic.rb
@@ -17,6 +17,7 @@ DiscourseAutomation::Scriptable.add(DiscourseAutomation::Scripts::BANNER_TOPIC)
username = fields.dig("user", "value") || Discourse.system_user.username
next unless user = User.find_by(username: username)
+ next unless Guardian.new(user).can_banner_topic?(topic)
topic.make_banner!(user, banner_until)
end
diff --git a/plugins/automation/spec/scripts/banner_topic_spec.rb b/plugins/automation/spec/scripts/banner_topic_spec.rb
index 8c940cf0a1d..1d34db92cf6 100644
--- a/plugins/automation/spec/scripts/banner_topic_spec.rb
+++ b/plugins/automation/spec/scripts/banner_topic_spec.rb
@@ -37,4 +37,18 @@ describe "BannerTopic" do
expect(topic.archetype).to eq(Archetype.banner)
end
end
+
+ context "when topic is in a read-restricted category" do
+ fab!(:group)
+ fab!(:private_category) { Fabricate(:private_category, group: group) }
+
+ before { topic.update!(category: private_category) }
+
+ it "does not banner the topic" do
+ automation.trigger!
+ topic.reload
+
+ expect(topic.archetype).to eq(Archetype.default)
+ end
+ end
end
diff --git a/spec/requests/api/schemas/json/topic_show_response.json b/spec/requests/api/schemas/json/topic_show_response.json
index bbaa657533d..2a269b3d953 100644
--- a/spec/requests/api/schemas/json/topic_show_response.json
+++ b/spec/requests/api/schemas/json/topic_show_response.json
@@ -783,6 +783,9 @@
"can_pin_unpin_topic": {
"type": "boolean"
},
+ "can_banner_topic": {
+ "type": "boolean"
+ },
"can_moderate_category": {
"type": "boolean"
},