tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages 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
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')