Skip to content

Commit d69cc29

Browse files
DEV: Remove deprecated trust level access settings (#36414)
### What is this change? Some time back we went through an exercise to turn trust-level based access to group-level based for better configurability. This involved deprecating, mapping, and replacing site settings. We marked the old settings for removal in 3.3, which was released over a year ago now. This PR removes the deprecated settings, their descriptions, the mapping helpers, and updates a few test cases we missed in the original conversion. ### Due diligence: - [x] Search through logs for recent deprecation warnings. (@Drenmi) - There are some false positives due to `UserMerger` looping through all site settings (including deprecated ones.) - [ ] Search through public and private repos for latent references. (@Drenmi) --------- Co-authored-by: Martin Brennan <[email protected]>
1 parent 2fdc9af commit d69cc29

File tree

13 files changed

+25
-590
lines changed

13 files changed

+25
-590
lines changed

config/locales/server.en.yml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2177,40 +2177,27 @@ en:
21772177
tl3_requires_likes_given: "The minimum number of likes that must be given in the last (tl3 time period) days to qualify for promotion to trust level 3."
21782178
tl3_requires_likes_received: "The minimum number of likes that must be received in the last (tl3 time period) days to qualify for promotion to trust level 3."
21792179
tl3_links_no_follow: "Do not remove rel=nofollow from links posted by trust level 3 users."
2180-
tl4_delete_posts_and_topics: "Allow TL4 users to delete posts and topics created by other users. TL4 users will also be able to see deleted topics and posts."
21812180
delete_all_posts_and_topics_allowed_groups: "Groups allowed to delete posts and topics created by other users. These groups will also be able to see deleted topics and posts."
21822181
edit_all_topic_groups: "Allow users in this group to edit other users' topic titles, tags, and categories"
21832182
edit_all_post_groups: "Allow users in this group to edit other users' posts"
21842183

2185-
min_trust_to_create_topic: "The minimum trust level required to create a new topic."
21862184
create_topic_allowed_groups: "Groups that are allowed to create new topics. Admins and moderators can always create topics."
21872185
allow_flagging_staff: "If enabled, users can flag posts from staff accounts."
21882186

2189-
min_trust_to_edit_wiki_post: "The minimum trust level required to edit post marked as wiki."
21902187
edit_wiki_post_allowed_groups: "Groups that are allowed to edit posts marked as wiki. Admins and moderators can always edit posts marked as wiki."
21912188

2192-
min_trust_to_edit_post: "The minimum trust level required to edit posts."
21932189
edit_post_allowed_groups: "Groups that are allowed to edit posts. Admins and moderators can always edit posts."
21942190

2195-
min_trust_to_allow_self_wiki: "The minimum trust level required to make user's own post wiki."
21962191
self_wiki_allowed_groups: "Allow users in these groups to make their own posts wiki. Admins and moderators can always make their own posts wiki."
21972192

21982193
min_trust_to_send_messages: "DEPRECATED, use the 'personal message enabled groups' setting instead. The minimum trust level required to create new personal messages."
2199-
min_trust_to_send_email_messages: "The minimum trust level required to send personal messages via email."
22002194
send_email_messages_allowed_groups: "Groups that are allowed to send personal messages via email. Admins and moderators can always send personal messages via email."
2201-
min_trust_to_flag_posts: "The minimum trust level required to flag posts"
22022195
flag_post_allowed_groups: "Groups that are allowed to flag posts. Admins and moderators can always flag posts."
2203-
min_trust_to_post_links: "The minimum trust level required to include links in posts"
22042196
post_links_allowed_groups: "Groups that are allowed to include links in posts. Admins and moderators are always allowed to post links."
2205-
min_trust_to_post_embedded_media: "The minimum trust level required to embed media items in a post"
22062197
embedded_media_post_allowed_groups: "The users in these groups are allowed to embed media items in a post. Admins and moderators can always embed media items."
2207-
min_trust_level_to_allow_profile_background: "The minimum trust level required to upload a profile background"
22082198
profile_background_allowed_groups: "Groups that are allowed to upload a profile background. Admins and moderators can always upload a profile background."
2209-
min_trust_level_to_allow_user_card_background: "The minimum trust level required to upload a user card background"
22102199
user_card_background_allowed_groups: "Groups that are allowed to upload a user card background. Admins and moderators can always upload a user card background."
2211-
min_trust_level_to_allow_invite: "The minimum trust level required to invite users"
22122200
invite_allowed_groups: "Groups that are allowed to invite users. Admins and moderators can always invite users."
2213-
min_trust_level_to_allow_ignore: "The minimum trust level required to ignore users"
22142201
ignore_allowed_groups: "Groups that are allowed to ignore other users. Admins and moderators can always ignore other users."
22152202
allowed_link_domains: "Domains that users may link to even if they don't have the appropriate trust level to post links"
22162203

@@ -2224,7 +2211,6 @@ en:
22242211
enable_mentions: "Permits users to tag or reference each other in their posts using the '@' symbol."
22252212
here_mention: "Name used for a @mention to allow privileged users to notify up to 'max_here_mentioned' people participating in the topic. Must not be an existing username."
22262213
max_here_mentioned: "Maximum number of mentioned people by @here."
2227-
min_trust_level_for_here_mention: "The minimum trust level allowed to mention @here."
22282214
here_mention_allowed_groups: "Groups that are allowed to mention @here. Admins and moderators can always mention @here."
22292215

22302216
create_thumbnails: "Create thumbnails and lightbox images that are too large to fit in a post."
@@ -2379,7 +2365,6 @@ en:
23792365
pop3_polling_delete_from_server: "Delete emails from server. NOTE: If you disable this you should manually clean your mail inbox"
23802366
log_mail_processing_failures: "Log all email processing failures to <a href='%{base_path}/logs' target='_blank'>/logs</a>"
23812367
email_in: "Allow users to post new topics via email. After enabling this setting, you will be able to configure incoming email addresses for groups and categories."
2382-
email_in_min_trust: "The minimum trust level a user needs to have to be allowed to post new topics via email."
23832368
email_in_allowed_groups: "Groups that are allowed to post new topics via email. Admins and moderators can always post new topics via email."
23842369

23852370
email_in_authserv_id: "The identifier of the service doing authentication checks on incoming emails. See <a href='https://meta.discourse.org/t/134358'>https://meta.discourse.org/t/134358</a> for instructions on how to configure this."
@@ -2410,7 +2395,6 @@ en:
24102395
email_editable: "Allow users to change their e-mail address after registration."
24112396
logout_redirect: "Location to redirect browser to after logout (eg: https://example.com/logout)"
24122397

2413-
allow_uploaded_avatars: "Allow users to upload custom profile pictures."
24142398
uploaded_avatars_allowed_groups: "Specify groups allowed to upload custom profile pictures."
24152399
default_avatars: "URLs to avatars that will be used by default for new users until they change them."
24162400
automatically_download_gravatars: "Download Gravatars for users upon account creation or email change."
@@ -2437,7 +2421,6 @@ en:
24372421
group_in_subject: "Set %%{optional_pm} in email subject to name of first group in PM, see: <a href='https://meta.discourse.org/t/customize-specific-email-templates/88323' target='_blank'>Customize subject format for standard emails</a>"
24382422
allow_anonymous_mode: "Enable the option for users to switch to anonymous mode for posting. When activated, users can opt for their identities to be hidden when creating posts or topics throughout the site. See also `allow anonymous likes`."
24392423
allow_likes_in_anonymous_mode: "Enable this setting to allow users who are browsing your site anonymously to like posts. When activated, users can opt for their identities to be hidden when liking posts or topics throughout the site. This setting requires the `allow anonymous mode` setting to be enabled."
2440-
anonymous_posting_min_trust_level: "Minimum trust level required to enable anonymous posting. This setting requires the `allow anonymous mode` setting to be enabled."
24412424
anonymous_posting_allowed_groups: "Groups that are allowed to enable anonymous posting. This setting requires the `allow anonymous mode` setting to be enabled."
24422425
anonymous_account_duration_minutes: "To protect anonymity create a new anonymous account every N minutes for each user. Example: if set to 600, as soon as 600 minutes elapse from last post AND user switches to anon, a new anonymous account is created."
24432426

@@ -2569,9 +2552,7 @@ en:
25692552
emoji_deny_list: "These emoji will not be available to use in menus or shortcodes."
25702553

25712554
approve_post_count: "The amount of posts from a new or basic user that must be approved"
2572-
approve_unless_trust_level: "Posts created by users below this trust level must be approved"
25732555
approve_unless_allowed_groups: "Posts created by users not in these groups must be approved. Posts created by admins and moderators are always approved."
2574-
approve_new_topics_unless_trust_level: "New topics created by users below this trust level must be approved"
25752556
approve_new_topics_unless_allowed_groups: "New topics created by users not in these groups must be approved. Topics created by admins and moderators are always approved."
25762557
approve_unless_staged: "New topics and posts created by staged users must be approved"
25772558
notify_about_queued_posts_after: "If there are posts that have been waiting to be reviewed for more than this many hours, send a notification to all moderators. Set to 0 to disable these notifications."
@@ -2591,7 +2572,6 @@ en:
25912572
new_user_notice_tl: "Minimum trust level required to see new user post notices."
25922573
returning_user_notice_tl: "Minimum trust level required to see returning user post notices."
25932574
returning_users_days: "How many days should pass before a user is considered to be returning."
2594-
review_media_unless_trust_level: "Staff will review posts of users with lower trust levels if they contain embedded media."
25952575
skip_review_media_groups: "Users who are not in any of these groups will have their posts sent to staff for review if the post contains embedded media. Posts created by admins and moderators are always allowed."
25962576
blur_tl0_flagged_posts_media: "Blur flagged posts images to hide potentially NSFW content."
25972577
enable_page_publishing: "Allow staff members to publish topics to new URLs with their own styling."
@@ -2656,9 +2636,6 @@ en:
26562636
revoke_api_keys_maxlife_days: "Number of days before an API key is automatically revoked (0 for never)"
26572637

26582638
allow_user_api_key_scopes: "List of scopes allowed for user API keys"
2659-
min_trust_level_for_user_api_key: |
2660-
Trust level required for generation of user API keys.<br>
2661-
<b>WARNING</b>: Changing the trust level will prevent users with a lower trust level from logging in via Discourse Hub
26622639
user_api_key_allowed_groups: |
26632640
Group membership required for generation of user API keys.<br>
26642641
<b>WARNING</b>: Changing the trust level will prevent users with a lower trust level from logging in via Discourse Hub.<br>
@@ -2669,7 +2646,6 @@ en:
26692646
revoke_user_api_keys_maxlife_days: "Number of days before a user API key is automatically revoked (0 for never)"
26702647

26712648
tagging_enabled: "Enable tags on topics? See the <a href='https://meta.discourse.org/t/admin-guide-to-tags-in-discourse/121041'>Admin guide to tags on Meta</a> for more information."
2672-
min_trust_to_create_tag: "The minimum trust level required to create a tag."
26732649
create_tag_allowed_groups: "Groups that are allowed to create tags. Admins and moderators can always create tags."
26742650
edit_tags_allowed_groups: "Groups that are allowed to edit tags, tag descriptions, and tag synonyms."
26752651
max_tags_per_topic: "The maximum tags that can be applied to a topic."
@@ -2682,7 +2658,6 @@ en:
26822658
tags_listed_by_group: "List tags by tag group on the <a href='%{base_path}/tags' target='_blank'>Tags page</a>."
26832659
tag_style: "Define the visual appearance of tag badges on the site. This setting allows you to customize how tags are visually represented across all areas of the site, enhancing layout consistency and user accessibility."
26842660
pm_tags_allowed_for_groups: "Allow members of included groups to tag any personal message"
2685-
min_trust_level_to_tag_topics: "Minimum trust level required to tag topics"
26862661
tag_topic_allowed_groups: "Groups that are allowed to tag topics. Admins and moderators can always tag topics."
26872662
suppress_overlapping_tags_in_list: "If tags match exact words in topic titles, don't show the tag"
26882663
remove_muted_tags_from_latest: "Don't show topics tagged only with muted tags in the latest topic list."
@@ -2696,7 +2671,6 @@ en:
26962671
city_for_disputes: "Specify the city that will be used as the jurisdiction for resolving any disputes related to the use of this forum. This information is typically included in legal documents such as the forum's Terms of Service."
26972672

26982673
shared_drafts_category: "Enable the Shared Drafts feature by designating a category for topic drafts. Topics in this category will be suppressed from topic lists for staff users."
2699-
shared_drafts_min_trust_level: "Allow users to see and edit Shared Drafts."
27002674
shared_drafts_allowed_groups: "Allow users in these groups to see and edit Shared Drafts."
27012675

27022676
push_notifications_prompt: "Show a user consent banner for push notifications. This setting triggers a prompt asking users for permission to send them push notifications. It only appears when push notifications are not already enabled, are supported by the user's device, and the user has either made a post or is using a Progressive Web App (PWA). The prompt will not be shown again if the user has already dismissed it or granted/denied permission."

0 commit comments

Comments
 (0)