MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

"nsfw" at "content warning" content doesn't fit together

Browse source
This commit is contained in:
Michael 2018-03-13 22:39:08 +00:00
parent 3f6fefaa9a
commit f49391a21c
1 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/Protocol/OStatus.php
View file

@ -604,21 +604,6 @@ class OStatus
$item["coord"] = $georsspoint->item(0)->nodeValue; $item["coord"] = $georsspoint->item(0)->nodeValue;
} }
$categories = $xpath->query('atom:category', $entry);
if ($categories) {
foreach ($categories as $category) {
foreach ($category->attributes as $attributes) {
if ($attributes->name == "term") {
$term = $attributes->textContent;
if (strlen($item["tag"])) {
$item["tag"] .= ',';
}
$item["tag"] .= "#[url=".System::baseUrl()."/search?tag=".$term."]".$term."[/url]";
}
}
}
}
$self = ''; $self = '';
$add_body = ''; $add_body = '';
@ -658,10 +643,12 @@ class OStatus
} }
// Mastodon Content Warning // Mastodon Content Warning
$content_warning = false;
if (($item["verb"] == ACTIVITY_POST) && $xpath->evaluate('boolean(atom:summary)', $entry)) { if (($item["verb"] == ACTIVITY_POST) && $xpath->evaluate('boolean(atom:summary)', $entry)) {
$clear_text = $xpath->query('atom:summary/text()', $entry)->item(0)->nodeValue; $clear_text = $xpath->query('atom:summary/text()', $entry)->item(0)->nodeValue;
if (!empty($clear_text)) { if (!empty($clear_text)) {
$item["body"] = html2bbcode($clear_text) . '[spoiler]' . $item["body"] . '[/spoiler]'; $item["body"] = html2bbcode($clear_text) . '[spoiler]' . $item["body"] . '[/spoiler]';
$content_warning = true;
} }
} }
@ -686,6 +673,25 @@ class OStatus
$item["parent-uri"] = $item["uri"]; $item["parent-uri"] = $item["uri"];
} }
$categories = $xpath->query('atom:category', $entry);
if ($categories) {
foreach ($categories as $category) {
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')) {
if (strlen($item["tag"])) {
$item["tag"] .= ',';
}
$item["tag"] .= "#[url=".System::baseUrl()."/search?tag=".$term."]".$term."[/url]";
}
}
}
}
}
if (($item['author-link'] != '') && !empty($item['protocol'])) { if (($item['author-link'] != '') && !empty($item['protocol'])) {
$item = Conversation::insert($item); $item = Conversation::insert($item);
} }