mirror of
https://github.com/discourse/discourse.git
synced 2025-05-24 03:36:18 +08:00
This reverts commit eb3a1c72179c179af358daf41b167e337cc7b454.
This commit is contained in:
@ -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")
|
||||
|
Reference in New Issue
Block a user