clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add the nsfw removal behind a config switch

Browse Source
This commit is contained in:
Michael
2018-03-14 07:13:17 +00:00
parent 858fd127a1
commit 6352aa112b
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Protocol/OStatus.php
View File

@@ -679,9 +679,10 @@ class OStatus
foreach ($category->attributes as $attributes) {
if ($attributes->name == "term") {
$term = $attributes->textContent;
// don't add nsfw with content warning
// Background: "nsfw" is set automatically by Mastodon and superfluous
if (!$content_warning || ($term != 'nsfw')) {
// don't add nsfw with content warning if enabled.
// Background: "nsfw" is set automatically by Mastodon
if (!Config::get('system', 'remove_nsfw_with_cw', false) ||
!$content_warning || ($term != 'nsfw')) {
if (strlen($item["tag"])) {
$item["tag"] .= ',';
}