Skip to content

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

FEATURE: Support group based category posting review modes (#38707)

Alan Guo Xiang Tanc6db6c880c50
diff --git a/app/assets/stylesheets/common/base/edit-category.scss b/app/assets/stylesheets/common/base/edit-category.scss
index e04837d4252..e4f041ff9da 100644
--- a/app/assets/stylesheets/common/base/edit-category.scss
+++ b/app/assets/stylesheets/common/base/edit-category.scss
@@ -380,6 +380,14 @@ div.edit-category {
}
}
+.posting-review-group-chooser {
+ margin-top: 0.5em;
+
+ .form-kit__field & {
+ margin-top: 0;
+ }
+}
+
.edit-category .add-group {
margin: 1em 0 2em;
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index 3f0cd507cee..1065e77c019 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -642,6 +642,8 @@ class CategoriesController < ApplicationController
:allow_global_tags,
:read_only_banner,
:default_list_filter,
+ { topic_posting_review_group_ids: [] },
+ { reply_posting_review_group_ids: [] },
*conditional_param_keys,
]
@@ -657,6 +659,8 @@ class CategoriesController < ApplicationController
num_auto_bump_daily
require_reply_approval
require_topic_approval
+ topic_posting_review_mode
+ reply_posting_review_mode
],
custom_fields: {
},
diff --git a/app/models/category.rb b/app/models/category.rb
index 6f322cc1679..87c5fb12999 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -38,8 +38,16 @@ class Category < ActiveRecord::Base
has_many :category_groups, dependent: :destroy
has_many :category_moderation_groups, dependent: :destroy
has_many :category_posting_review_groups, dependent: :destroy
+ has_many :topic_posting_review_records,
+ -> { where(post_type: :topic) },
+ class_name: "CategoryPostingReviewGroup"
+ has_many :reply_posting_review_records,
+ -> { where(post_type: :reply) },
+ class_name: "CategoryPostingReviewGroup"
has_many :groups, through: :category_groups
has_many :moderating_groups, through: :category_moderation_groups, source: :group
+ has_many :topic_posting_review_groups, through: :topic_posting_review_records, source: :group
+ has_many :reply_posting_review_groups, through: :reply_posting_review_records, source: :group
has_many :topic_timers, dependent: :destroy
has_many :upload_references, as: :target, dependent: :destroy
@@ -54,6 +62,10 @@ class Category < ActiveRecord::Base
:require_topic_approval,
:require_topic_approval=,
:require_topic_approval?,
+ :topic_posting_review_mode,
+ :topic_posting_review_mode=,
+ :reply_posting_review_mode,
+ :reply_posting_review_mode=,
to: :category_setting,
allow_nil: true
@@ -86,6 +98,7 @@ class Category < ActiveRecord::Base
validate :email_in_validator
validate :ensure_slug
validate :permissions_compatibility_validator
+ validate :posting_review_groups_validator
validates :default_slow_mode_seconds,
numericality: {
@@ -107,6 +120,7 @@ class Category < ActiveRecord::Base
before_save :downcase_email
before_save :downcase_name
before_save :ensure_category_setting
+ before_save :clear_posting_review_groups_for_non_group_modes
after_create :create_category_definition
after_create :delete_category_permalink
after_update :rename_category_definition, if: :saved_change_to_name?
@@ -1251,6 +1265,36 @@ class Category < ActiveRecord::Base
self.build_category_setting if self.category_setting.blank?
end
+ def group_based_posting_review_mode?(post_type)
+ mode = category_setting&.public_send(:"#{post_type}_posting_review_mode")
+ CategorySetting::GROUP_BASED_MODES.include?(mode)
+ end
+
+ def posting_review_groups_validator
+ %i[topic reply].each do |post_type|
+ next unless group_based_posting_review_mode?(post_type)
+
+ group_ids = public_send(:"#{post_type}_posting_review_group_ids")
+ if group_ids.blank?
+ errors.add(
+ :base,
+ I18n.t(
+ "category.errors.groups_required_for_mode",
+ setting: "#{post_type}_posting_review_mode",
+ ),
+ )
+ end
+ end
+ end
+
+ def clear_posting_review_groups_for_non_group_modes
+ %i[topic reply].each do |post_type|
+ unless group_based_posting_review_mode?(post_type)
+ public_send(:"#{post_type}_posting_review_group_ids=", [])
+ end
+ end
+ end
+
def check_permissions_compatibility(parent_permissions, child_permissions)
parent_groups = parent_permissions.map(&:first)
diff --git a/app/models/category_posting_review_group.rb b/app/models/category_posting_review_group.rb
index 4f5a45208f6..a9c410b7571 100644
--- a/app/models/category_posting_review_group.rb
+++ b/app/models/category_posting_review_group.rb
@@ -1,25 +1,21 @@
# frozen_string_literal: true
class CategoryPostingReviewGroup < ActiveRecord::Base
+ # TODO: Drop after 20260319054731 has been promoted to pre-deploy
+ self.ignored_columns += %w[permission]
+
belongs_to :category
belongs_to :group
validates :category, presence: true
validates :group, presence: true
- validate :only_everyone_group_with_required_permission
enum :post_type, { topic: 0, reply: 1 }
- enum :permission, { exempt: 0, required: 1 }
-
- private
- def only_everyone_group_with_required_permission
- if group_id != Group::AUTO_GROUPS[:everyone]
- errors.add(
- :base,
- "Group-based approval permissions for specific groups are not supported yet",
- )
- end
+ def self.user_in_group?(category:, user:, post_type:)
+ where(category: category, post_type: post_type).where(
+ group_id: [Group::AUTO_GROUPS[:everyone]] + user.belonging_to_group_ids,
+ ).exists?
end
end
@@ -28,7 +24,6 @@ end
# Table name: category_posting_review_groups
#
# id :bigint not null, primary key
-# permission :integer not null
# post_type :integer not null
# created_at :datetime not null
# updated_at :datetime not null
diff --git a/app/models/category_setting.rb b/app/models/category_setting.rb
index e879278ffc0..90e4787916e 100644
--- a/app/models/category_setting.rb
+++ b/app/models/category_setting.rb
@@ -6,27 +6,29 @@ class CategorySetting < ActiveRecord::Base
belongs_to :category
- before_save :sync_posting_review_groups
+ enum :topic_posting_review_mode,
+ { no_one: 0, everyone: 1, everyone_except: 2, no_one_except: 3 },
+ prefix: true
+ enum :reply_posting_review_mode,
+ { no_one: 0, everyone: 1, everyone_except: 2, no_one_except: 3 },
+ prefix: true
def require_topic_approval=(value)
- @require_topic_approval = value
- updated_at_will_change!
+ self.topic_posting_review_mode =
+ ActiveModel::Type::Boolean.new.cast(value) ? :everyone : :no_one
end
def require_reply_approval=(value)
- @require_reply_approval = value
- updated_at_will_change!
+ self.reply_posting_review_mode =
+ ActiveModel::Type::Boolean.new.cast(value) ? :everyone : :no_one
end
- def require_topic_approval
- goldiload { |ids| CategorySetting.approval_required_map(ids, :topic) }
- end
- alias_method :require_topic_approval?, :require_topic_approval
+ alias_method :require_topic_approval, :topic_posting_review_mode_everyone?
+ alias_method :require_topic_approval?, :topic_posting_review_mode_everyone?
+ alias_method :require_reply_approval, :reply_posting_review_mode_everyone?
+ alias_method :require_reply_approval?, :reply_posting_review_mode_everyone?
- def require_reply_approval
- goldiload { |ids| CategorySetting.approval_required_map(ids, :reply) }
- end
- alias_method :require_reply_approval?, :require_reply_approval
+ GROUP_BASED_MODES = %w[everyone_except no_one_except].freeze
validates :num_auto_bump_daily,
numericality: {
@@ -41,53 +43,20 @@ class CategorySetting < ActiveRecord::Base
greater_than_or_equal_to: 0,
allow_nil: true,
}
-
- def self.approval_required_map(ids, post_type)
- approved_ids =
- where(
- id: ids,
- category_id:
- CategoryPostingReviewGroup.where(post_type: post_type, permission: :required).select(
- :category_id,
- ),
- ).pluck(:id).to_set
-
- ids.index_with { |id| approved_ids.include?(id) }
- end
-
- private
-
- def sync_posting_review_groups
- return if @require_topic_approval.nil? && @require_reply_approval.nil?
-
- everyone = Group[:everyone]
-
- { topic: @require_topic_approval, reply: @require_reply_approval }.each do |type, value|
- next if value.nil?
-
- scope = category.category_posting_review_groups.where(post_type: type)
- if ActiveModel::Type::Boolean.new.cast(value)
- scope.create_or_find_by!(permission: :required, group: everyone)
- else
- scope.where(group: everyone, permission: :required).delete_all
- end
- end
-
- @require_topic_approval = nil
- @require_reply_approval = nil
- end
end
# == Schema Information
#
# Table name: category_settings
#
-# id :bigint not null, primary key
-# auto_bump_cooldown_days :integer default(1)
-# num_auto_bump_daily :integer default(0)
-# created_at :datetime not null
-# updated_at :datetime not null
-# category_id :bigint not null
+# id :bigint not null, primary key
+# auto_bump_cooldown_days :integer default(1)
+# num_auto_bump_daily :integer default(0)
+# reply_posting_review_mode :integer default("no_one"), not null
+# topic_posting_review_mode :integer default("no_one"), not null
+# created_at :datetime not null
+# updated_at :datetime not null
+# category_id :bigint not null
#
# Indexes
#
diff --git a/app/models/group.rb b/app/models/group.rb
index c20d3c35398..cd9d08de227 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -32,6 +32,7 @@ class Group < ActiveRecord::Base
has_many :category_groups, dependent: :destroy
has_many :category_moderation_groups, dependent: :destroy
+ has_many :category_posting_review_groups, dependent: :destroy
has_many :group_users, dependent: :destroy
has_many :group_requests, dependent: :destroy
has_many :group_mentions, dependent: :destroy
diff --git a/app/serializers/category_serializer.rb b/app/serializers/category_serializer.rb
index 1dad9018998..3909129b77a 100644
--- a/app/serializers/category_serializer.rb
+++ b/app/serializers/category_serializer.rb
@@ -7,7 +7,9 @@ class CategorySerializer < SiteCategorySerializer
attributes :auto_bump_cooldown_days,
:num_auto_bump_daily,
:require_reply_approval,
- :require_topic_approval
+ :require_topic_approval,
+ :topic_posting_review_mode,
+ :reply_posting_review_mode
end
class CategoryLocalizationSerializer < ApplicationSerializer
@@ -34,6 +36,8 @@ class CategorySerializer < SiteCategorySerializer
:topic_featured_link_allowed,
:search_priority,
:moderating_group_ids,
+ :topic_posting_review_group_ids,
+ :reply_posting_review_group_ids,
:default_slow_mode_seconds,
:style_type,
:emoji,
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 16d25c1b8fe..5ad5fde2e72 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4757,6 +4757,7 @@ en:
validations:
emoji_required: "Select an emoji."
icon_required: "Select an icon."
+ groups_required: "Select at least one group for this approval mode."
name: "Category name"
untitled: "Untitled category"
description: "Description"
@@ -4841,6 +4842,14 @@ en:
review_group_name: "group name"
require_topic_approval: "Require moderator approval of all new topics"
require_reply_approval: "Require moderator approval of all new replies"
+ require_topic_approval_for: "Require moderator approval of new topics for..."
+ require_reply_approval_for: "Require moderator approval of new replies for..."
+ posting_review_modes:
+ no_one: "No one"
+ everyone: "Everyone"
+ everyone_except: "Everyone except selected groups"
+ no_one_except: "No one except selected groups"
+ posting_review_groups_placeholder: "Select groups..."
this_year: "this year"
position: "Position on the categories page:"
default_position: "Default position"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index a4c2a99fc23..eaf02f50749 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -876,6 +876,7 @@ en:
invalid_email_in: "'%{email}' is not a valid email address."
email_already_used_in_group: "'%{email}' is already used by the group '%{group_name}'."
email_already_used_in_category: "'%{email}' is already used by the category '%{category_name}'."
+ groups_required_for_mode: "You must select at least one group for %{setting}."
description_incomplete: "The category description post must have at least one paragraph."
description_too_long:
one: "Description is too long (maximum is %{count} character)."
diff --git a/db/migrate/20260319054026_add_posting_review_modes_to_category_settings.rb b/db/migrate/20260319054026_add_posting_review_modes_to_category_settings.rb
new file mode 100644
index 00000000000..81d40111893
--- /dev/null
+++ b/db/migrate/20260319054026_add_posting_review_modes_to_category_settings.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require "migration/column_dropper"
+
+class AddPostingReviewModesToCategorySettings < ActiveRecord::Migration[8.0]
+ def up
+ add_column :category_settings, :topic_posting_review_mode, :integer, default: 0, null: false
+ add_column :category_settings, :reply_posting_review_mode, :integer, default: 0, null: false
+
+ change_column_null :category_posting_review_groups, :permission, true
+ Migration::ColumnDropper.mark_readonly(:category_posting_review_groups, :permission)
+
+ # Backfill: for categories that had everyone-group (id 0) rows with
+ # permission = required (1), set the posting review mode to everyone (1).
+
+ # Topics (post_type = 0)
+ execute(<<~SQL)
+ UPDATE category_settings
+ SET topic_posting_review_mode = 1
+ WHERE category_id IN (
+ SELECT category_id FROM category_posting_review_groups
+ WHERE group_id = 0 AND permission = 1 AND post_type = 0
+ )
+ SQL
+
+ # Replies (post_type = 1)
+ execute(<<~SQL)
+ UPDATE category_settings
+ SET reply_posting_review_mode = 1
+ WHERE category_id IN (
+ SELECT category_id FROM category_posting_review_groups
+ WHERE group_id = 0 AND permission = 1 AND post_type = 1
+ )
+ SQL
+ end
+
+ def down
+ raise ActiveRecord::IrreversibleMigration
+ end
+end
diff --git a/db/post_migrate/20260319054730_delete_redundant_everyone_posting_review_groups.rb b/db/post_migrate/20260319054730_delete_redundant_everyone_posting_review_groups.rb
new file mode 100644
index 00000000000..55a67a49dd1
--- /dev/null
+++ b/db/post_migrate/20260319054730_delete_redundant_everyone_posting_review_groups.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class DeleteRedundantEveryonePostingReviewGroups < ActiveRecord::Migration[8.0]
+ def up
+ execute(<<~SQL)
+ DELETE FROM category_posting_review_groups
+ WHERE group_id = 0 AND permission = 1
+ SQL
+ end
+
+ def down
+ raise ActiveRecord::IrreversibleMigration
+ end
+end
diff --git a/db/post_migrate/20260319054731_drop_permission_from_category_posting_review_groups.rb b/db/post_migrate/20260319054731_drop_permission_from_category_posting_review_groups.rb
new file mode 100644
index 00000000000..2700ffdf69f
--- /dev/null
+++ b/db/post_migrate/20260319054731_drop_permission_from_category_posting_review_groups.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require "migration/column_dropper"
+
+class DropPermissionFromCategoryPostingReviewGroups < ActiveRecord::Migration[8.0]
+ DROPPED_COLUMNS = { category_posting_review_groups: %i[permission] }
+
+ def up
+ DROPPED_COLUMNS.each { |table, columns| Migration::ColumnDropper.execute_drop(table, columns) }
+ end
+
+ def down
+ raise ActiveRecord::IrreversibleMigration
+ end
+end
diff --git a/frontend/discourse/admin/components/edit-category-settings.gjs b/frontend/discourse/admin/components/edit-category-settings.gjs
index 981309116bb..dd52e1cc632 100644
--- a/frontend/discourse/admin/components/edit-category-settings.gjs
+++ b/frontend/discourse/admin/components/edit-category-settings.gjs
@@ -12,7 +12,10 @@ import icon from "discourse/helpers/d-icon";
import lazyHash from "discourse/helpers/lazy-hash";
import withEventValue from "discourse/helpers/with-event-value";
import { setting } from "discourse/lib/computed";
-import { SEARCH_PRIORITIES } from "discourse/lib/constants";
+import {
+ POSTING_REVIEW_GROUP_BASED_MODES,
+ SEARCH_PRIORITIES,
+} from "discourse/lib/constants";
import getUrl from "discourse/lib/get-url";
import { applyMutableValueTransformer } from "discourse/lib/transformer";
import ComboBox from "discourse/select-kit/components/combo-box";
@@ -181,6 +184,68 @@ export default class EditCategorySettings extends buildCategoryPanel(
this.form.set(field, event.target.checked);
}
+ @computed
+ get postingReviewModeOptions() {
+ return [
+ {
+ name: i18n("category.posting_review_modes.no_one"),
+ value: "no_one",
+ },
+ {
+ name: i18n("category.posting_review_modes.everyone"),
+ value: "everyone",
+ },
+ {
+ name: i18n("category.posting_review_modes.everyone_except"),
+ value: "everyone_except",
+ },
+ {
+ name: i18n("category.posting_review_modes.no_one_except"),
+ value: "no_one_except",
+ },
+ ];
+ }
+
+ @computed("category.category_setting.topic_posting_review_mode")
+ get topicModeRequiresGroups() {
+ return POSTING_REVIEW_GROUP_BASED_MODES.includes(
+ this.category?.category_setting?.topic_posting_review_mode
+ );
+ }
+
+ @computed("category.category_setting.reply_posting_review_mode")
+ get replyModeRequiresGroups() {
+ return POSTING_REVIEW_GROUP_BASED_MODES.includes(
+ this.category?.category_setting?.reply_posting_review_mode
+ );
+ }
+
+ @action
+ onTopicPostingReviewModeChange(value) {
+ this.set("category.category_setting.topic_posting_review_mode", value);
+ if (!POSTING_REVIEW_GROUP_BASED_MODES.includes(value)) {
+ this.set("category.topic_posting_review_group_ids", []);
+ }
+ }
+
+ @action
+ onReplyPostingReviewModeChange(value) {
+ this.set("category.category_setting.reply_posting_review_mode", value);
+ if (!POSTING_REVIEW_GROUP_BASED_MODES.includes(value)) {
+ this.set("category.reply_posting_review_group_ids", []);
+ }
+ }
+
+ @action
+ onTopicPostingReviewGroupsChange(groupIds) {
+ this.set("category.topic_posting_review_group_ids", groupIds);
+ }
+
+ @action
+ onReplyPostingReviewGroupsChange(groupIds) {
+ this.set("category.reply_posting_review_group_ids", groupIds);
+ }
+
<template>
<section>
{{#if this.showPositionInput}}
@@ -312,24 +377,48 @@ export default class EditCategorySettings extends buildCategoryPanel(
</section>
{{/if}}
- <section class="field require-topic-approval">
- <label class="checkbox-label">
- <Input
- @type="checkbox"
- @checked={{this.category.category_setting.require_topic_approval}}
+ <section class="field topic-posting-review-mode">
+ <label>{{i18n "category.require_topic_approval_for"}}</label>
+ <div class="controls">
+ <ComboBox
+ @valueProperty="value"
+ @content={{this.postingReviewModeOptions}}
+ @value={{this.category.category_setting.topic_posting_review_mode}}
+ @onChange={{this.onTopicPostingReviewModeChange}}
+ @options={{hash placementStrategy="absolute"}}
/>
- {{i18n "category.require_topic_approval"}}
- </label>
+ </div>
+ {{#if this.topicModeRequiresGroups}}
+ <GroupChooser
+ class="posting-review-group-chooser"
+ @content={{this.site.groups}}
+ @value={{this.category.topic_posting_review_group_ids}}
+ @onChange={{this.onTopicPostingReviewGroupsChange}}
+ @options={{hash none="category.posting_review_groups_placeholder"}}
+ />
+ {{/if}}
</section>
- <section class="field require-reply-approval">
- <label class="checkbox-label">
- <Input
- @type="checkbox"
- @checked={{this.category.category_setting.require_reply_approval}}
+ <section class="field reply-posting-review-mode">
+ <label>{{i18n "category.require_reply_approval_for"}}</label>
+ <div class="controls">
+ <ComboBox
+ @valueProperty="value"
+ @content={{this.postingReviewModeOptions}}
+ @value={{this.category.category_setting.reply_posting_review_mode}}
+ @onChange={{this.onReplyPostingReviewModeChange}}
+ @options={{hash placementStrategy="absolute"}}
/>
- {{i18n "category.require_reply_approval"}}
- </label>
+ </div>
+ {{#if this.replyModeRequiresGroups}}
+ <GroupChooser
+ class="posting-review-group-chooser"
+ @content={{this.site.groups}}
+ @value={{this.category.reply_posting_review_group_ids}}
+ @onChange={{this.onReplyPostingReviewGroupsChange}}
+ @options={{hash none="category.posting_review_groups_placeholder"}}
+ />
+ {{/if}}
</section>
<section class="field default-slow-mode">
diff --git a/frontend/discourse/admin/components/upsert-category/settings.gjs b/frontend/discourse/admin/components/upsert-category/settings.gjs
index 655bbb36b59..610e92ac0da 100644
--- a/frontend/discourse/admin/components/upsert-category/settings.gjs
+++ b/frontend/discourse/admin/components/upsert-category/settings.gjs
@@ -9,7 +9,10 @@ import RelativeTimePicker from "discourse/components/relative-time-picker";
import concatClass from "discourse/helpers/concat-class";
import lazyHash from "discourse/helpers/lazy-hash";
import withEventValue from "discourse/helpers/with-event-value";
-import { SEARCH_PRIORITIES } from "discourse/lib/constants";
+import {
+ POSTING_REVIEW_GROUP_BASED_MODES,
+ SEARCH_PRIORITIES,
+} from "discourse/lib/constants";
import getUrl from "discourse/lib/get-url";
import ComboBox from "discourse/select-kit/components/combo-box";
import GroupChooser from "discourse/select-kit/components/group-chooser";
@@ -72,6 +75,44 @@ export default class UpsertCategorySettings extends Component {
return this.categorySetting?.auto_bump_cooldown_days;
}
+ get postingReviewModeOptions() {
+ return [
+ { name: i18n("category.posting_review_modes.no_one"), value: "no_one" },
+ {
+ name: i18n("category.posting_review_modes.everyone"),
+ value: "everyone",
+ },
+ {
+ name: i18n("category.posting_review_modes.everyone_except"),
+ value: "everyone_except",
+ },
+ {
+ name: i18n("category.posting_review_modes.no_one_except"),
+ value: "no_one_except",
+ },
+ ];
+ }
+
+ get topicModeRequiresGroups() {
+ return POSTING_REVIEW_GROUP_BASED_MODES.includes(
+ this.categorySetting?.topic_posting_review_mode
+ );
+ }
+
+ get replyModeRequiresGroups() {
+ return POSTING_REVIEW_GROUP_BASED_MODES.includes(
+ this.categorySetting?.reply_posting_review_mode
+ );
+ }
+
+ get topicPostingReviewGroupIds() {
+ return this.args.transientData?.topic_posting_review_group_ids;
+ }
+
+ get replyPostingReviewGroupIds() {
+ return this.args.transientData?.reply_posting_review_group_ids;
+ }
+
@action
onAutoCloseDurationChange(minutes) {
let hours = minutes ? minutes / 60 : null;
@@ -106,6 +147,33 @@ export default class UpsertCategorySettings extends Component {
this.#updateCategorySetting("auto_bump_cooldown_days", value);
}
+ @action
+ onTopicPostingReviewModeChange(value) {
+ this.#updateCategorySetting("topic_posting_review_mode", value);
+ if (!POSTING_REVIEW_GROUP_BASED_MODES.includes(value)) {
+ this.args.form.set("topic_posting_review_group_ids", []);
+ }
+ }
+
+ @action
+ onReplyPostingReviewModeChange(value) {
+ this.#updateCategorySetting("reply_posting_review_mode", value);
+ if (!POSTING_REVIEW_GROUP_BASED_MODES.includes(value)) {
+ this.args.form.set("reply_posting_review_group_ids", []);
+ }
+ }
+
+ @action
+ validatePostingReviewGroups(name, value, { addError }) {
+ if (!value?.length) {
+ const type = name.startsWith("topic") ? "topic" : "reply";
+ addError(name, {
+ title: i18n(`category.require_${type}_approval_for`),
+ message: i18n("category.validations.groups_required"),
+ });
+ }
+ }
+
<template>
<@form.Section
class={{concatClass
@@ -239,22 +307,86 @@ export default class UpsertCategorySettings extends Component {
<@form.Object @name="category_setting" as |object|>
<object.Field
- @name="require_topic_approval"
- @title={{i18n "category.require_topic_approval"}}
- @type="checkbox"
+ @name="topic_posting_review_mode"
+ @title={{i18n "category.require_topic_approval_for"}}
+ @type="custom"
as |field|
>
- <field.Control />
+ <field.Control>
+ <ComboBox
+ @valueProperty="value"
+ @content={{this.postingReviewModeOptions}}
+ @value={{field.value}}
+ @onChange={{this.onTopicPostingReviewModeChange}}
+ @options={{hash placementStrategy="absolute"}}
+ />
+ </field.Control>
</object.Field>
+ {{#if this.topicModeRequiresGroups}}
+ <@form.Field
+ @name="topic_posting_review_group_ids"
+ @title={{i18n "category.require_topic_approval_for"}}
+ @showTitle={{false}}
+ @type="custom"
+ @validate={{this.validatePostingReviewGroups}}
+ as |field|
+ >
+ <field.Control>
+ <GroupChooser
+ class="posting-review-group-chooser"
+ @content={{this.site.groups}}
+ @value={{field.value}}
+ @onChange={{field.set}}
+ @options={{hash
+ none="category.posting_review_groups_placeholder"
+ }}
+ />
+ </field.Control>
+ </@form.Field>
+ {{/if}}
+ </@form.Object>
+
+ <@form.Object @name="category_setting" as |object|>
<object.Field
- @name="require_reply_approval"
- @title={{i18n "category.require_reply_approval"}}
- @type="checkbox"
+ @name="reply_posting_review_mode"
+ @title={{i18n "category.require_reply_approval_for"}}
+ @type="custom"
as |field|
>
- <field.Control />
+ <field.Control>
+ <ComboBox
+ @valueProperty="value"
+ @content={{this.postingReviewModeOptions}}
+ @value={{field.value}}
+ @onChange={{this.onReplyPostingReviewModeChange}}
+ @options={{hash placementStrategy="absolute"}}
+ />
+ </field.Control>
</object.Field>
+
+ {{#if this.replyModeRequiresGroups}}
+ <@form.Field
+ @name="reply_posting_review_group_ids"
+ @title={{i18n "category.require_reply_approval_for"}}
+ @showTitle={{false}}
+ @type="custom"
+ @validate={{this.validatePostingReviewGroups}}
+ as |field|
+ >
+ <field.Control>
+ <GroupChooser
+ class="posting-review-group-chooser"
+ @content={{this.site.groups}}
+ @value={{field.value}}
+ @onChange={{field.set}}
+ @options={{hash
+ none="category.posting_review_groups_placeholder"
+ }}
+ />
+ </field.Control>
+ </@form.Field>
+ {{/if}}
</@form.Object>
<@form.Container @title={{i18n "category.default_slow_mode"}}>
diff --git a/frontend/discourse/admin/controllers/edit-category/tabs.js b/frontend/discourse/admin/controllers/edit-category/tabs.js
index fb05648b2df..223c27a6cfd 100644
--- a/frontend/discourse/admin/controllers/edit-category/tabs.js
+++ b/frontend/discourse/admin/controllers/edit-category/tabs.js
@@ -58,6 +58,8 @@ const SIMPLIFIED_FIELD_LIST = [
"all_topics_wiki",
"allow_unlimited_owner_edits_on_first_post",
"moderating_group_ids",
+ "topic_posting_review_group_ids",
+ "reply_posting_review_group_ids",
"auto_close_hours",
"auto_close_based_on_last_post",
"default_view",
diff --git a/frontend/discourse/app/lib/constants.js b/frontend/discourse/app/lib/constants.js
index 15e39627662..850100c6d2b 100644
--- a/frontend/discourse/app/lib/constants.js
+++ b/frontend/discourse/app/lib/constants.js
@@ -80,6 +80,11 @@ export const API_KEY_SCOPE_MODES = ["global", "read_only", "granular"];
export const INVITE_DESCRIPTION_MAX_LENGTH = 100;
+export const POSTING_REVIEW_GROUP_BASED_MODES = [
+ "everyone_except",
+ "no_one_except",
+];
+
export const USER_OPTION_COMPOSITION_MODES = { markdown: 0, rich: 1 };
export const UPCOMING_CHANGES_USER_ENABLED_REASONS = {
diff --git a/frontend/discourse/app/models/category.js b/frontend/discourse/app/models/category.js
index b4886f17216..816b2a496eb 100644
--- a/frontend/discourse/app/models/category.js
+++ b/frontend/discourse/app/models/category.js
@@ -835,6 +835,8 @@ export default class Category extends RestModel {
),
search_priority: this.search_priority,
moderating_group_ids: this.moderating_group_ids,
+ topic_posting_review_group_ids: this.topic_posting_review_group_ids,
+ reply_posting_review_group_ids: this.reply_posting_review_group_ids,
read_only_banner: this.read_only_banner,
default_list_filter: this.default_list_filter,
style_type: this.style_type,
diff --git a/lib/guardian/category_guardian.rb b/lib/guardian/category_guardian.rb
index a34d0426d49..0bf7bb5b811 100644
--- a/lib/guardian/category_guardian.rb
+++ b/lib/guardian/category_guardian.rb
@@ -70,4 +70,38 @@ module CategoryGuardian
@topic_featured_link_allowed_category_ids =
Category.where(topic_featured_link_allowed: true).pluck(:id)
end
+
+ def topic_posting_review_required?(category)
+ posting_review_required?(category, :topic)
+ end
+
+ def reply_posting_review_required?(category)
+ posting_review_required?(category, :reply)
+ end
+
+ private
+
+ def posting_review_required?(category, post_type)
+ return false if category.nil?
+
+ mode = category.category_setting.public_send(:"#{post_type}_posting_review_mode")
+ case mode
+ when "no_one"
+ false
+ when "everyone"
+ true
+ when "everyone_except"
+ !CategoryPostingReviewGroup.user_in_group?(
+ category: category,
+ user: @user,
+ post_type: post_type,
+ )
+ when "no_one_except"
+ CategoryPostingReviewGroup.user_in_group?(
+ category: category,
+ user: @user,
+ post_type: post_type,
+ )
+ end
+ end
end
diff --git a/lib/guardian/topic_guardian.rb b/lib/guardian/topic_guardian.rb
index 63cc4c9f69a..c6507e702e5 100644
--- a/lib/guardian/topic_guardian.rb
+++ b/lib/guardian/topic_guardian.rb
@@ -68,7 +68,8 @@ module TopicGuardian
end
)
- is_staff? || (can_create_topic_on_category?(category) && !category.require_topic_approval?)
+ is_staff? ||
+ (can_create_topic_on_category?(category) && !topic_posting_review_required?(category))
end
def can_create_post_on_topic?(topic)
diff --git a/lib/new_post_manager.rb b/lib/new_post_manager.rb
index 9b42fd3914f..bf66211908f 100644
--- a/lib/new_post_manager.rb
+++ b/lib/new_post_manager.rb
@@ -129,15 +129,18 @@ class NewPostManager
end
def self.post_needs_approval_in_its_category?(manager)
+ guardian = manager.user.guardian
+
if manager.args[:topic_id].present?
- cat = Category.joins(:topics).find_by(topics: { id: manager.args[:topic_id] })
- return false unless cat
+ topic = Topic.find_by(id: manager.args[:topic_id])
+ return false unless topic&.category
- topic = Topic.find(manager.args[:topic_id])
- cat.require_reply_approval? && !manager.user.guardian.can_review_topic?(topic)
+ guardian.reply_posting_review_required?(topic.category) && !guardian.can_review_topic?(topic)
elsif manager.args[:category].present?
- cat = Category.find(manager.args[:category])
- cat.require_topic_approval? && !manager.user.guardian.is_category_group_moderator?(cat)
+ category = Category.find(manager.args[:category])
+
+ guardian.topic_posting_review_required?(category) &&
+ !guardian.is_category_group_moderator?(category)
else
false
end
diff --git a/lib/tasks/javascript.rake b/lib/tasks/javascript.rake
index 19a4d5ed4cd..aa19a399b18 100644
--- a/lib/tasks/javascript.rake
+++ b/lib/tasks/javascript.rake
@@ -90,6 +90,8 @@ task "javascript:update_constants" => :environment do
export const INVITE_DESCRIPTION_MAX_LENGTH = #{Invite::DESCRIPTION_MAX_LENGTH};
+ export const POSTING_REVIEW_GROUP_BASED_MODES = #{CategorySetting::GROUP_BASED_MODES.to_json};
+
export const USER_OPTION_COMPOSITION_MODES = #{UserOption.composition_mode_types.to_json};
export const UPCOMING_CHANGES_USER_ENABLED_REASONS = #{UpcomingChanges.user_enabled_reasons.to_json};
diff --git a/lib/topic_view.rb b/lib/topic_view.rb
index 11226e4c31c..92ba9aaff8e 100644
--- a/lib/topic_view.rb
+++ b/lib/topic_view.rb
@@ -61,7 +61,6 @@ class TopicView
)
delegate :category, to: :topic, allow_nil: true, private: true
- delegate :require_reply_approval?, to: :category, prefix: true, allow_nil: true, private: true
def self.print_chunk_size
1000
@@ -172,7 +171,9 @@ class TopicView
@draft_sequence = DraftSequence.current(@user, @draft_key)
@can_review_topic = @guardian.can_review_topic?(@topic)
- @queued_posts_enabled = NewPostManager.queue_enabled? || category_require_reply_approval?
+ @queued_posts_enabled =
+ NewPostManager.queue_enabled? ||
+ (@guardian.authenticated? && @guardian.reply_posting_review_required?(@topic.category))
@personal_message = @topic.private_message?
end
diff --git a/spec/db/migrate/20260310072759_create_category_approval_groups_spec.rb b/spec/db/migrate/20260310072759_create_category_approval_groups_spec.rb
deleted file mode 100644
index 06d09ea051b..00000000000
--- a/spec/db/migrate/20260310072759_create_category_approval_groups_spec.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-# frozen_string_literal: true
-
-require Rails.root.join("db/migrate/20260310072550_mark_category_approval_booleans_readonly.rb")
-require Rails.root.join("db/migrate/20260310072759_create_category_approval_groups.rb")
-
-RSpec.describe CreateCategoryApprovalGroups do
- before do
- @original_verbose = ActiveRecord::Migration.verbose
- ActiveRecord::Migration.verbose = false
- end
-
- after { ActiveRecord::Migration.verbose = @original_verbose }
-
- it "backfills category_posting_review_groups from boolean approval columns" do
- topic_approval_category = Fabricate(:category)
- reply_approval_category = Fabricate(:category)
- both_approval_category = Fabricate(:category)
- no_approval_category = Fabricate(:category)
-
- CreateCategoryApprovalGroups.new.down
- MarkCategoryApprovalBooleansReadonly.new.down
-
- CategorySetting.where(
- category_id: [topic_approval_category.id, both_approval_category.id],
- ).update_all("require_topic_approval = true")
-
- CategorySetting.where(
- category_id: [reply_approval_category.id, both_approval_category.id],
- ).update_all("require_reply_approval = true")
-
- MarkCategoryApprovalBooleansReadonly.new.up
- CreateCategoryApprovalGroups.new.up
-
- everyone = Group::AUTO_GROUPS[:everyone]
-
- topic_groups = CategoryPostingReviewGroup.where(category_id: topic_approval_category.id)
- expect(topic_groups.count).to eq(1)
- expect(topic_groups.first).to have_attributes(
- post_type: "topic",
- permission: "required",
- group_id: everyone,
- )
-
- reply_groups = CategoryPostingReviewGroup.where(category_id: reply_approval_category.id)
- expect(reply_groups.count).to eq(1)
- expect(reply_groups.first).to have_attributes(
- post_type: "reply",
- permission: "required",
- group_id: everyone,
- )
-
- both_groups =
- CategoryPostingReviewGroup.where(category_id: both_approval_category.id).order(:post_type)
- expect(both_groups.count).to eq(2)
- expect(both_groups.first).to have_attributes(
- post_type: "topic",
- permission: "required",
- group_id: everyone,
- )
- expect(both_groups.second).to have_attributes(
- post_type: "reply",
- permission: "required",
- group_id: everyone,
- )
-
- expect(CategoryPostingReviewGroup.where(category_id: no_approval_category.id).count).to eq(0)
- end
-end
diff --git a/spec/db/migrate/20260319054026_add_posting_review_modes_to_category_settings_spec.rb b/spec/db/migrate/20260319054026_add_posting_review_modes_to_category_settings_spec.rb
new file mode 100644
index 00000000000..6b9af5578c8
--- /dev/null
+++ b/spec/db/migrate/20260319054026_add_posting_review_modes_to_category_settings_spec.rb
@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+require Rails.root.join(
+ "db/migrate/20260319054026_add_posting_review_modes_to_category_settings.rb",
+ )
+
+RSpec.describe AddPostingReviewModesToCategorySettings do
+ before do
+ @original_verbose = ActiveRecord::Migration.verbose
+ ActiveRecord::Migration.verbose = false
+ end
+
+ after { ActiveRecord::Migration.verbose = @original_verbose }
+
+ it "backfills posting review modes from category_posting_review_groups" do
+ topic_approval_category = Fabricate(:category)
+ reply_approval_category = Fabricate(:category)
+ both_approval_category = Fabricate(:category)
+ no_approval_category = Fabricate(:category)
+
+ ActiveRecord::Base.connection.remove_column :category_settings, :topic_posting_review_mode
+ ActiveRecord::Base.connection.remove_column :category_settings, :reply_posting_review_mode
+
+ unless ActiveRecord::Base.connection.column_exists?(
+ :category_posting_review_groups,
+ :permission,
+ )
+ ActiveRecord::Base.connection.add_column :category_posting_review_groups,
+ :permission,
+ :integer
+ end
+
+ DB.exec(<<~SQL, category_id: topic_approval_category.id)
+ INSERT INTO category_posting_review_groups (category_id, group_id, permission, post_type, created_at, updated_at)
+ VALUES (:category_id, 0, 1, 0, now(), now())
+ SQL
+
+ DB.exec(<<~SQL, category_id: reply_approval_category.id)
+ INSERT INTO category_posting_review_groups (category_id, group_id, permission, post_type, created_at, updated_at)
+ VALUES (:category_id, 0, 1, 1, now(), now())
+ SQL
+
+ DB.exec(<<~SQL, category_id: both_approval_category.id)
+ INSERT INTO category_posting_review_groups (category_id, group_id, permission, post_type, created_at, updated_at)
+ VALUES (:category_id, 0, 1, 0, now(), now()),
+ (:category_id, 0, 1, 1, now(), now())
+ SQL
+
+ described_class.new.up
+
+ expect(
+ DB.query_single(
+ "SELECT topic_posting_review_mode, reply_posting_review_mode FROM category_settings WHERE category_id = ?",
+ topic_approval_category.id,
+ ),
+ ).to eq([1, 0])
+
+ expect(
+ DB.query_single(
+ "SELECT topic_posting_review_mode, reply_posting_review_mode FROM category_settings WHERE category_id = ?",
+ reply_approval_category.id,
+ ),
+ ).to eq([0, 1])
+
+ expect(
+ DB.query_single(
+ "SELECT topic_posting_review_mode, reply_posting_review_mode FROM category_settings WHERE category_id = ?",
+ both_approval_category.id,
+ ),
+ ).to eq([1, 1])
+
+ expect(
+ DB.query_single(
+ "SELECT topic_posting_review_mode, reply_posting_review_mode FROM category_settings WHERE category_id = ?",
+ no_approval_category.id,
+ ),
+ ).to eq([0, 0])
+ end
+end
diff --git a/spec/lib/new_post_manager_spec.rb b/spec/lib/new_post_manager_spec.rb
index 250a55be30c..49aeda1b352 100644
--- a/spec/lib/new_post_manager_spec.rb
+++ b/spec/lib/new_post_manager_spec.rb
@@ -500,6 +500,7 @@ RSpec.describe NewPostManager do
context "when posting in the category requires approval" do
fab!(:user) { Fabricate(:user, refresh_auto_groups: true) }
fab!(:review_group, :group)
+ fab!(:posting_review_group, :group)
fab!(:category)
fab!(:category_moderation_group) do
Fabricate(:category_moderation_group, category:, group: review_group)
@@ -629,6 +630,78 @@ RSpec.describe NewPostManager do
end
end
end
+
+ it "creates the post when the user is in the exempt group and category's posting review mode is everyone_except" do
+ posting_review_group.add(user)
+ category.update!(
+ topic_posting_review_mode: :everyone_except,
+ topic_posting_review_group_ids: [posting_review_group.id],
+ )
+
+ result =
+ NewPostManager.new(
+ user,
+ raw: "this is a new topic",
+ title: "Let's start a new topic!",
+ category: category.id,
+ ).perform
+
+ expect(result.action).to eq(:create_post)
+ end
+
+ it "enqueues when the user is not in the exempt group and category's posting review mode is everyone_except" do
+ category.update!(
+ topic_posting_review_mode: :everyone_except,
+ topic_posting_review_group_ids: [posting_review_group.id],
+ )
+
+ result =
+ NewPostManager.new(
+ user,
+ raw: "this is a new topic",
+ title: "Let's start a new topic!",
+ category: category.id,
+ ).perform
+
+ expect(result.action).to eq(:enqueued)
+ expect(result.reason).to eq(:category)
+ end
+
+ it "enqueues when the user is in the listed group and category's posting review mode is no_one_except" do
+ posting_review_group.add(user)
+ category.update!(
+ topic_posting_review_mode: :no_one_except,
+ topic_posting_review_group_ids: [posting_review_group.id],
+ )
+
+ result =
+ NewPostManager.new(
+ user,
+ raw: "this is a new topic",
+ title: "Let's start a new topic!",
+ category: category.id,
+ ).perform
+
+ expect(result.action).to eq(:enqueued)
+ expect(result.reason).to eq(:category)
+ end
+
+ it "creates the post when the user is not in the listed group and category's posting review mode is no_one_except" do
+ category.update!(
+ topic_posting_review_mode: :no_one_except,
+ topic_posting_review_group_ids: [posting_review_group.id],
+ )
+
+ result =
+ NewPostManager.new(
+ user,
+ raw: "this is a new topic",
+ title: "Let's start a new topic!",
+ category: category.id,
+ ).perform
+
+ expect(result.action).to eq(:create_post)
+ end
end
context "when new posts require approval" do
@@ -664,6 +737,54 @@ RSpec.describe NewPostManager do
expect(result.action).to eq(:create_post)
expect(result).to be_success
end
+
+ it "creates the post when the user is in the exempt group and category's posting review mode is everyone_except" do
+ posting_review_group.add(user)
+ category.update!(
+ reply_posting_review_mode: :everyone_except,
+ reply_posting_review_group_ids: [posting_review_group.id],
+ )
+
+ result = NewPostManager.new(user, raw: "this is a new post", topic_id: topic.id).perform
+
+ expect(result.action).to eq(:create_post)
+ end
+
+ it "enqueues when the user is not in the exempt group and category's posting review mode is everyone_except" do
+ category.update!(
+ reply_posting_review_mode: :everyone_except,
+ reply_posting_review_group_ids: [posting_review_group.id],
+ )
+
+ result = NewPostManager.new(user, raw: "this is a new post", topic_id: topic.id).perform
+
+ expect(result.action).to eq(:enqueued)
+ expect(result.reason).to eq(:category)
+ end
+
+ it "enqueues when the user is in the listed group and category's posting review mode is no_one_except" do
+ posting_review_group.add(user)
+ category.update!(
+ reply_posting_review_mode: :no_one_except,
+ reply_posting_review_group_ids: [posting_review_group.id],
+ )
+
+ result = NewPostManager.new(user, raw: "this is a new post", topic_id: topic.id).perform
+
+ expect(result.action).to eq(:enqueued)
+ expect(result.reason).to eq(:category)
+ end
+
+ it "creates the post when the user is not in the listed group and category's posting review mode is no_one_except" do
+ category.update!(
+ reply_posting_review_mode: :no_one_except,
+ reply_posting_review_group_ids: [posting_review_group.id],
+ )
+
+ result = NewPostManager.new(user, raw: "this is a new post", topic_id: topic.id).perform
+
+ expect(result.action).to eq(:create_post)
+ end
end
end
diff --git a/spec/models/category_posting_review_group_spec.rb b/spec/models/category_posting_review_group_spec.rb
index c13c2ae5d04..d67caa02a53 100644
--- a/spec/models/category_posting_review_group_spec.rb
+++ b/spec/models/category_posting_review_group_spec.rb
@@ -3,30 +3,8 @@
RSpec.describe CategoryPostingReviewGroup do
fab!(:category)
- subject do
- described_class.new(
- category: category,
- group: Group[:everyone],
- post_type: :topic,
- permission: :required,
- )
- end
+ subject { described_class.new(category: category, group: Group[:everyone], post_type: :topic) }
it { is_expected.to validate_presence_of(:category) }
it { is_expected.to validate_presence_of(:group) }
-
- it "rejects non-everyone groups" do
- record =
- described_class.new(
- category: category,
- group: Fabricate(:group),
- post_type: :topic,
- permission: :required,
- )
-
- expect(record).not_to be_valid
- expect(record.errors[:base]).to include(
- "Group-based approval permissions for specific groups are not supported yet",
- )
- end
end
diff --git a/spec/models/category_setting_spec.rb b/spec/models/category_setting_spec.rb
index 60451ac4fde..c9bf1160a7d 100644
--- a/spec/models/category_setting_spec.rb
+++ b/spec/models/category_setting_spec.rb
@@ -16,26 +16,4 @@ RSpec.describe CategorySetting do
.is_greater_than_or_equal_to(0)
.allow_nil
end
-
- it "removes category_posting_review_groups when approval is disabled" do
- category =
- Fabricate(
- :category,
- category_setting_attributes: {
- require_topic_approval: true,
- require_reply_approval: true,
- },
- )
- expect(category.category_posting_review_groups.count).to eq(2)
-
- category.require_topic_approval = false
- category.save!
-
- expect(category.category_posting_review_groups.pluck(:post_type)).to eq(%w[reply])
-
- category.require_reply_approval = false
- category.save!
-
- expect(category.category_posting_review_groups.count).to eq(0)
- end
end
diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb
index c44a91c0a7b..13d47521b17 100644
--- a/spec/models/category_spec.rb
+++ b/spec/models/category_spec.rb
@@ -89,11 +89,119 @@ RSpec.describe Category do
end
it "destroys category_posting_review_groups when category is destroyed" do
- category = Fabricate(:category, category_setting_attributes: { require_topic_approval: true })
+ category = Fabricate(:category)
+ category.update!(
+ topic_posting_review_mode: :everyone_except,
+ topic_posting_review_group_ids: [Group::AUTO_GROUPS[:everyone]],
+ )
+
+ expect { category.destroy! }.to change { CategoryPostingReviewGroup.count }.by(-1)
+ end
+ end
+
+ describe "#topic_posting_review_mode" do
+ fab!(:category)
+ fab!(:group)
+
+ it "sets mode to everyone" do
+ category.update!(topic_posting_review_mode: :everyone)
+ expect(category.reload.topic_posting_review_mode).to eq("everyone")
+ end
+
+ it "saves group associations for everyone_except mode" do
+ category.update!(
+ topic_posting_review_mode: :everyone_except,
+ topic_posting_review_group_ids: [group.id],
+ )
+
+ expect(category.topic_posting_review_group_ids).to contain_exactly(group.id)
+ end
+
+ it "saves group associations for no_one_except mode" do
+ category.update!(
+ topic_posting_review_mode: :no_one_except,
+ topic_posting_review_group_ids: [group.id],
+ )
+
+ expect(category.topic_posting_review_group_ids).to contain_exactly(group.id)
+ end
+
+ it "replaces existing groups when updated with new group_ids" do
+ other_group = Fabricate(:group)
+ category.update!(
+ topic_posting_review_mode: :everyone_except,
+ topic_posting_review_group_ids: [group.id],
+ )
+ category.update!(
+ topic_posting_review_mode: :everyone_except,
+ topic_posting_review_group_ids: [other_group.id],
+ )
+
+ expect(category.topic_posting_review_group_ids).to contain_exactly(other_group.id)
+ end
+
+ it "clears groups when changing from everyone_except to everyone" do
+ category.update!(
+ topic_posting_review_mode: :everyone_except,
+ topic_posting_review_group_ids: [group.id],
+ )
+ category.update!(topic_posting_review_mode: :everyone)
+
+ expect(category.topic_posting_review_group_ids).to be_empty
+ end
+
+ it "ignores group_ids for non-group-based modes" do
+ category.update!(
+ topic_posting_review_mode: :everyone,
+ topic_posting_review_group_ids: [group.id],
+ )
+
+ expect(category.reload.topic_posting_review_mode).to eq("everyone")
+ expect(category.topic_posting_review_group_ids).to be_empty
+ end
+
+ it "validates group_ids are present for everyone_except mode" do
+ category.topic_posting_review_mode = :everyone_except
+ expect(category).not_to be_valid
+ end
+
+ it "validates group_ids are present for no_one_except mode" do
+ category.topic_posting_review_mode = :no_one_except
+ expect(category).not_to be_valid
+ end
+ end
- expect { category.destroy! }.to change { category.category_posting_review_groups.count }.by(
- -1,
+ describe "#reply_posting_review_mode" do
+ fab!(:category)
+ fab!(:group)
+
+ it "sets mode to everyone" do
+ category.update!(reply_posting_review_mode: :everyone)
+ expect(category.reload.reply_posting_review_mode).to eq("everyone")
+ end
+
+ it "saves group associations for everyone_except mode" do
+ category.update!(
+ reply_posting_review_mode: :everyone_except,
+ reply_posting_review_group_ids: [group.id],
+ )
+
+ expect(category.reply_posting_review_group_ids).to contain_exactly(group.id)
+ end
+
+ it "clears groups when changing from everyone_except to everyone" do
+ category.update!(
+ reply_posting_review_mode: :everyone_except,
+ reply_posting_review_group_ids: [group.id],
)
+ category.update!(reply_posting_review_mode: :everyone)
+
+ expect(category.reply_posting_review_group_ids).to be_empty
+ end
+
+ it "validates group_ids are present for everyone_except mode" do
+ category.reply_posting_review_mode = :everyone_except
+ expect(category).not_to be_valid
end
end
diff --git a/spec/requests/api/schemas/json/category_create_response.json b/spec/requests/api/schemas/json/category_create_response.json
index 7367f567e47..af3b005330d 100644
--- a/spec/requests/api/schemas/json/category_create_response.json
+++ b/spec/requests/api/schemas/json/category_create_response.json
@@ -217,6 +217,12 @@
"boolean",
"null"
]
+ },
+ "topic_posting_review_mode": {
+ "type": "string"
+ },
+ "reply_posting_review_mode": {
+ "type": "string"
}
}
},
@@ -305,6 +311,18 @@
"search_priority": {
"type": "integer"
},
+ "topic_posting_review_group_ids": {
+ "type": "array",
+ "items": {
+ "type": "integer"
+ }
+ },
+ "reply_posting_review_group_ids": {
+ "type": "array",
+ "items": {
+ "type": "integer"
+ }
+ },
"uploaded_logo": {
"type": [
"string",
@@ -384,6 +402,8 @@
"allow_badges",
"topic_featured_link_allowed",
"search_priority",
+ "topic_posting_review_group_ids",
+ "reply_posting_review_group_ids",
"uploaded_logo",
"uploaded_logo_dark",
"uploaded_background",
diff --git a/spec/requests/api/schemas/json/category_update_response.json b/spec/requests/api/schemas/json/category_update_response.json
index e34769a07e5..ee54143f0d9 100644
--- a/spec/requests/api/schemas/json/category_update_response.json
+++ b/spec/requests/api/schemas/json/category_update_response.json
@@ -220,6 +220,12 @@
"boolean",
"null"
]
+ },
+ "topic_posting_review_mode": {
+ "type": "string"
+ },
+ "reply_posting_review_mode": {
+ "type": "string"
}
}
},
@@ -308,6 +314,18 @@
"search_priority": {
"type": "integer"
},
+ "topic_posting_review_group_ids": {
+ "type": "array",
+ "items": {
+ "type": "integer"
+ }
+ },
+ "reply_posting_review_group_ids": {
+ "type": "array",
+ "items": {
+ "type": "integer"
+ }
+ },
"uploaded_logo": {
"type": [
"string",
@@ -385,6 +403,8 @@
"allow_badges",
"topic_featured_link_allowed",
"search_priority",
+ "topic_posting_review_group_ids",
+ "reply_posting_review_group_ids",
"uploaded_logo",
"uploaded_logo_dark",
"uploaded_background",
diff --git a/spec/requests/categories_controller_spec.rb b/spec/requests/categories_controller_spec.rb
index cc9d2c5d1a0..435f16398a9 100644
--- a/spec/requests/categories_controller_spec.rb
+++ b/spec/requests/categories_controller_spec.rb
@@ -556,6 +556,27 @@ RSpec.describe CategoriesController do
expect(UserHistory.count).to eq(1)
end
+ it "creates a category with posting review mode" do
+ group = Fabricate(:group)
+
+ post "/categories.json",
+ params: {
+ name: "Review Category",
+ category_setting_attributes: {
+ topic_posting_review_mode: "everyone_except",
+ reply_posting_review_mode: "everyone",
+ },
+ topic_posting_review_group_ids: [group.id],
+ }
+
+ expect(response.status).to eq(200)
+
+ category = Category.find(response.parsed_body["category"]["id"])
+ expect(category.category_setting.topic_posting_review_mode).to eq("everyone_except")
+ expect(category.topic_posting_review_group_ids).to contain_exactly(group.id)
+ expect(category.category_setting.reply_posting_review_mode).to eq("everyone")
+ end
+
it "creates category with description containing markdown" do
post "/categories.json",
params: {
@@ -1185,6 +1206,49 @@ RSpec.describe CategoriesController do
expect(category.reload.moderating_groups).to be_blank
end
+ it "sets topic_posting_review_mode to everyone" do
+ put "/categories/#{category.id}.json",
+ params: {
+ category_setting_attributes: {
+ topic_posting_review_mode: "everyone",
+ },
+ }
+ expect(response.status).to eq(200)
+ category.reload
+ expect(category.category_setting.topic_posting_review_mode).to eq("everyone")
+ end
+
+ it "sets topic_posting_review_mode to everyone_except with group IDs" do
+ put "/categories/#{category.id}.json",
+ params: {
+ category_setting_attributes: {
+ topic_posting_review_mode: "everyone_except",
+ },
+ topic_posting_review_group_ids: [mod_group_1.id, mod_group_2.id],
+ }
+ expect(response.status).to eq(200)
+ category.reload
+ expect(category.category_setting.topic_posting_review_mode).to eq("everyone_except")
+ expect(category.topic_posting_review_group_ids).to contain_exactly(
+ mod_group_1.id,
+ mod_group_2.id,
+ )
+ end
+
+ it "sets reply_posting_review_mode to no_one_except with group IDs" do
+ put "/categories/#{category.id}.json",
+ params: {
+ category_setting_attributes: {
+ reply_posting_review_mode: "no_one_except",
+ },
+ reply_posting_review_group_ids: [mod_group_3.id],
+ }
+ expect(response.status).to eq(200)
+ category.reload
+ expect(category.category_setting.reply_posting_review_mode).to eq("no_one_except")
+ expect(category.reply_posting_review_group_ids).to contain_exactly(mod_group_3.id)
+ end
+
it "can correctly convert blank strings to appropriate null values" do
put "/categories/#{category.id}.json", params: { email_in: "", minimum_required_tags: "" }
expect(response.status).to eq(200)
diff --git a/spec/serializers/category_serializer_spec.rb b/spec/serializers/category_serializer_spec.rb
index 94a5d7e9c47..083ebeb4802 100644
--- a/spec/serializers/category_serializer_spec.rb
+++ b/spec/serializers/category_serializer_spec.rb
@@ -199,6 +199,44 @@ RSpec.describe CategorySerializer do
end
end
+ describe "#topic_posting_review_group_ids" do
+ it "returns group ids when groups exist" do
+ category.update!(
+ topic_posting_review_mode: :everyone_except,
+ topic_posting_review_group_ids: [group.id],
+ )
+
+ json = described_class.new(category, scope: Guardian.new, root: false).as_json
+
+ expect(json[:topic_posting_review_group_ids]).to eq([group.id])
+ end
+
+ it "returns empty array when no groups are associated" do
+ json = described_class.new(category, scope: Guardian.new, root: false).as_json
+
+ expect(json[:topic_posting_review_group_ids]).to eq([])
+ end
+ end
+
+ describe "#reply_posting_review_group_ids" do
+ it "returns group ids when groups exist" do
+ category.update!(
+ reply_posting_review_mode: :no_one_except,
+ reply_posting_review_group_ids: [group.id],
+ )
+
+ json = described_class.new(category, scope: Guardian.new, root: false).as_json
+
+ expect(json[:reply_posting_review_group_ids]).to eq([group.id])
+ end
+
+ it "returns empty array when no groups are associated" do
+ json = described_class.new(category, scope: Guardian.new, root: false).as_json
+
+ expect(json[:reply_posting_review_group_ids]).to eq([])
+ end
+ end
+
describe "#require_topic_approval" do
it "returns false when topic approval is not required" do
category.require_topic_approval = false
diff --git a/spec/system/edit_category_settings_spec.rb b/spec/system/edit_category_settings_spec.rb
index 22ccba3f022..743bd1245f7 100644
--- a/spec/system/edit_category_settings_spec.rb
+++ b/spec/system/edit_category_settings_spec.rb
@@ -29,4 +29,43 @@ describe "Edit Category Settings" do
expect(page).to have_css(".navigation-container .hot.active", text: "Hot")
end
end
+
+ describe "topic posting review mode" do
+ fab!(:group)
+
+ let(:dialog) { PageObjects::Components::Dialog.new }
+
+ it "allows selecting 'everyone' mode" do
+ category_page.visit_settings(category)
+
+ category_page.topic_posting_review_mode_chooser.expand
+ category_page.topic_posting_review_mode_chooser.select_row_by_value("everyone")
+ category_page.save_settings
+
+ category_page.visit_settings(category)
+ expect(category_page).to have_topic_posting_review_mode("everyone")
+ end
+
+ it "allows selecting 'everyone_except' mode with groups" do
+ category_page.visit_settings(category)
+
+ category_page.topic_posting_review_mode_chooser.expand
+ category_page.topic_posting_review_mode_chooser.select_row_by_value("everyone_except")
+
+ category_page.save_settings
+ expect(dialog).to have_content(
+ I18n.t("category.errors.groups_required_for_mode", setting: "topic_posting_review_mode"),
+ )
+ dialog.click_ok
+
+ category_page.topic_posting_review_group_chooser.expand
+ category_page.topic_posting_review_group_chooser.select_row_by_value(group.id)
+
+ category_page.save_settings
+
+ category_page.visit_settings(category)
+ expect(category_page).to have_topic_posting_review_mode("everyone_except")
+ expect(category_page).to have_topic_posting_review_groups(group)
+ end
+ end
end
diff --git a/spec/system/page_objects/pages/category.rb b/spec/system/page_objects/pages/category.rb
index 01ceace3ba1..79284c86a4f 100644
--- a/spec/system/page_objects/pages/category.rb
+++ b/spec/system/page_objects/pages/category.rb
@@ -184,6 +184,40 @@ module PageObjects
def has_category_title?(title)
page.has_css?(".category-header h1", text: title)
end
+
+ def topic_posting_review_mode_chooser(simplified: false)
+ if simplified
+ PageObjects::Components::SelectKit.new(
+ ".form-kit__field[data-name='category_setting.topic_posting_review_mode'] .combo-box",
+ )
+ else
+ PageObjects::Components::SelectKit.new(".topic-posting-review-mode .combo-box")
+ end
+ end
+
+ def topic_posting_review_group_chooser(simplified: false)
+ if simplified
+ PageObjects::Components::SelectKit.new(".form-kit .group-chooser")
+ else
+ PageObjects::Components::SelectKit.new(".topic-posting-review-mode .group-chooser")
+ end
+ end
+
+ def has_posting_review_groups_error?
+ page.has_content?(I18n.t("js.category.validations.groups_required"))
+ end
+
+ def has_no_posting_review_groups_error?
+ page.has_no_content?(I18n.t("js.category.validations.groups_required"))
+ end
+
+ def has_topic_posting_review_mode?(mode, simplified: false)
+ topic_posting_review_mode_chooser(simplified: simplified).has_selected_value?(mode)
+ end
+
+ def has_topic_posting_review_groups?(group, simplified: false)
+ topic_posting_review_group_chooser(simplified: simplified).has_selected_value?(group.id)
+ end
end
end
end
diff --git a/spec/system/simplified_category_creation_spec.rb b/spec/system/simplified_category_creation_spec.rb
index 2c8fa114d37..916dd807912 100644
--- a/spec/system/simplified_category_creation_spec.rb
+++ b/spec/system/simplified_category_creation_spec.rb
@@ -296,13 +296,70 @@ describe "Simplified Category Creation" do
end
describe "Settings Tab" do
- it "enables topic approval requirement" do
+ it "creates a category with a group-based posting review mode" do
+ category_page.visit_new_category
+
+ form.field("name").fill_in("Review Test")
+ category_page.toggle_advanced_settings
+ find(".edit-category-settings a").click
+
+ category_page.topic_posting_review_mode_chooser(simplified: true).expand
+ category_page.topic_posting_review_mode_chooser(simplified: true).select_row_by_value(
+ "everyone_except",
+ )
+
+ category_page.save_settings
+ expect(category_page).to have_posting_review_groups_error
+
+ category_page.topic_posting_review_group_chooser(simplified: true).expand
+ category_page.topic_posting_review_group_chooser(simplified: true).select_row_by_value(
+ group.id,
+ )
+
+ category_page.save_settings
+ expect(category_page).to have_no_posting_review_groups_error
+
+ created_category = Category.find_by(name: "Review Test")
+ category_page.visit_settings(created_category)
+ expect(category_page).to have_topic_posting_review_mode("everyone_except", simplified: true)
+ expect(category_page).to have_topic_posting_review_groups(group, simplified: true)
+ end
+
+ it "allows selecting 'everyone' mode" do
category_page.visit_settings(category)
- form.field("category_setting.require_topic_approval").toggle
+ category_page.topic_posting_review_mode_chooser(simplified: true).expand
+ category_page.topic_posting_review_mode_chooser(simplified: true).select_row_by_value(
+ "everyone",
+ )
category_page.save_settings
- expect(category.reload.require_topic_approval?).to eq(true)
+ category_page.visit_settings(category)
+ expect(category_page).to have_topic_posting_review_mode("everyone", simplified: true)
+ end
+
+ it "allows selecting 'everyone_except' mode with groups" do
+ category_page.visit_settings(category)
+
+ category_page.topic_posting_review_mode_chooser(simplified: true).expand
+ category_page.topic_posting_review_mode_chooser(simplified: true).select_row_by_value(
+ "everyone_except",
+ )
+
+ category_page.save_settings
+ expect(category_page).to have_posting_review_groups_error
+
+ category_page.topic_posting_review_group_chooser(simplified: true).expand
+ category_page.topic_posting_review_group_chooser(simplified: true).select_row_by_value(
+ group.id,
+ )
+
+ category_page.save_settings
+
+ category_page.visit_settings(category)
+ expect(category_page).to have_no_posting_review_groups_error
+ expect(category_page).to have_topic_posting_review_mode("everyone_except", simplified: true)
+ expect(category_page).to have_topic_posting_review_groups(group, simplified: true)
end
end