X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FDFRN.php;h=4e5aac37d990d930bbda690e221d8e2d6c3a32dd;hb=dbad46c37847f894312c0f1318a21f5ce3606cb0;hp=e058854c9416ff1f07a8d4ba3f83f8ea628145fb;hpb=3c76826793feeb933dab7a07dab7cc7eb2efc451;p=friendica.git diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index e058854c94..4e5aac37d9 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -1,24 +1,33 @@ . * - * @see https://github.com/friendica/friendica/wiki/Protocol and - * https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf */ + namespace Friendica\Protocol; use DOMDocument; use DOMXPath; use Friendica\App\BaseURL; -use Friendica\Content\OEmbed; use Friendica\Content\Text\BBCode; -use Friendica\Content\Text\HTML; -use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Protocol; -use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Contact; @@ -26,9 +35,13 @@ use Friendica\Model\Conversation; use Friendica\Model\Event; use Friendica\Model\GContact; use Friendica\Model\Item; +use Friendica\Model\ItemURI; use Friendica\Model\Mail; +use Friendica\Model\Notify\Type; use Friendica\Model\PermissionSet; use Friendica\Model\Profile; +use Friendica\Model\Tag; +use Friendica\Model\Term; use Friendica\Model\User; use Friendica\Network\Probe; use Friendica\Util\Crypto; @@ -37,11 +50,9 @@ use Friendica\Util\Images; use Friendica\Util\Network; use Friendica\Util\Strings; use Friendica\Util\XML; -use HTMLPurifier; -use HTMLPurifier_Config; /** - * @brief This class contain functions to create and send DFRN XML files + * This class contain functions to create and send DFRN XML files */ class DFRN { @@ -51,7 +62,7 @@ class DFRN const REPLY_RC = 2; // Reply that will be relayed /** - * @brief Generates an array of contact and user for DFRN imports + * Generates an array of contact and user for DFRN imports * * This array contains not only the receiver but also the sender of the message. * @@ -92,7 +103,7 @@ class DFRN } /** - * @brief Generates the atom entries for delivery.php + * Generates the atom entries for delivery.php * * This function is used whenever content is transmitted via DFRN. * @@ -131,7 +142,7 @@ class DFRN } /** - * @brief Generate an atom feed for the given user + * Generate an atom feed for the given user * * This function is called when another server is pulling data from the user feed. * @@ -147,7 +158,7 @@ class DFRN */ public static function feed($dfrn_id, $owner_nick, $last_update, $direction = 0, $onlyheader = false) { - $a = \get_app(); + $a = DI::app(); $sitefeed = ((strlen($owner_nick)) ? false : true); // not yet implemented, need to rewrite huge chunks of following logic $public_feed = (($dfrn_id) ? false : true); @@ -170,21 +181,14 @@ class DFRN // default permissions - anonymous user - $sql_extra = " AND NOT `item`.`private` "; - - $r = q( - "SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`, `user`.`account-type` - FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid` - WHERE `contact`.`self` AND `user`.`nickname` = '%s' LIMIT 1", - DBA::escape($owner_nick) - ); + $sql_extra = sprintf(" AND `item`.`private` != %s ", Item::PRIVATE); - if (! DBA::isResult($r)) { + $owner = DBA::selectFirst('owner-view', [], ['nickname' => $owner_nick]); + if (!DBA::isResult($owner)) { Logger::log(sprintf('No contact found for nickname=%d', $owner_nick), Logger::WARNING); exit(); } - $owner = $r[0]; $owner_id = $owner['uid']; $sql_post_table = ""; @@ -222,7 +226,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); } } @@ -240,8 +244,8 @@ class DFRN $sql_post_table = sprintf( "INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ", DBA::escape(Strings::protectSprintf($category)), - intval(TERM_OBJ_POST), - intval(TERM_CATEGORY), + intval(Term::OBJECT_TYPE_POST), + intval(Term::CATEGORY), intval($owner_id) ); } @@ -320,7 +324,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 { @@ -341,7 +345,7 @@ class DFRN } /** - * @brief Generate an atom entry for a given item id + * Generate an atom entry for a given item id * * @param int $item_id The item id * @param boolean $conversation Show the conversation. If false show the single post. @@ -410,7 +414,7 @@ class DFRN } /** - * @brief Create XML text for DFRN mails + * Create XML text for DFRN mails * * @param array $item message elements * @param array $owner Owner record @@ -447,7 +451,7 @@ class DFRN } /** - * @brief Create XML text for DFRN friend suggestions + * Create XML text for DFRN friend suggestions * * @param array $item suggestion elements * @param array $owner Owner record @@ -477,7 +481,7 @@ class DFRN } /** - * @brief Create XML text for DFRN relocations + * Create XML text for DFRN relocations * * @param array $owner Owner record * @param int $uid User ID @@ -490,11 +494,11 @@ class DFRN { /* get site pubkey. this could be a new installation with no site keys*/ - $pubkey = Config::get('system', 'site_pubkey'); + $pubkey = DI::config()->get('system', 'site_pubkey'); if (! $pubkey) { $res = Crypto::newKeypair(1024); - Config::set('system', 'site_prvkey', $res['prvkey']); - Config::set('system', 'site_pubkey', $res['pubkey']); + DI::config()->set('system', 'site_prvkey', $res['prvkey']); + DI::config()->set('system', 'site_pubkey', $res['pubkey']); } $rp = q( @@ -506,7 +510,7 @@ class DFRN $ext = Images::supportedTypes(); foreach ($rp as $p) { - $photos[$p['scale']] = System::baseUrl().'/photo/'.$p['resource-id'].'-'.$p['scale'].'.'.$ext[$p['type']]; + $photos[$p['scale']] = DI::baseUrl().'/photo/'.$p['resource-id'].'-'.$p['scale'].'.'.$ext[$p['type']]; } @@ -528,7 +532,7 @@ class DFRN XML::addElement($doc, $relocate, "dfrn:confirm", $owner['confirm']); XML::addElement($doc, $relocate, "dfrn:notify", $owner['notify']); XML::addElement($doc, $relocate, "dfrn:poll", $owner['poll']); - XML::addElement($doc, $relocate, "dfrn:sitepubkey", Config::get('system', 'site_pubkey')); + XML::addElement($doc, $relocate, "dfrn:sitepubkey", DI::config()->get('system', 'site_pubkey')); $root->appendChild($relocate); @@ -536,7 +540,7 @@ class DFRN } /** - * @brief Adds the header elements for the DFRN protocol + * Adds the header elements for the DFRN protocol * * @param DOMDocument $doc XML document * @param array $owner Owner record @@ -568,7 +572,7 @@ class DFRN $root->setAttribute("xmlns:ostatus", ActivityNamespace::OSTATUS); $root->setAttribute("xmlns:statusnet", ActivityNamespace::STATUSNET); - XML::addElement($doc, $root, "id", System::baseUrl()."/profile/".$owner["nick"]); + XML::addElement($doc, $root, "id", DI::baseUrl()."/profile/".$owner["nick"]); XML::addElement($doc, $root, "title", $owner["name"]); $attributes = ["uri" => "https://friendi.ca", "version" => FRIENDICA_VERSION."-".DB_UPDATE_VERSION]; @@ -585,13 +589,13 @@ class DFRN // DFRN itself doesn't uses this. But maybe someone else wants to subscribe to the public feed. OStatus::hublinks($doc, $root, $owner["nick"]); - $attributes = ["rel" => "salmon", "href" => System::baseUrl()."/salmon/".$owner["nick"]]; + $attributes = ["rel" => "salmon", "href" => DI::baseUrl()."/salmon/".$owner["nick"]]; XML::addElement($doc, $root, "link", "", $attributes); - $attributes = ["rel" => "http://salmon-protocol.org/ns/salmon-replies", "href" => System::baseUrl()."/salmon/".$owner["nick"]]; + $attributes = ["rel" => "http://salmon-protocol.org/ns/salmon-replies", "href" => DI::baseUrl()."/salmon/".$owner["nick"]]; XML::addElement($doc, $root, "link", "", $attributes); - $attributes = ["rel" => "http://salmon-protocol.org/ns/salmon-mention", "href" => System::baseUrl()."/salmon/".$owner["nick"]]; + $attributes = ["rel" => "http://salmon-protocol.org/ns/salmon-mention", "href" => DI::baseUrl()."/salmon/".$owner["nick"]]; XML::addElement($doc, $root, "link", "", $attributes); } @@ -614,7 +618,7 @@ class DFRN } /** - * @brief Adds the author element in the header for the DFRN protocol + * Adds the author element in the header for the DFRN protocol * * @param DOMDocument $doc XML document * @param array $owner Owner record @@ -627,38 +631,28 @@ class DFRN */ private static function addAuthor(DOMDocument $doc, array $owner, $authorelement, $public) { - // Is the profile hidden or shouldn't be published in the net? Then add the "hide" element - $r = q( - "SELECT `id` FROM `profile` INNER JOIN `user` ON `user`.`uid` = `profile`.`uid` - WHERE (`hidewall` OR NOT `net-publish`) AND `user`.`uid` = %d", - intval($owner['uid']) - ); - if (DBA::isResult($r)) { - $hidewall = true; - } else { - $hidewall = false; - } + // Should the profile be "unsearchable" in the net? Then add the "hide" element + $hide = DBA::exists('profile', ['uid' => $owner['uid'], 'net-publish' => false]); $author = $doc->createElement($authorelement); $namdate = DateTimeFormat::utc($owner['name-date'].'+00:00', DateTimeFormat::ATOM); - $uridate = DateTimeFormat::utc($owner['uri-date'].'+00:00', DateTimeFormat::ATOM); $picdate = DateTimeFormat::utc($owner['avatar-date'].'+00:00', DateTimeFormat::ATOM); $attributes = []; - if (!$public || !$hidewall) { + if (!$public || !$hide) { $attributes = ["dfrn:updated" => $namdate]; } XML::addElement($doc, $author, "name", $owner["name"], $attributes); - XML::addElement($doc, $author, "uri", System::baseUrl().'/profile/'.$owner["nickname"], $attributes); + XML::addElement($doc, $author, "uri", DI::baseUrl().'/profile/'.$owner["nickname"], $attributes); XML::addElement($doc, $author, "dfrn:handle", $owner["addr"], $attributes); $attributes = ["rel" => "photo", "type" => "image/jpeg", "media:width" => 300, "media:height" => 300, "href" => $owner['photo']]; - if (!$public || !$hidewall) { + if (!$public || !$hide) { $attributes["dfrn:updated"] = $picdate; } @@ -667,7 +661,7 @@ class DFRN $attributes["rel"] = "avatar"; XML::addElement($doc, $author, "link", "", $attributes); - if ($hidewall) { + if ($hide) { XML::addElement($doc, $author, "dfrn:hide", "true"); } @@ -683,18 +677,10 @@ class DFRN } // Only show contact details when we are allowed to - $r = q( - "SELECT `profile`.`about`, `profile`.`name`, `profile`.`homepage`, `user`.`nickname`, - `user`.`timezone`, `profile`.`locality`, `profile`.`region`, `profile`.`country-name`, - `profile`.`pub_keywords`, `profile`.`xmpp`, `profile`.`dob` - FROM `profile` - INNER JOIN `user` ON `user`.`uid` = `profile`.`uid` - WHERE `profile`.`is-default` AND NOT `user`.`hidewall` AND `user`.`uid` = %d", - intval($owner['uid']) - ); - if (DBA::isResult($r)) { - $profile = $r[0]; - + $profile = DBA::selectFirst('owner-view', + ['about', 'name', 'homepage', 'nickname', 'timezone', 'locality', 'region', 'country-name', 'pub_keywords', 'xmpp', 'dob'], + ['uid' => $owner['uid'], 'hidewall' => false]); + if (DBA::isResult($profile)) { XML::addElement($doc, $author, "poco:displayName", $profile["name"]); XML::addElement($doc, $author, "poco:updated", $namdate); @@ -759,7 +745,7 @@ class DFRN } /** - * @brief Adds the author elements in the "entry" elements of the DFRN protocol + * Adds the author elements in the "entry" elements of the DFRN protocol * * @param DOMDocument $doc XML document * @param string $element Element name for the author @@ -804,7 +790,7 @@ class DFRN } /** - * @brief Adds the activity elements + * Adds the activity elements * * @param DOMDocument $doc XML document * @param string $element Element name for the activity @@ -819,7 +805,7 @@ class DFRN if ($activity) { $entry = $doc->createElement($element); - $r = XML::parseString($activity, false); + $r = XML::parseString($activity); if (!$r) { return false; } @@ -845,7 +831,7 @@ class DFRN $r->link = preg_replace('/\/', '', $r->link); // XML does need a single element as root element so we add a dummy element here - $data = XML::parseString("" . $r->link . "", false); + $data = XML::parseString("" . $r->link . ""); if (is_object($data)) { foreach ($data->link as $link) { $attributes = []; @@ -871,7 +857,7 @@ class DFRN } /** - * @brief Adds the elements for attachments + * Adds the elements for attachments * * @param object $doc XML document * @param object $root XML root @@ -907,7 +893,7 @@ class DFRN } /** - * @brief Adds the "entry" elements for the DFRN protocol + * Adds the "entry" elements for the DFRN protocol * * @param DOMDocument $doc XML document * @param string $type "text" or "html" @@ -953,7 +939,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']; @@ -989,7 +975,7 @@ class DFRN } // Add conversation data. This is used for OStatus - $conversation_href = System::baseUrl()."/display/".$item["parent-guid"]; + $conversation_href = DI::baseUrl()."/display/".$item["parent-guid"]; $conversation_uri = $conversation_href; if (isset($parent_item)) { @@ -1030,7 +1016,7 @@ class DFRN "link", "", ["rel" => "alternate", "type" => "text/html", - "href" => System::baseUrl() . "/display/" . $item["guid"]] + "href" => DI::baseUrl() . "/display/" . $item["guid"]] ); // "comment-allow" is some old fashioned stuff for old Friendica versions. @@ -1048,7 +1034,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']) { @@ -1068,7 +1056,7 @@ class DFRN // The signed text contains the content in Markdown, the sender handle and the signatur for the content // It is needed for relayed comments to Diaspora. if ($item['signed_text']) { - $sign = base64_encode(json_encode(['signed_text' => $item['signed_text'],'signature' => $item['signature'],'signer' => $item['signer']])); + $sign = base64_encode(json_encode(['signed_text' => $item['signed_text'],'signature' => '','signer' => ''])); XML::addElement($doc, $entry, "dfrn:diaspora_signature", $sign); } @@ -1144,7 +1132,7 @@ class DFRN } /** - * @brief encrypts data via AES + * encrypts data via AES * * @param string $data The data that is to be encrypted * @param string $key The AES key @@ -1157,7 +1145,7 @@ class DFRN } /** - * @brief decrypts data via AES + * decrypts data via AES * * @param string $encrypted The encrypted data * @param string $key The AES key @@ -1170,7 +1158,7 @@ class DFRN } /** - * @brief Delivers the atom content to the contacts + * Delivers the atom content to the contacts * * @param array $owner Owner record * @param array $contact Contact record of the receiver @@ -1193,12 +1181,12 @@ class DFRN $idtosend = '1:' . $orig_id; } - $rino = Config::get('system', 'rino_encrypt'); + $rino = DI::config()->get('system', 'rino_encrypt'); $rino = intval($rino); Logger::log("Local rino version: ". $rino, Logger::DEBUG); - $ssl_val = intval(Config::get('system', 'ssl_policy')); + $ssl_val = intval(DI::config()->get('system', 'ssl_policy')); switch ($ssl_val) { case BaseURL::SSL_POLICY_FULL: @@ -1406,7 +1394,7 @@ class DFRN } /** - * @brief Transmits atom content to the contacts via the Diaspora transport layer + * Transmits atom content to the contacts via the Diaspora transport layer * * @param array $owner Owner record * @param array $contact Contact record of the receiver @@ -1496,7 +1484,7 @@ class DFRN } /** - * @brief Fetch the author data from head or entry items + * Fetch the author data from head or entry items * * @param object $xpath XPath object * @param object $context In which context should the data be searched @@ -1730,7 +1718,7 @@ class DFRN } /** - * @brief Transforms activity objects into an XML string + * Transforms activity objects into an XML string * * @param object $xpath XPath object * @param object $activity Activity object @@ -1785,7 +1773,7 @@ class DFRN } /** - * @brief Processes the mail elements + * Processes the mail elements * * @param object $xpath XPath object * @param object $mail mail elements @@ -1814,7 +1802,7 @@ class DFRN } /** - * @brief Processes the suggestion elements + * Processes the suggestion elements * * @param object $xpath XPath object * @param object $suggestion suggestion elements @@ -1894,14 +1882,14 @@ class DFRN notification( [ - 'type' => NOTIFY_SUGGEST, + 'type' => Type::SUGGEST, 'notify_flags' => $importer['notify-flags'], 'language' => $importer['language'], 'to_name' => $importer['username'], 'to_email' => $importer['email'], 'uid' => $importer['importer_uid'], 'item' => $suggest, - 'link' => System::baseUrl().'/notifications/intros', + 'link' => DI::baseUrl().'/notifications/intros', 'source_name' => $importer['name'], 'source_link' => $importer['url'], 'source_photo' => $importer['photo'], @@ -1913,7 +1901,7 @@ class DFRN } /** - * @brief Processes the relocation elements + * Processes the relocation elements * * @param object $xpath XPath object * @param object $relocation relocation elements @@ -1998,7 +1986,7 @@ class DFRN } /** - * @brief Updates an item + * Updates an item * * @param array $current the current item record * @param array $item the new item record @@ -2031,7 +2019,7 @@ class DFRN } /** - * @brief Detects the entry type of the item + * Detects the entry type of the item * * @param array $importer Record of the importer user mixed with contact of the content * @param array $item the new item record @@ -2099,7 +2087,7 @@ class DFRN } /** - * @brief Send a "poke" + * Send a "poke" * * @param array $item The new item record * @param array $importer Record of the importer user mixed with contact of the content @@ -2113,7 +2101,7 @@ class DFRN if (!$verb) { return; } - $xo = XML::parseString($item["object"], false); + $xo = XML::parseString($item["object"]); if (($xo->type == Activity\ObjectType::PERSON) && ($xo->id)) { // somebody was poked/prodded. Was it me? @@ -2129,7 +2117,7 @@ class DFRN } } - if ($Blink && Strings::compareLink($Blink, System::baseUrl() . "/profile/" . $importer["nickname"])) { + if ($Blink && Strings::compareLink($Blink, DI::baseUrl() . "/profile/" . $importer["nickname"])) { $author = DBA::selectFirst('contact', ['name', 'thumb', 'url'], ['id' => $item['author-id']]); $parent = Item::selectFirst(['id'], ['uri' => $item['parent-uri'], 'uid' => $importer["importer_uid"]]); @@ -2138,14 +2126,14 @@ class DFRN // send a notification notification( [ - "type" => NOTIFY_POKE, + "type" => Type::POKE, "notify_flags" => $importer["notify-flags"], "language" => $importer["language"], "to_name" => $importer["username"], "to_email" => $importer["email"], "uid" => $importer["importer_uid"], "item" => $item, - "link" => System::baseUrl()."/display/".urlencode($item['guid']), + "link" => DI::baseUrl()."/display/".urlencode($item['guid']), "source_name" => $author["name"], "source_link" => $author["url"], "source_photo" => $author["thumb"], @@ -2159,7 +2147,7 @@ class DFRN } /** - * @brief Processes several actions, depending on the verb + * Processes several actions, depending on the verb * * @param int $entrytype Is it a toplevel entry, a comment or a relayed comment? * @param array $importer Record of the importer user mixed with contact of the content @@ -2236,11 +2224,11 @@ class DFRN } if (($item["verb"] == Activity::TAG) && ($item["object-type"] == Activity\ObjectType::TAGTERM)) { - $xo = XML::parseString($item["object"], false); - $xt = XML::parseString($item["target"], false); + $xo = XML::parseString($item["object"]); + $xt = XML::parseString($item["target"]); if ($xt->type == Activity\ObjectType::NOTE) { - $item_tag = Item::selectFirst(['id', 'tag'], ['uri' => $xt->id, 'uid' => $importer["importer_uid"]]); + $item_tag = Item::selectFirst(['id', 'uri-id', 'tag'], ['uri' => $xt->id, 'uid' => $importer["importer_uid"]]); if (!DBA::isResult($item_tag)) { Logger::log("Query failed to execute, no result returned in " . __FUNCTION__); @@ -2249,6 +2237,8 @@ class DFRN // extract tag, if not duplicate, add to parent item if ($xo->content) { + Tag::store($item_tag['uri-id'], Tag::HASHTAG, $xo->content); + if (!stristr($item_tag["tag"], trim($xo->content))) { $tag = $item_tag["tag"] . (strlen($item_tag["tag"]) ? ',' : '') . '#[url=' . $xo->id . ']'. $xo->content . '[/url]'; Item::update(['tag' => $tag], ['id' => $item_tag["id"]]); @@ -2261,7 +2251,7 @@ class DFRN } /** - * @brief Processes the link elements + * Processes the link elements * * @param object $links link elements * @param array $item the item record @@ -2305,7 +2295,7 @@ class DFRN } /** - * @brief Processes the entry elements which contain the items and comments + * Processes the entry elements which contain the items and comments * * @param array $header Array of the header elements that always stay the same * @param object $xpath XPath object @@ -2365,31 +2355,10 @@ 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::escapeTags(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"] = Strings::base64UrlDecode($item["body"]); - $item['body'] = @HTML::toBBCode($item['body']); - } + $item["body"] = BBCode::limitBodySize($item["body"]); /// @todo We should check for a repeated post and if we know the repeated author. @@ -2402,6 +2371,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") { @@ -2419,6 +2393,10 @@ class DFRN $item["guid"] = XML::getFirstNodeValue($xpath, "dfrn:diaspora_guid/text()", $entry); + $item['uri-id'] = ItemURI::insert(['uri' => $item['uri'], 'guid' => $item['guid']]); + + Tag::storeFromBody($item['uri-id'], $item["body"]); + // We store the data from "dfrn:diaspora_signature" in a different table, this is done in "Item::insert" $dsprsig = XML::unescape(XML::getFirstNodeValue($xpath, "dfrn:diaspora_signature/text()", $entry)); if ($dsprsig != "") { @@ -2435,7 +2413,7 @@ class DFRN $item["object"] = self::transformActivity($xpath, $object, "object"); if (trim($item["object"]) != "") { - $r = XML::parseString($item["object"], false); + $r = XML::parseString($item["object"]); if (isset($r->type)) { $item["object-type"] = $r->type; } @@ -2472,6 +2450,8 @@ class DFRN } $item["tag"] .= $termhash . "[url=" . $termurl . "]" . $term . "[/url]"; + + Tag::store($item['uri-id'], Tag::IMPLICIT_MENTION, $term, $termurl); } } } @@ -2650,7 +2630,7 @@ class DFRN } /** - * @brief Deletes items + * Deletes items * * @param object $xpath XPath object * @param object $deletion deletion elements @@ -2707,11 +2687,11 @@ class DFRN Logger::log('deleting item '.$item['id'].' uri='.$uri, Logger::DEBUG); - Item::delete(['id' => $item['id']]); + Item::markForDeletion(['id' => $item['id']]); } /** - * @brief Imports a DFRN message + * Imports a DFRN message * * @param string $xml The DFRN message * @param array $importer Record of the importer user mixed with contact of the content @@ -2854,7 +2834,7 @@ class DFRN } /** - * @brief Returns the activity verb + * Returns the activity verb * * @param array $item Item array * @@ -2886,13 +2866,13 @@ class DFRN $community_page = ($user['page-flags'] == User::PAGE_FLAGS_COMMUNITY); $prvgroup = ($user['page-flags'] == User::PAGE_FLAGS_PRVGROUP); - $link = Strings::normaliseLink(System::baseUrl() . '/profile/' . $user['nickname']); + $link = Strings::normaliseLink(DI::baseUrl() . '/profile/' . $user['nickname']); /* * Diaspora uses their own hardwired link URL in @-tags * instead of the one we supply with webfinger */ - $dlink = Strings::normaliseLink(System::baseUrl() . '/u/' . $user['nickname']); + $dlink = Strings::normaliseLink(DI::baseUrl() . '/u/' . $user['nickname']); $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism', $item['body'], $matches, PREG_SET_ORDER); if ($cnt) {