diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-05-04 09:46:27 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-05-04 09:46:27 +0200 |
| commit | be4c9a9598350fb4333480f0c7b302acebcddfd4 (patch) | |
| tree | fb0c2606ad4ca0bc1a710d6fdf82f55c326b3427 /include/feedutils.php | |
| parent | f15c12376adad6534c8c0ea547a7548697eb8379 (diff) | |
| parent | be852ba857f4cb8e75574a762945b50c8bddcff9 (diff) | |
| download | volse-hubzilla-be4c9a9598350fb4333480f0c7b302acebcddfd4.tar.gz volse-hubzilla-be4c9a9598350fb4333480f0c7b302acebcddfd4.tar.bz2 volse-hubzilla-be4c9a9598350fb4333480f0c7b302acebcddfd4.zip | |
Merge branch '3.4RC'3.4
Diffstat (limited to 'include/feedutils.php')
| -rw-r--r-- | include/feedutils.php | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/feedutils.php b/include/feedutils.php index 369193fce..023caaad6 100644 --- a/include/feedutils.php +++ b/include/feedutils.php @@ -668,6 +668,14 @@ function get_atom_elements($feed, $item) { } $termterm = notags(trim(unxmlify($term))); + // Mastodon auto generates an nsfw category tag for any 'content-warning' message. + // Most people use CW and use both summary/content as a spoiler and we honour that + // construct so the post will already be collapsed. The generated tag is almost + // always wrong and even if it isn't we would already be doing the right thing. + + if($mastodon && $termterm === 'nsfw' && $summary && $res['body']) + continue; + if($termterm) { $terms[] = array( 'otype' => TERM_OBJ_POST, @@ -926,6 +934,7 @@ function feed_get_reshare(&$res,$item) { "' profile='" . $share['profile'] . "' avatar='" . $share['avatar'] . "' link='" . $share['alternate'] . + "' auth='" . 'false' . "' posted='" . $share['created'] . "' message_id='" . $share['message_id'] . "']"; |