diff options
| author | zotlabs <mike@macgirvin.com> | 2018-03-14 14:51:33 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-03-14 14:51:33 -0700 |
| commit | 0905018d3b3b02def2b0e69e9bc4c4ef2b2b86aa (patch) | |
| tree | 4a6d464a5765856bbb1c262d6d952bd3025b9b17 /include/feedutils.php | |
| parent | 9d230b1f4cbffe5d937a357adbe8cfe73ce7f792 (diff) | |
| download | volse-hubzilla-0905018d3b3b02def2b0e69e9bc4c4ef2b2b86aa.tar.gz volse-hubzilla-0905018d3b3b02def2b0e69e9bc4c4ef2b2b86aa.tar.bz2 volse-hubzilla-0905018d3b3b02def2b0e69e9bc4c4ef2b2b86aa.zip | |
use original exif_read_data() parameters which were lost in a regression; unset automatic nsfw category generated for Mastodon content warning posts, as people use CW as a spoiler mechanism 99% of the time and flagging inappropriate content 1% of the time.
Diffstat (limited to 'include/feedutils.php')
| -rw-r--r-- | include/feedutils.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/feedutils.php b/include/feedutils.php index 369193fce..4864a6ef5 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') + continue; + if($termterm) { $terms[] = array( 'otype' => TERM_OBJ_POST, |