X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FDFRN.php;h=4c88db1d944a47c0a70d69e7618566438fb652f9;hb=b6ab8c9e9455728a79fc1e4995651c845ded5dbf;hp=d557af0692fb761db121bb815a59f93bf024aa8b;hpb=f8c0f24e34e124ab782d5dcf3d2d658d70e19e5c;p=friendica.git diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index d557af0692..4c88db1d94 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -1,40 +1,51 @@ . * - * @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; 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\Core\Session; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\Contact; use Friendica\Model\Conversation; use Friendica\Model\Event; use Friendica\Model\GContact; use Friendica\Model\Item; use Friendica\Model\Mail; +use Friendica\Model\Notify\Type; use Friendica\Model\PermissionSet; use Friendica\Model\Profile; use Friendica\Model\User; use Friendica\Network\Probe; -use Friendica\Object\Image; use Friendica\Util\Crypto; use Friendica\Util\DateTimeFormat; +use Friendica\Util\Images; use Friendica\Util\Network; use Friendica\Util\Strings; use Friendica\Util\XML; @@ -42,7 +53,7 @@ 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 { @@ -52,7 +63,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. * @@ -93,7 +104,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. * @@ -132,7 +143,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. * @@ -148,7 +159,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); @@ -171,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` @@ -223,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); } } @@ -321,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 { @@ -342,7 +353,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. @@ -381,18 +392,18 @@ class DFRN $type = 'html'; if ($conversation) { - $root = $doc->createElementNS(NAMESPACE_ATOM1, 'feed'); + $root = $doc->createElementNS(ActivityNamespace::ATOM1, 'feed'); $doc->appendChild($root); - $root->setAttribute("xmlns:thr", NAMESPACE_THREAD); - $root->setAttribute("xmlns:at", NAMESPACE_TOMB); - $root->setAttribute("xmlns:media", NAMESPACE_MEDIA); - $root->setAttribute("xmlns:dfrn", NAMESPACE_DFRN); - $root->setAttribute("xmlns:activity", NAMESPACE_ACTIVITY); - $root->setAttribute("xmlns:georss", NAMESPACE_GEORSS); - $root->setAttribute("xmlns:poco", NAMESPACE_POCO); - $root->setAttribute("xmlns:ostatus", NAMESPACE_OSTATUS); - $root->setAttribute("xmlns:statusnet", NAMESPACE_STATUSNET); + $root->setAttribute("xmlns:thr", ActivityNamespace::THREAD); + $root->setAttribute("xmlns:at", ActivityNamespace::TOMB); + $root->setAttribute("xmlns:media", ActivityNamespace::MEDIA); + $root->setAttribute("xmlns:dfrn", ActivityNamespace::DFRN); + $root->setAttribute("xmlns:activity", ActivityNamespace::ACTIVITY); + $root->setAttribute("xmlns:georss", ActivityNamespace::GEORSS); + $root->setAttribute("xmlns:poco", ActivityNamespace::POCO); + $root->setAttribute("xmlns:ostatus", ActivityNamespace::OSTATUS); + $root->setAttribute("xmlns:statusnet", ActivityNamespace::STATUSNET); //$root = self::addHeader($doc, $owner, "dfrn:owner", "", false); @@ -411,7 +422,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 @@ -448,7 +459,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 @@ -478,7 +489,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 @@ -491,11 +502,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( @@ -504,10 +515,10 @@ class DFRN $uid ); $photos = []; - $ext = Image::supportedTypes(); + $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']]; } @@ -529,7 +540,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); @@ -537,7 +548,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 @@ -556,20 +567,20 @@ class DFRN $alternatelink = $owner['url']; } - $root = $doc->createElementNS(NAMESPACE_ATOM1, 'feed'); + $root = $doc->createElementNS(ActivityNamespace::ATOM1, 'feed'); $doc->appendChild($root); - $root->setAttribute("xmlns:thr", NAMESPACE_THREAD); - $root->setAttribute("xmlns:at", NAMESPACE_TOMB); - $root->setAttribute("xmlns:media", NAMESPACE_MEDIA); - $root->setAttribute("xmlns:dfrn", NAMESPACE_DFRN); - $root->setAttribute("xmlns:activity", NAMESPACE_ACTIVITY); - $root->setAttribute("xmlns:georss", NAMESPACE_GEORSS); - $root->setAttribute("xmlns:poco", NAMESPACE_POCO); - $root->setAttribute("xmlns:ostatus", NAMESPACE_OSTATUS); - $root->setAttribute("xmlns:statusnet", NAMESPACE_STATUSNET); - - XML::addElement($doc, $root, "id", System::baseUrl()."/profile/".$owner["nick"]); + $root->setAttribute("xmlns:thr", ActivityNamespace::THREAD); + $root->setAttribute("xmlns:at", ActivityNamespace::TOMB); + $root->setAttribute("xmlns:media", ActivityNamespace::MEDIA); + $root->setAttribute("xmlns:dfrn", ActivityNamespace::DFRN); + $root->setAttribute("xmlns:activity", ActivityNamespace::ACTIVITY); + $root->setAttribute("xmlns:georss", ActivityNamespace::GEORSS); + $root->setAttribute("xmlns:poco", ActivityNamespace::POCO); + $root->setAttribute("xmlns:ostatus", ActivityNamespace::OSTATUS); + $root->setAttribute("xmlns:statusnet", ActivityNamespace::STATUSNET); + + 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]; @@ -586,13 +597,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); } @@ -615,7 +626,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 @@ -628,38 +639,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; } @@ -668,7 +669,7 @@ class DFRN $attributes["rel"] = "avatar"; XML::addElement($doc, $author, "link", "", $attributes); - if ($hidewall) { + if ($hide) { XML::addElement($doc, $author, "dfrn:hide", "true"); } @@ -690,7 +691,7 @@ class DFRN `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", + WHERE NOT `user`.`hidewall` AND `user`.`uid` = %d", intval($owner['uid']) ); if (DBA::isResult($r)) { @@ -760,7 +761,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 @@ -805,7 +806,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 @@ -872,7 +873,7 @@ class DFRN } /** - * @brief Adds the elements for attachments + * Adds the elements for attachments * * @param object $doc XML document * @param object $root XML root @@ -908,7 +909,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" @@ -940,21 +941,21 @@ class DFRN if (!$single) { $entry = $doc->createElement("entry"); } else { - $entry = $doc->createElementNS(NAMESPACE_ATOM1, 'entry'); + $entry = $doc->createElementNS(ActivityNamespace::ATOM1, 'entry'); $doc->appendChild($entry); - $entry->setAttribute("xmlns:thr", NAMESPACE_THREAD); - $entry->setAttribute("xmlns:at", NAMESPACE_TOMB); - $entry->setAttribute("xmlns:media", NAMESPACE_MEDIA); - $entry->setAttribute("xmlns:dfrn", NAMESPACE_DFRN); - $entry->setAttribute("xmlns:activity", NAMESPACE_ACTIVITY); - $entry->setAttribute("xmlns:georss", NAMESPACE_GEORSS); - $entry->setAttribute("xmlns:poco", NAMESPACE_POCO); - $entry->setAttribute("xmlns:ostatus", NAMESPACE_OSTATUS); - $entry->setAttribute("xmlns:statusnet", NAMESPACE_STATUSNET); + $entry->setAttribute("xmlns:thr", ActivityNamespace::THREAD); + $entry->setAttribute("xmlns:at", ActivityNamespace::TOMB); + $entry->setAttribute("xmlns:media", ActivityNamespace::MEDIA); + $entry->setAttribute("xmlns:dfrn", ActivityNamespace::DFRN); + $entry->setAttribute("xmlns:activity", ActivityNamespace::ACTIVITY); + $entry->setAttribute("xmlns:georss", ActivityNamespace::GEORSS); + $entry->setAttribute("xmlns:poco", ActivityNamespace::POCO); + $entry->setAttribute("xmlns:ostatus", ActivityNamespace::OSTATUS); + $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']; @@ -990,7 +991,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)) { @@ -1031,7 +1032,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. @@ -1049,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']) { @@ -1078,9 +1081,9 @@ class DFRN if ($item['object-type'] != "") { XML::addElement($doc, $entry, "activity:object-type", $item['object-type']); } elseif ($item['id'] == $item['parent']) { - XML::addElement($doc, $entry, "activity:object-type", ACTIVITY_OBJ_NOTE); + XML::addElement($doc, $entry, "activity:object-type", Activity\ObjectType::NOTE); } else { - XML::addElement($doc, $entry, "activity:object-type", ACTIVITY_OBJ_COMMENT); + XML::addElement($doc, $entry, "activity:object-type", Activity\ObjectType::COMMENT); } $actobj = self::createActivity($doc, "activity:object", $item['object']); @@ -1123,7 +1126,7 @@ class DFRN "link", "", ["rel" => "mentioned", - "ostatus:object-type" => ACTIVITY_OBJ_GROUP, + "ostatus:object-type" => Activity\ObjectType::GROUP, "href" => $mention] ); } else { @@ -1133,7 +1136,7 @@ class DFRN "link", "", ["rel" => "mentioned", - "ostatus:object-type" => ACTIVITY_OBJ_PERSON, + "ostatus:object-type" => Activity\ObjectType::PERSON, "href" => $mention] ); } @@ -1145,7 +1148,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 @@ -1158,7 +1161,7 @@ class DFRN } /** - * @brief decrypts data via AES + * decrypts data via AES * * @param string $encrypted The encrypted data * @param string $key The AES key @@ -1171,7 +1174,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 @@ -1194,12 +1197,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: @@ -1407,7 +1410,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 @@ -1497,7 +1500,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 @@ -1731,7 +1734,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 @@ -1749,7 +1752,7 @@ class DFRN $obj_doc = new DOMDocument("1.0", "utf-8"); $obj_doc->formatOutput = true; - $obj_element = $obj_doc->createElementNS(NAMESPACE_ATOM1, $element); + $obj_element = $obj_doc->createElementNS( ActivityNamespace::ATOM1, $element); $activity_type = $xpath->query("activity:object-type/text()", $activity)->item(0)->nodeValue; XML::addElement($obj_doc, $obj_element, "type", $activity_type); @@ -1786,7 +1789,7 @@ class DFRN } /** - * @brief Processes the mail elements + * Processes the mail elements * * @param object $xpath XPath object * @param object $mail mail elements @@ -1815,7 +1818,7 @@ class DFRN } /** - * @brief Processes the suggestion elements + * Processes the suggestion elements * * @param object $xpath XPath object * @param object $suggestion suggestion elements @@ -1895,18 +1898,18 @@ 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'], - 'verb' => ACTIVITY_REQ_FRIEND, + 'verb' => Activity::REQ_FRIEND, 'otype' => 'intro'] ); @@ -1914,7 +1917,7 @@ class DFRN } /** - * @brief Processes the relocation elements + * Processes the relocation elements * * @param object $xpath XPath object * @param object $relocation relocation elements @@ -1999,7 +2002,7 @@ class DFRN } /** - * @brief Updates an item + * Updates an item * * @param array $current the current item record * @param array $item the new item record @@ -2032,7 +2035,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 @@ -2100,7 +2103,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 @@ -2116,7 +2119,7 @@ class DFRN } $xo = XML::parseString($item["object"], false); - if (($xo->type == ACTIVITY_OBJ_PERSON) && ($xo->id)) { + if (($xo->type == Activity\ObjectType::PERSON) && ($xo->id)) { // somebody was poked/prodded. Was it me? $Blink = ''; foreach ($xo->link as $l) { @@ -2130,7 +2133,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"]]); @@ -2139,14 +2142,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"], @@ -2160,7 +2163,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 @@ -2180,34 +2183,36 @@ class DFRN // The functions below are partly used by ostatus.php as well - where we have this variable $contact = Contact::selectFirst([], ['id' => $importer['id']]); + $activity = DI::activity(); + // Big question: Do we need these functions? They were part of the "consume_feed" function. // This function once was responsible for DFRN and OStatus. - if (activity_match($item["verb"], ACTIVITY_FOLLOW)) { + if ($activity->match($item["verb"], Activity::FOLLOW)) { Logger::log("New follower"); Contact::addRelationship($importer, $contact, $item); return false; } - if (activity_match($item["verb"], ACTIVITY_UNFOLLOW)) { + if ($activity->match($item["verb"], Activity::UNFOLLOW)) { Logger::log("Lost follower"); Contact::removeFollower($importer, $contact, $item); return false; } - if (activity_match($item["verb"], ACTIVITY_REQ_FRIEND)) { + if ($activity->match($item["verb"], Activity::REQ_FRIEND)) { Logger::log("New friend request"); Contact::addRelationship($importer, $contact, $item, true); return false; } - if (activity_match($item["verb"], ACTIVITY_UNFRIEND)) { + if ($activity->match($item["verb"], Activity::UNFRIEND)) { Logger::log("Lost sharer"); Contact::removeSharer($importer, $contact, $item); return false; } } else { - if (($item["verb"] == ACTIVITY_LIKE) - || ($item["verb"] == ACTIVITY_DISLIKE) - || ($item["verb"] == ACTIVITY_ATTEND) - || ($item["verb"] == ACTIVITY_ATTENDNO) - || ($item["verb"] == ACTIVITY_ATTENDMAYBE) + if (($item["verb"] == Activity::LIKE) + || ($item["verb"] == Activity::DISLIKE) + || ($item["verb"] == Activity::ATTEND) + || ($item["verb"] == Activity::ATTENDNO) + || ($item["verb"] == Activity::ATTENDMAYBE) ) { $is_like = true; $item["gravity"] = GRAVITY_ACTIVITY; @@ -2234,11 +2239,11 @@ class DFRN $is_like = false; } - if (($item["verb"] == ACTIVITY_TAG) && ($item["object-type"] == ACTIVITY_OBJ_TAGTERM)) { + if (($item["verb"] == Activity::TAG) && ($item["object-type"] == Activity\ObjectType::TAGTERM)) { $xo = XML::parseString($item["object"], false); $xt = XML::parseString($item["target"], false); - if ($xt->type == ACTIVITY_OBJ_NOTE) { + if ($xt->type == Activity\ObjectType::NOTE) { $item_tag = Item::selectFirst(['id', 'tag'], ['uri' => $xt->id, 'uid' => $importer["importer_uid"]]); if (!DBA::isResult($item_tag)) { @@ -2260,7 +2265,7 @@ class DFRN } /** - * @brief Processes the link elements + * Processes the link elements * * @param object $links link elements * @param array $item the item record @@ -2304,7 +2309,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,13 +2370,13 @@ 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"] = 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 = \get_app()->getBaseURL(); + $base_url = DI::baseUrl()->get(); $item['body'] = HTML::relToAbs($item['body'], $base_url); $item['body'] = HTML::toBBCodeVideo($item['body']); @@ -2401,6 +2406,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") { @@ -2513,7 +2523,7 @@ class DFRN // Now assign the rest of the values that depend on the type of the message if (in_array($entrytype, [DFRN::REPLY, DFRN::REPLY_RC])) { if (!isset($item["object-type"])) { - $item["object-type"] = ACTIVITY_OBJ_COMMENT; + $item["object-type"] = Activity\ObjectType::COMMENT; } if ($item["contact-id"] != $owner["contact-id"]) { @@ -2533,15 +2543,18 @@ class DFRN } } + // Ensure to have the correct share data + $item = Item::addShareDataFromOriginal($item); + if ($entrytype == DFRN::REPLY_RC) { $item["wall"] = 1; } elseif ($entrytype == DFRN::TOP_LEVEL) { if (!isset($item["object-type"])) { - $item["object-type"] = ACTIVITY_OBJ_NOTE; + $item["object-type"] = Activity\ObjectType::NOTE; } // Is it an event? - if (($item["object-type"] == ACTIVITY_OBJ_EVENT) && !$owner_unknown) { + if (($item["object-type"] == Activity\ObjectType::EVENT) && !$owner_unknown) { Logger::log("Item ".$item["uri"]." seems to contain an event.", Logger::DEBUG); $ev = Event::fromBBCode($item["body"]); if ((!empty($ev['desc']) || !empty($ev['summary'])) && !empty($ev['start'])) { @@ -2638,7 +2651,7 @@ class DFRN Item::distribute($posted_id); } - if (stristr($item["verb"], ACTIVITY_POKE)) { + if (stristr($item["verb"], Activity::POKE)) { $item['id'] = $posted_id; self::doPoke($item, $importer); } @@ -2646,7 +2659,7 @@ class DFRN } /** - * @brief Deletes items + * Deletes items * * @param object $xpath XPath object * @param object $deletion deletion elements @@ -2707,7 +2720,7 @@ class DFRN } /** - * @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 @@ -2727,16 +2740,16 @@ class DFRN @$doc->loadXML($xml); $xpath = new DOMXPath($doc); - $xpath->registerNamespace("atom", NAMESPACE_ATOM1); - $xpath->registerNamespace("thr", NAMESPACE_THREAD); - $xpath->registerNamespace("at", NAMESPACE_TOMB); - $xpath->registerNamespace("media", NAMESPACE_MEDIA); - $xpath->registerNamespace("dfrn", NAMESPACE_DFRN); - $xpath->registerNamespace("activity", NAMESPACE_ACTIVITY); - $xpath->registerNamespace("georss", NAMESPACE_GEORSS); - $xpath->registerNamespace("poco", NAMESPACE_POCO); - $xpath->registerNamespace("ostatus", NAMESPACE_OSTATUS); - $xpath->registerNamespace("statusnet", NAMESPACE_STATUSNET); + $xpath->registerNamespace("atom", ActivityNamespace::ATOM1); + $xpath->registerNamespace("thr", ActivityNamespace::THREAD); + $xpath->registerNamespace("at", ActivityNamespace::TOMB); + $xpath->registerNamespace("media", ActivityNamespace::MEDIA); + $xpath->registerNamespace("dfrn", ActivityNamespace::DFRN); + $xpath->registerNamespace("activity", ActivityNamespace::ACTIVITY); + $xpath->registerNamespace("georss", ActivityNamespace::GEORSS); + $xpath->registerNamespace("poco", ActivityNamespace::POCO); + $xpath->registerNamespace("ostatus", ActivityNamespace::OSTATUS); + $xpath->registerNamespace("statusnet", ActivityNamespace::STATUSNET); $header = []; $header["uid"] = $importer["importer_uid"]; @@ -2850,7 +2863,7 @@ class DFRN } /** - * @brief Returns the activity verb + * Returns the activity verb * * @param array $item Item array * @@ -2861,7 +2874,7 @@ class DFRN if ($item['verb']) { return $item['verb']; } - return ACTIVITY_POST; + return Activity::POST; } private static function tgroupCheck($uid, $item) @@ -2882,13 +2895,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) {