github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-21 18:12:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: Introduce personal_message_enabled_groups setting (#18042)

Browse Source 
This will replace `enable_personal_messages` and
`min_trust_to_send_messages`, this commit introduces
the setting `personal_message_enabled_groups`
and uses it in all places that `enable_personal_messages`
and `min_trust_to_send_messages` currently apply.

A migration is included to set `personal_message_enabled_groups`
based on the following rules:

* If `enable_personal_messages` was false, then set
  `personal_message_enabled_groups` to `3`, which is
  the staff auto group
* If `min_trust_to_send_messages` is not default (1)
  and the above condition is false, then set the
  `personal_message_enabled_groups` setting to
  the appropriate auto group based on the trust level
* Otherwise just set `personal_message_enabled_groups` to
  11 which is the TL1 auto group

After follow-up PRs to plugins using these old settings, we will be
able to drop the old settings from core, in the meantime I've added
 DEPRECATED notices to their descriptions and added them
to the deprecated site settings list.

This commit also introduces a `_map` shortcut method definition
for all `group_list` site settings, e.g. `SiteSetting.personal_message_enabled_groups`
also has `SiteSetting.personal_message_enabled_groups_map` available,
which automatically splits the setting by `|` and converts it into
an array of integers.
This commit is contained in:
Martin Brennan
2022-09-26 13:58:40 +10:00
committed by GitHub
parent 7ca89827a0
commit e62e93f83a
55 changed files with 375 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/guardian.rb
View File

@ -71,6 +71,9 @@ class Guardian
def whisperer?
false
end
def in_any_groups?(group_ids)
false
end
end
attr_reader :request
@ -398,7 +401,12 @@ class Guardian
if object.is_a?(Topic)
if object.private_message?
return true if is_admin?
return false unless SiteSetting.enable_personal_messages?
# TODO (martin) Remove enable_personal_messages here once plugins have been changed.
if !@user.in_any_groups?(SiteSetting.personal_message_enabled_groups_map) ||
!SiteSetting.enable_personal_messages
return false
end
return false if object.reached_recipients_limit? && !is_staff?
end
@ -447,12 +455,11 @@ class Guardian
(is_group || is_user) &&
# User is authenticated
authenticated? &&
# Have to be a basic level at least
(is_group || @user.has_trust_level?(SiteSetting.min_trust_to_send_messages) || notify_moderators) &&
# User disabled private message
(is_staff? || is_group || target.user_option.allow_private_messages) &&
# PMs are enabled
(is_staff? || SiteSetting.enable_personal_messages || notify_moderators) &&
# User can send PMs, this can be covered by trust levels as well via AUTO_GROUPS
# TODO (martin) Remove enable_personal_messages here once plugins have been changed.
(is_staff? || (@user.in_any_groups?(SiteSetting.personal_message_enabled_groups_map) || SiteSetting.enable_personal_messages) || notify_moderators) &&
# Can't send PMs to suspended users
(is_staff? || is_group || !target.suspended?) &&
# Check group messageable level
@ -467,7 +474,9 @@ class Guardian
# User is authenticated
return false if !authenticated?
# User is trusted enough
SiteSetting.enable_personal_messages && @user.has_trust_level_or_staff?(SiteSetting.min_trust_to_send_email_messages)
# TODO (martin) Remove enable_personal_messages here once plugins have been changed.
(@user.in_any_groups?(SiteSetting.personal_message_enabled_groups_map) || SiteSetting.enable_personal_messages) &&
@user.has_trust_level_or_staff?(SiteSetting.min_trust_to_send_email_messages)
end
def can_export_entity?(entity)