Merge pull request #8462 from annando/issue-8254-3

[friendica.git] / src / Protocol / DFRN.php

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index d998c9383c5167acd167689b74f1708b3f81a2ba..4c71de4d57554f81dacc1edbd6f3e3f4f118b20c 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -182,7 +182,7 @@ class DFRN
 
                // default permissions - anonymous user
 
-               $sql_extra = " AND NOT `item`.`private` ";
+               $sql_extra = sprintf(" AND `item`.`private` != %s ", Item::PRIVATE);
 
                $r = q(
                        "SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`, `user`.`account-type`
@@ -234,7 +234,7 @@ class DFRN
                        if (!empty($set)) {
                                $sql_extra = " AND `item`.`psid` IN (" . implode(',', $set) .")";
                        } else {
-                               $sql_extra = " AND NOT `item`.`private`";
+                               $sql_extra = sprintf(" AND `item`.`private` != %s", Item::PRIVATE);
                        }
                }
 
@@ -332,7 +332,7 @@ class DFRN
                        if ($public_feed) {
                                $type = 'html';
                                // catch any email that's in a public conversation and make sure it doesn't leak
-                               if ($item['private']) {
+                               if ($item['private'] == Item::PRIVATE) {
                                        continue;
                                }
                        } else {
@@ -640,7 +640,7 @@ class DFRN
        private static function addAuthor(DOMDocument $doc, array $owner, $authorelement, $public)
        {
                // Should the profile be "unsearchable" in the net? Then add the "hide" element
-               $hide = DBA::exists('profile', ['uid' => $owner['uid'], 'net-publish' = false]);
+               $hide = DBA::exists('profile', ['uid' => $owner['uid'], 'net-publish' => false]);
 
                $author = $doc->createElement($authorelement);
 
@@ -955,7 +955,7 @@ class DFRN
                        $entry->setAttribute("xmlns:statusnet", ActivityNamespace::STATUSNET);
                }
 
-               if ($item['private']) {
+               if ($item['private'] == Item::PRIVATE) {
                        $body = Item::fixPrivatePhotos($item['body'], $owner['uid'], $item, $cid);
                } else {
                        $body = $item['body'];
@@ -1050,7 +1050,9 @@ class DFRN
                }
 
                if ($item['private']) {
-                       XML::addElement($doc, $entry, "dfrn:private", ($item['private'] ? $item['private'] : 1));
+                       // Friendica versions prior to 2020.3 can't handle "unlisted" properly. So we can only transmit public and private
+                       XML::addElement($doc, $entry, "dfrn:private", ($item['private'] == Item::PRIVATE ? Item::PRIVATE : Item::PUBLIC));
+                       XML::addElement($doc, $entry, "dfrn:unlisted", $item['private'] == Item::UNLISTED);
                }
 
                if ($item['extid']) {
@@ -2367,32 +2369,11 @@ class DFRN
 
                $item["body"] = XML::getFirstNodeValue($xpath, "dfrn:env/text()", $entry);
                $item["body"] = str_replace([' ',"\t","\r","\n"], ['','','',''], $item["body"]);
-               // make sure nobody is trying to sneak some html tags by us
+
                $item["body"] = Strings::base64UrlDecode($item["body"]);
 
                $item["body"] = BBCode::limitBodySize($item["body"]);
 
-               /// @todo Do we really need this check for HTML elements? (It was copied from the old function)
-               if ((strpos($item['body'], '<') !== false) && (strpos($item['body'], '>') !== false)) {
-                       $base_url = DI::baseUrl()->get();
-                       $item['body'] = HTML::relToAbs($item['body'], $base_url);
-
-                       $item['body'] = HTML::toBBCodeVideo($item['body']);
-
-                       $item['body'] = OEmbed::HTML2BBCode($item['body']);
-
-                       $config = HTMLPurifier_Config::createDefault();
-                       $config->set('Cache.DefinitionImpl', null);
-
-                       // we shouldn't need a whitelist, because the bbcode converter
-                       // will strip out any unsupported tags.
-
-                       $purifier = new HTMLPurifier($config);
-                       $item['body'] = $purifier->purify($item['body']);
-
-                       $item['body'] = @HTML::toBBCode($item['body']);
-               }
-
                /// @todo We should check for a repeated post and if we know the repeated author.
 
                // We don't need the content element since "dfrn:env" is always present
@@ -2404,6 +2385,11 @@ class DFRN
 
                $item["private"] = XML::getFirstNodeValue($xpath, "dfrn:private/text()", $entry);
 
+               $unlisted = XML::getFirstNodeValue($xpath, "dfrn:unlisted/text()", $entry);
+               if (!empty($unlisted) && ($item['private'] != Item::PRIVATE)) {
+                       $item['private'] = Item::UNLISTED;
+               }
+
                $item["extid"] = XML::getFirstNodeValue($xpath, "dfrn:extid/text()", $entry);
 
                if (XML::getFirstNodeValue($xpath, "dfrn:bookmark/text()", $entry) == "true") {
@@ -2709,7 +2695,7 @@ class DFRN
 
                Logger::log('deleting item '.$item['id'].' uri='.$uri, Logger::DEBUG);
 
-               Item::delete(['id' => $item['id']]);
+               Item::markForDeletion(['id' => $item['id']]);
        }
 
        /**