github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 02:51:14 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Revert "FIX: supports groups field in post_created_edited (#28773)" (#28781)

Browse Source 
This reverts commit eb3a1c72179c179af358daf41b167e337cc7b454.
This commit is contained in:
Joffrey JAFFEUX
2024-09-06 16:10:53 +02:00
committed by GitHub
parent eb3a1c7217
commit 5f5680dbaf
9 changed files with 22 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/automation/lib/discourse_automation/event_handlers.rb
View File

@ -54,15 +54,15 @@ module DiscourseAutomation
next if (restricted_tags["value"] & topic.tags.map(&:name)).empty?
end
restricted_group_ids = automation.trigger_field("restricted_groups")["value"]
if restricted_group_ids.present?
restricted_group_id = automation.trigger_field("restricted_group")["value"]
if restricted_group_id.present?
next if !topic.private_message?
target_group_ids = topic.allowed_groups.pluck(:id)
next if (restricted_group_ids & target_group_ids).empty?
next if restricted_group_id != target_group_ids.first
ignore_group_members = automation.trigger_field("ignore_group_members")["value"]
next if ignore_group_members && post.user.in_any_groups?(restricted_group_ids)
ignore_group_members = automation.trigger_field("ignore_group_members")
next if ignore_group_members["value"] && post.user.in_any_groups?([restricted_group_id])
end
ignore_automated = automation.trigger_field("ignore_automated")

2
plugins/automation/lib/discourse_automation/triggers/post_created_edited.rb
View File

@ -14,7 +14,7 @@ DiscourseAutomation::Triggerable.add(DiscourseAutomation::Triggers::POST_CREATED
}
field :restricted_category, component: :category
field :restricted_tags, component: :tags
field :restricted_groups, component: :groups
field :restricted_group, component: :group
field :ignore_automated, component: :boolean
field :ignore_group_members, component: :boolean
field :valid_trust_levels, component: :"trust-levels"