diff options
| author | Andrew Manning <tamanning@zoho.com> | 2018-03-27 21:11:34 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2018-03-27 21:11:34 -0400 |
| commit | 1dc795722a8e748ebb98e8fab778cd4686a0654f (patch) | |
| tree | 4f4a4e8dea10090106c4d54a02c6860332cd9df4 /include/feedutils.php | |
| parent | dcd658f12ea60945678717e3c310e94ece7b1f96 (diff) | |
| parent | c98776923a3aed4a0a17ca1412787de3b718eba9 (diff) | |
| download | volse-hubzilla-1dc795722a8e748ebb98e8fab778cd4686a0654f.tar.gz volse-hubzilla-1dc795722a8e748ebb98e8fab778cd4686a0654f.tar.bz2 volse-hubzilla-1dc795722a8e748ebb98e8fab778cd4686a0654f.zip | |
Merge branch 'dev' into oauth2
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'] . "']"; |