]> git.mxchange.org Git - friendica.git/commitdiff
Add Content Warning support for comments too
authorHypolite Petovan <mrpetovan@gmail.com>
Mon, 10 Apr 2017 04:57:36 +0000 (00:57 -0400)
committerHypolite Petovan <mrpetovan@gmail.com>
Mon, 10 Apr 2017 04:57:36 +0000 (00:57 -0400)
Doh!

include/ostatus.php

index 73fcb47572bd7849895b35ba04674bc2dd2be0cd..9c1246c85c3f48a8f065f06e4fc3a783aa361000 100644 (file)
@@ -354,8 +354,9 @@ class ostatus {
                        }
 
                        $item["object-type"] = $xpath->query('activity:object-type/text()', $entry)->item(0)->nodeValue;
+                       $item["verb"] = $xpath->query('activity:verb/text()', $entry)->item(0)->nodeValue;
 
-                       if ($item["object-type"] == ACTIVITY_OBJ_NOTE && $xpath->evaluate('boolean(atom:summary)', $entry)) {
+                       if ($item["verb"] == ACTIVITY_POST && $xpath->evaluate('boolean(atom:summary)', $entry)) {
                                // Mastodon Content Warning
                                $clear_text = $xpath->query('atom:summary/text()', $entry)->item(0)->nodeValue;
                                $hidden_text = $xpath->query('atom:content/text()', $entry)->item(0)->nodeValue;
@@ -370,7 +371,7 @@ class ostatus {
                                $item["body"] = add_page_info_to_body(html2bbcode($xpath->query('atom:content/text()', $entry)->item(0)->nodeValue));
                        }
                        $item["object"] = $xml;
-                       $item["verb"] = $xpath->query('activity:verb/text()', $entry)->item(0)->nodeValue;
+
 
                        /// @TODO
                        /// Delete a message