tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity

Add option (on by default) to allow toots with content warnings to trend

Browse Source
This commit is contained in:
Claire 2022-02-26 10:45:44 +01:00
parent c6df6686af
commit 756f1b6615
5 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/form/admin_settings.rb
View File

@ -35,6 +35,7 @@ class Form::AdminSettings
show_replies_in_public_timelines
trends
trendable_by_default
trending_status_cw
show_domain_blocks
show_domain_blocks_rationale
noindex
@ -57,6 +58,7 @@ class Form::AdminSettings
show_replies_in_public_timelines
trends
trendable_by_default
trending_status_cw
noindex
require_invite_text
captcha_enabled

2
app/models/trends/statuses.rb
View File

@ -93,7 +93,7 @@ class Trends::Statuses < Trends::Base
original_status.public_visibility? &&
original_status.account.discoverable? && !original_status.account.silenced? &&
original_status.spoiler_text.blank? && !original_status.sensitive? && !original_status.reply?
(original_status.spoiler_text.blank? || Setting.trending_status_cw) && !original_status.sensitive? && !original_status.reply?
end
def calculate_scores(statuses, at_time)

3
app/views/admin/settings/edit.html.haml
View File

@ -86,6 +86,9 @@
.fields-group
= f.input :trendable_by_default, as: :boolean, wrapper: :with_label, label: t('admin.settings.trendable_by_default.title'), hint: t('admin.settings.trendable_by_default.desc_html')
.fields-group
= f.input :trending_status_cw, as: :boolean, wrapper: :with_label, label: t('admin.settings.trending_status_cw.title'), hint: t('trending_status_cw.desc_html')
.fields-group
= f.input :noindex, as: :boolean, wrapper: :with_label, label: t('admin.settings.default_noindex.title'), hint: t('admin.settings.default_noindex.desc_html')

3
config/locales-glitch/en.yml
View File

@ -20,6 +20,9 @@ en:
show_replies_in_public_timelines:
desc_html: In addition to public self-replies (threads), show public replies in local and public timelines.
title: Show replies in public timelines
trending_status_cw:
desc_html: When trending posts are enabled, allow posts with Content Warnings to be eligible. Changes to this setting are not retroactive.
title: Allow posts with Content Warnings to trend
auth:
captcha_confirmation:
hint_html: Just one more step! To confirm your account, this server requires you to solve a CAPTCHA. You can <a href="/about/more">contact the server administrator</a> if you have questions or need assistance with confirming your account.

1
config/settings.yml
View File

@ -41,6 +41,7 @@ defaults: &defaults
use_pending_items: false
trends: true
trendable_by_default: false
trending_status_cw: true
crop_images: true
notification_emails:
follow: false