X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FDFRN.php;h=0fb7394579f7513d4667d600f5b598aef9306f75;hb=4e45987f74ccbe61a53c711317c2e45894435ece;hp=d20864cf7f8515e55555adf83e8f10445d0e9b72;hpb=bdb73ff326af79e27d02f59f21b5eac103078130;p=friendica.git diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index d20864cf7f..0fb7394579 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -1,6 +1,6 @@ argc > 2) { - for ($x = 2; $x < $a->argc; $x++) { - if ($a->argv[$x] == 'converse') { - $converse = true; - } - if ($a->argv[$x] == 'starred') { - $starred = true; - } - if ($a->argv[$x] == 'category' && $a->argc > ($x + 1) && strlen($a->argv[$x+1])) { - $category = $a->argv[$x+1]; - } - } - } - - // default permissions - anonymous user - - $sql_extra = sprintf(" AND `item`.`private` != %s ", Item::PRIVATE); - - $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_id = $owner['uid']; - - $sql_post_table = ""; - - if (! $public_feed) { - switch ($direction) { - case (-1): - $sql_extra = sprintf(" AND `issued-id` = '%s' ", DBA::escape($dfrn_id)); - break; - case 0: - $sql_extra = sprintf(" AND `issued-id` = '%s' AND `duplex` = 1 ", DBA::escape($dfrn_id)); - break; - case 1: - $sql_extra = sprintf(" AND `dfrn-id` = '%s' AND `duplex` = 1 ", DBA::escape($dfrn_id)); - break; - default: - return false; - break; // NOTREACHED - } - - $r = q( - "SELECT * FROM `contact` WHERE NOT `blocked` AND `contact`.`uid` = %d $sql_extra LIMIT 1", - intval($owner_id) - ); - - if (! DBA::isResult($r)) { - Logger::log(sprintf('No contact found for uid=%d', $owner_id), Logger::WARNING); - exit(); - } - - $contact = $r[0]; - - $set = PermissionSet::get($owner_id, $contact['id']); - - if (!empty($set)) { - $sql_extra = " AND `item`.`psid` IN (" . implode(',', $set) .")"; - } else { - $sql_extra = sprintf(" AND `item`.`private` != %s", Item::PRIVATE); - } - } - - if ($public_feed) { - $sort = 'DESC'; - } else { - $sort = 'ASC'; - } - - if (! strlen($last_update)) { - $last_update = 'now -30 days'; - } - - if (isset($category)) { - $sql_post_table = sprintf("INNER JOIN (SELECT `uri-id` FROM `category-view` WHERE `name` = '%s' AND `type` = %d AND `uid` = %d ORDER BY `uri-id` DESC) AS `category` ON `item`.`uri-id` = `category`.`uri-id` ", - DBA::escape(Strings::protectSprintf($category)), intval(Category::CATEGORY), intval($owner_id)); - } - - if ($public_feed && ! $converse) { - $sql_extra .= " AND `contact`.`self` = 1 "; - } - - $check_date = DateTimeFormat::utc($last_update); - - $r = q( - "SELECT `item`.`id` - FROM `item` USE INDEX (`uid_wall_changed`) $sql_post_table - STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` - WHERE `item`.`uid` = %d AND `item`.`wall` AND `item`.`changed` > '%s' - AND `vid` != %d AND `item`.`visible` $sql_extra - ORDER BY `item`.`parent` ".$sort.", `item`.`received` ASC LIMIT 0, 300", - intval($owner_id), - DBA::escape($check_date), - Verb::getID(Activity::ANNOUNCE), - DBA::escape($sort) - ); - - $ids = []; - foreach ($r as $item) { - $ids[] = $item['id']; - } - - if (!empty($ids)) { - $ret = Item::select(Item::DELIVER_FIELDLIST, ['id' => $ids]); - $items = Item::inArray($ret); - } else { - $items = []; - } - - /* - * Will check further below if this actually returned results. - * We will provide an empty feed if that is the case. - */ - - $doc = new DOMDocument('1.0', 'utf-8'); - $doc->formatOutput = true; - - $alternatelink = $owner['url']; - - if (isset($category)) { - $alternatelink .= "/category/".$category; - } - - if ($public_feed) { - $author = "dfrn:owner"; - } else { - $author = "author"; - } - - $root = self::addHeader($doc, $owner, $author, $alternatelink, true); - - /// @TODO This hook can't work anymore - // \Friendica\Core\Hook::callAll('atom_feed', $atom); - - if (!DBA::isResult($items) || $onlyheader) { - $atom = trim($doc->saveXML()); - - Hook::callAll('atom_feed_end', $atom); - - return $atom; - } - - foreach ($items as $item) { - // prevent private email from leaking. - if ($item['network'] == Protocol::MAIL) { - continue; - } - - // public feeds get html, our own nodes use bbcode - - if ($public_feed) { - $type = 'html'; - // catch any email that's in a public conversation and make sure it doesn't leak - if ($item['private'] == Item::PRIVATE) { - continue; - } - } else { - $type = 'text'; - } - - $entry = self::entry($doc, $type, $item, $owner, true); - if (isset($entry)) { - $root->appendChild($entry); - } - } - - $atom = trim($doc->saveXML()); - - Hook::callAll('atom_feed_end', $atom); - - return $atom; - } - - /** - * Generate an atom entry for a given item id - * - * @param int $item_id The item id + * @param int $uri_id The uri id + * @param int $uid The user id * @param boolean $conversation Show the conversation. If false show the single post. * * @return string DFRN feed entry * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ - public static function itemFeed($item_id, $conversation = false) + public static function itemFeed(int $uri_id, int $uid, bool $conversation = false) { if ($conversation) { - $condition = ['parent' => $item_id]; + $condition = ['parent-uri-id' => $uri_id]; } else { - $condition = ['id' => $item_id]; + $condition = ['uri-id' => $uri_id]; } - $ret = Item::select(Item::DELIVER_FIELDLIST, $condition); - $items = Item::inArray($ret); + $condition['uid'] = $uid; + + $items = Post::selectToArray(Item::DELIVER_FIELDLIST, $condition); if (!DBA::isResult($items)) { return ''; } @@ -413,36 +215,36 @@ class DFRN /** * Create XML text for DFRN mails * - * @param array $item message elements + * @param array $mail Mail record * @param array $owner Owner record * * @return string DFRN mail * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @todo Find proper type-hints */ - public static function mail($item, $owner) + public static function mail(array $mail, array $owner) { $doc = new DOMDocument('1.0', 'utf-8'); $doc->formatOutput = true; $root = self::addHeader($doc, $owner, "dfrn:owner", "", false); - $mail = $doc->createElement("dfrn:mail"); - $sender = $doc->createElement("dfrn:sender"); + $mailElement = $doc->createElement("dfrn:mail"); + $senderElement = $doc->createElement("dfrn:sender"); - XML::addElement($doc, $sender, "dfrn:name", $owner['name']); - XML::addElement($doc, $sender, "dfrn:uri", $owner['url']); - XML::addElement($doc, $sender, "dfrn:avatar", $owner['thumb']); + XML::addElement($doc, $senderElement, "dfrn:name", $owner['name']); + XML::addElement($doc, $senderElement, "dfrn:uri", $owner['url']); + XML::addElement($doc, $senderElement, "dfrn:avatar", $owner['thumb']); - $mail->appendChild($sender); + $mailElement->appendChild($senderElement); - XML::addElement($doc, $mail, "dfrn:id", $item['uri']); - XML::addElement($doc, $mail, "dfrn:in-reply-to", $item['parent-uri']); - XML::addElement($doc, $mail, "dfrn:sentdate", DateTimeFormat::utc($item['created'] . '+00:00', DateTimeFormat::ATOM)); - XML::addElement($doc, $mail, "dfrn:subject", $item['title']); - XML::addElement($doc, $mail, "dfrn:content", $item['body']); + XML::addElement($doc, $mailElement, "dfrn:id", $mail['uri']); + XML::addElement($doc, $mailElement, "dfrn:in-reply-to", $mail['parent-uri']); + XML::addElement($doc, $mailElement, "dfrn:sentdate", DateTimeFormat::utc($mail['created'] . '+00:00', DateTimeFormat::ATOM)); + XML::addElement($doc, $mailElement, "dfrn:subject", $mail['title']); + XML::addElement($doc, $mailElement, "dfrn:content", $mail['body']); - $root->appendChild($mail); + $root->appendChild($mailElement); return trim($doc->saveXML()); } @@ -498,15 +300,12 @@ class DFRN DI::config()->set('system', 'site_pubkey', $res['pubkey']); } - $rp = q( - "SELECT `resource-id` , `scale`, type FROM `photo` - WHERE `profile` = 1 AND `uid` = %d ORDER BY scale;", - $uid - ); + $profilephotos = Photo::selectToArray(['resource-id' , 'scale'], ['profile' => true, 'uid' => $uid], ['order' => ['scale']]); + $photos = []; $ext = Images::supportedTypes(); - foreach ($rp as $p) { + foreach ($profilephotos as $p) { $photos[$p['scale']] = DI::baseUrl().'/photo/'.$p['resource-id'].'-'.$p['scale'].'.'.$ext[$p['type']]; } @@ -614,6 +413,48 @@ class DFRN return $root; } + /** + * Determine the next birthday, but only if the birthday is published + * in the default profile. We _could_ also look for a private profile that the + * recipient can see, but somebody could get mad at us if they start getting + * public birthday greetings when they haven't made this info public. + * + * Assuming we are able to publish this info, we are then going to convert + * the start time from the owner's timezone to UTC. + * + * This will potentially solve the problem found with some social networks + * where birthdays are converted to the viewer's timezone and salutations from + * elsewhere in the world show up on the wrong day. We will convert it to the + * viewer's timezone also, but first we are going to convert it from the birthday + * person's timezone to GMT - so the viewer may find the birthday starting at + * 6:00PM the day before, but that will correspond to midnight to the birthday person. + */ + private static function determineNextBirthday($uid, $tz) + { + $birthday = ''; + + if (!strlen($tz)) { + $tz = 'UTC'; + } + + $profile = DBA::selectFirst('profile', ['dob'], ['uid' => $uid]); + if (DBA::isResult($profile)) { + $tmp_dob = substr($profile['dob'], 5); + if (intval($tmp_dob)) { + $y = DateTimeFormat::timezoneNow($tz, 'Y'); + $bd = $y . '-' . $tmp_dob . ' 00:00'; + $t_dob = strtotime($bd); + $now = strtotime(DateTimeFormat::timezoneNow($tz)); + if ($t_dob < $now) { + $bd = $y + 1 . '-' . $tmp_dob . ' 00:00'; + } + $birthday = DateTimeFormat::convert($bd, 'UTC', $tz, DateTimeFormat::ATOM); + } + } + + return $birthday; + } + /** * Adds the author element in the header for the DFRN protocol * @@ -647,7 +488,8 @@ class DFRN XML::addElement($doc, $author, "dfrn:handle", $owner["addr"], $attributes); $attributes = ["rel" => "photo", "type" => "image/jpeg", - "media:width" => 300, "media:height" => 300, "href" => $owner['photo']]; + "media:width" => Proxy::PIXEL_SMALL, "media:height" => Proxy::PIXEL_SMALL, + "href" => User::getAvatarUrl($owner, Proxy::SIZE_SMALL)]; if (!$public || !$hide) { $attributes["dfrn:updated"] = $picdate; @@ -667,7 +509,7 @@ class DFRN return $author; } - $birthday = feed_birthday($owner['uid'], $owner['timezone']); + $birthday = self::determineNextBirthday($owner['uid'], $owner['timezone']); if ($birthday) { XML::addElement($doc, $author, "dfrn:birthday", $birthday); @@ -688,10 +530,7 @@ class DFRN XML::addElement($doc, $author, "poco:note", $profile["about"]); XML::addElement($doc, $author, "poco:preferredUsername", $profile["nickname"]); - $savetz = date_default_timezone_get(); - date_default_timezone_set($profile["timezone"]); - XML::addElement($doc, $author, "poco:utcOffset", date("P")); - date_default_timezone_set($savetz); + XML::addElement($doc, $author, "poco:utcOffset", DateTimeFormat::timezoneNow($profile["timezone"], "P")); if (trim($profile["homepage"]) != "") { $urls = $doc->createElement("poco:urls"); @@ -792,12 +631,13 @@ class DFRN * @param DOMDocument $doc XML document * @param string $element Element name for the activity * @param string $activity activity value + * @param int $uriid Uri-Id of the post * * @return \DOMElement XML activity object * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @todo Find proper type-hints */ - private static function createActivity(DOMDocument $doc, $element, $activity) + private static function createActivity(DOMDocument $doc, $element, $activity, $uriid) { if ($activity) { $entry = $doc->createElement($element); @@ -844,7 +684,7 @@ class DFRN } } if ($r->content) { - XML::addElement($doc, $entry, "content", BBCode::convert($r->content), ["type" => "html"]); + XML::addElement($doc, $entry, "content", BBCode::convertForUriId($uriid, $r->content, BBCode::EXTERNAL), ["type" => "html"]); } return $entry; @@ -865,27 +705,19 @@ class DFRN */ private static function getAttachment($doc, $root, $item) { - $arr = explode('[/attach],', $item['attach']); - if (count($arr)) { - foreach ($arr as $r) { - $matches = false; - $cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|', $r, $matches); - if ($cnt) { - $attributes = ["rel" => "enclosure", - "href" => $matches[1], - "type" => $matches[3]]; - - if (intval($matches[2])) { - $attributes["length"] = intval($matches[2]); - } - - if (trim($matches[4]) != "") { - $attributes["title"] = trim($matches[4]); - } + foreach (Post\Media::getByURIId($item['uri-id'], [Post\Media::DOCUMENT, Post\Media::TORRENT, Post\Media::UNKNOWN]) as $attachment) { + $attributes = ['rel' => 'enclosure', + 'href' => $attachment['url'], + 'type' => $attachment['mimetype']]; - XML::addElement($doc, $root, "link", "", $attributes); - } + if (!empty($attachment['size'])) { + $attributes['length'] = intval($attachment['size']); + } + if (!empty($attachment['description'])) { + $attributes['title'] = $attachment['description']; } + + XML::addElement($doc, $root, 'link', '', $attributes); } } @@ -936,10 +768,10 @@ class DFRN $entry->setAttribute("xmlns:statusnet", ActivityNamespace::STATUSNET); } + $body = Post\Media::addAttachmentsToBody($item['uri-id'], $item['body'] ?? ''); + if ($item['private'] == Item::PRIVATE) { - $body = Item::fixPrivatePhotos($item['body'], $owner['uid'], $item, $cid); - } else { - $body = $item['body']; + $body = Item::fixPrivatePhotos($body, $owner['uid'], $item, $cid); } // Remove the abstract element. It is only locally important. @@ -953,7 +785,7 @@ class DFRN $htmlbody = "[b]" . $item['title'] . "[/b]\n\n" . $htmlbody; } - $htmlbody = BBCode::convert($htmlbody, false, BBCode::OSTATUS); + $htmlbody = BBCode::convertForUriId($item['uri-id'], $htmlbody, BBCode::ACTIVITYPUB); } $author = self::addEntryAuthor($doc, "author", $item["author-link"], $item); @@ -963,10 +795,9 @@ class DFRN $entry->appendChild($dfrnowner); if ($item['gravity'] != GRAVITY_PARENT) { - $parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']); - $parent = Item::selectFirst(['guid', 'plink'], ['uri' => $parent_item, 'uid' => $item['uid']]); + $parent = Post::selectFirst(['guid', 'plink'], ['uri' => $item['thr-parent'], 'uid' => $item['uid']]); if (DBA::isResult($parent)) { - $attributes = ["ref" => $parent_item, "type" => "text/html", + $attributes = ["ref" => $item['thr-parent'], "type" => "text/html", "href" => $parent['plink'], "dfrn:diaspora_guid" => $parent['guid']]; XML::addElement($doc, $entry, "thr:in-reply-to", "", $attributes); @@ -978,7 +809,7 @@ class DFRN $conversation_uri = $conversation_href; if (isset($parent_item)) { - $conversation = DBA::selectFirst('conversation', ['conversation-uri', 'conversation-href'], ['item-uri' => $item['parent-uri']]); + $conversation = DBA::selectFirst('conversation', ['conversation-uri', 'conversation-href'], ['item-uri' => $item['thr-parent']]); if (DBA::isResult($conversation)) { if ($conversation['conversation-uri'] != '') { $conversation_uri = $conversation['conversation-uri']; @@ -1069,12 +900,12 @@ class DFRN XML::addElement($doc, $entry, "activity:object-type", Activity\ObjectType::COMMENT); } - $actobj = self::createActivity($doc, "activity:object", $item['object']); + $actobj = self::createActivity($doc, "activity:object", $item['object'], $item['uri-id']); if ($actobj) { $entry->appendChild($actobj); } - $actarg = self::createActivity($doc, "activity:target", $item['target']); + $actarg = self::createActivity($doc, "activity:target", $item['target'], $item['uri-id']); if ($actarg) { $entry->appendChild($actarg); } @@ -1094,9 +925,9 @@ class DFRN foreach ($mentioned as $mention) { $condition = ['uid' => $owner["uid"], 'nurl' => Strings::normaliseLink($mention)]; - $contact = DBA::selectFirst('contact', ['forum', 'prv'], $condition); + $contact = DBA::selectFirst('contact', ['contact-type'], $condition); - if (DBA::isResult($contact) && ($contact["forum"] || $contact["prv"])) { + if (DBA::isResult($contact) && ($contact['contact-type'] == Contact::TYPE_COMMUNITY)) { XML::addElement( $doc, $entry, @@ -1124,268 +955,6 @@ class DFRN return $entry; } - /** - * encrypts data via AES - * - * @param string $data The data that is to be encrypted - * @param string $key The AES key - * - * @return string encrypted data - */ - private static function aesEncrypt($data, $key) - { - return openssl_encrypt($data, 'aes-128-ecb', $key, OPENSSL_RAW_DATA); - } - - /** - * decrypts data via AES - * - * @param string $encrypted The encrypted data - * @param string $key The AES key - * - * @return string decrypted data - */ - public static function aesDecrypt($encrypted, $key) - { - return openssl_decrypt($encrypted, 'aes-128-ecb', $key, OPENSSL_RAW_DATA); - } - - /** - * Delivers the atom content to the contacts - * - * @param array $owner Owner record - * @param array $contact Contact record of the receiver - * @param string $atom Content that will be transmitted - * @param bool $dissolve (to be documented) - * - * @return int Deliver status. Negative values mean an error. - * @throws \Friendica\Network\HTTPException\InternalServerErrorException - * @throws \ImagickException - * @todo Add array type-hint for $owner, $contact - */ - public static function deliver($owner, $contact, $atom, $dissolve = false) - { - $idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']); - - if ($contact['duplex'] && $contact['dfrn-id']) { - $idtosend = '0:' . $orig_id; - } - if ($contact['duplex'] && $contact['issued-id']) { - $idtosend = '1:' . $orig_id; - } - - $rino = DI::config()->get('system', 'rino_encrypt'); - $rino = intval($rino); - - Logger::log("Local rino version: ". $rino, Logger::DEBUG); - - $ssl_val = intval(DI::config()->get('system', 'ssl_policy')); - - switch ($ssl_val) { - case BaseURL::SSL_POLICY_FULL: - $ssl_policy = 'full'; - break; - case BaseURL::SSL_POLICY_SELFSIGN: - $ssl_policy = 'self'; - break; - case BaseURL::SSL_POLICY_NONE: - default: - $ssl_policy = 'none'; - break; - } - - $url = $contact['notify'] . '&dfrn_id=' . $idtosend . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . (($rino) ? '&rino='.$rino : ''); - - Logger::log('dfrn_deliver: ' . $url); - - $curlResult = DI::httpRequest()->get($url); - - if ($curlResult->isTimeout()) { - return -2; // timed out - } - - $xml = $curlResult->getBody(); - - $curl_stat = $curlResult->getReturnCode(); - if (empty($curl_stat)) { - return -3; // timed out - } - - Logger::log('dfrn_deliver: ' . $xml, Logger::DATA); - - if (empty($xml)) { - return 3; - } - - if (strpos($xml, 'status) != 0) || !strlen($res->challenge) || !strlen($res->dfrn_id)) { - if (empty($res->status)) { - $status = 3; - } else { - $status = $res->status; - } - - return $status; - } - - $postvars = []; - $sent_dfrn_id = hex2bin((string) $res->dfrn_id); - $challenge = hex2bin((string) $res->challenge); - $perm = (($res->perm) ? $res->perm : null); - $dfrn_version = floatval($res->dfrn_version ?: 2.0); - $rino_remote_version = intval($res->rino); - $page = (($owner['page-flags'] == User::PAGE_FLAGS_COMMUNITY) ? 1 : 0); - - Logger::log("Remote rino version: ".$rino_remote_version." for ".$contact["url"], Logger::DEBUG); - - if ($owner['page-flags'] == User::PAGE_FLAGS_PRVGROUP) { - $page = 2; - } - - $final_dfrn_id = ''; - - if ($perm) { - if ((($perm == 'rw') && !intval($contact['writable'])) - || (($perm == 'r') && intval($contact['writable'])) - ) { - DBA::update('contact', ['writable' => ($perm == 'rw')], ['id' => $contact['id']]); - - $contact['writable'] = (string) 1 - intval($contact['writable']); - } - } - - if (($contact['duplex'] && strlen($contact['pubkey'])) - || ($owner['page-flags'] == User::PAGE_FLAGS_COMMUNITY && strlen($contact['pubkey'])) - || ($contact['rel'] == Contact::SHARING && strlen($contact['pubkey'])) - ) { - openssl_public_decrypt($sent_dfrn_id, $final_dfrn_id, $contact['pubkey']); - openssl_public_decrypt($challenge, $postvars['challenge'], $contact['pubkey']); - } else { - openssl_private_decrypt($sent_dfrn_id, $final_dfrn_id, $contact['prvkey']); - openssl_private_decrypt($challenge, $postvars['challenge'], $contact['prvkey']); - } - - $final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.')); - - if (strpos($final_dfrn_id, ':') == 1) { - $final_dfrn_id = substr($final_dfrn_id, 2); - } - - if ($final_dfrn_id != $orig_id) { - Logger::log('dfrn_deliver: wrong dfrn_id.'); - // did not decode properly - cannot trust this site - return 3; - } - - $postvars['dfrn_id'] = $idtosend; - $postvars['dfrn_version'] = DFRN_PROTOCOL_VERSION; - if ($dissolve) { - $postvars['dissolve'] = '1'; - } - - if ((($contact['rel']) && ($contact['rel'] != Contact::SHARING) && (! $contact['blocked'])) || ($owner['page-flags'] == User::PAGE_FLAGS_COMMUNITY)) { - $postvars['data'] = $atom; - $postvars['perm'] = 'rw'; - } else { - $postvars['data'] = str_replace('1', '0', $atom); - $postvars['perm'] = 'r'; - } - - $postvars['ssl_policy'] = $ssl_policy; - - if ($page) { - $postvars['page'] = $page; - } - - - if ($rino > 0 && $rino_remote_version > 0 && (! $dissolve)) { - Logger::log('rino version: '. $rino_remote_version); - - switch ($rino_remote_version) { - case 1: - $key = openssl_random_pseudo_bytes(16); - $data = self::aesEncrypt($postvars['data'], $key); - break; - - default: - Logger::log("rino: invalid requested version '$rino_remote_version'"); - return -8; - } - - $postvars['rino'] = $rino_remote_version; - $postvars['data'] = bin2hex($data); - - if ($dfrn_version >= 2.1) { - if (($contact['duplex'] && strlen($contact['pubkey'])) - || ($owner['page-flags'] == User::PAGE_FLAGS_COMMUNITY && strlen($contact['pubkey'])) - || ($contact['rel'] == Contact::SHARING && strlen($contact['pubkey'])) - ) { - openssl_public_encrypt($key, $postvars['key'], $contact['pubkey']); - } else { - openssl_private_encrypt($key, $postvars['key'], $contact['prvkey']); - } - } else { - if (($contact['duplex'] && strlen($contact['prvkey'])) || ($owner['page-flags'] == User::PAGE_FLAGS_COMMUNITY)) { - openssl_private_encrypt($key, $postvars['key'], $contact['prvkey']); - } else { - openssl_public_encrypt($key, $postvars['key'], $contact['pubkey']); - } - } - - Logger::log('md5 rawkey ' . md5($postvars['key'])); - - $postvars['key'] = bin2hex($postvars['key']); - } - - - Logger::debug('dfrn_deliver', ['post' => $postvars]); - - $postResult = DI::httpRequest()->post($contact['notify'], $postvars); - - $xml = $postResult->getBody(); - - Logger::log('dfrn_deliver: ' . "RECEIVED: " . $xml, Logger::DATA); - - $curl_stat = $postResult->getReturnCode(); - if (empty($curl_stat) || empty($xml)) { - return -9; // timed out - } - - if (($curl_stat == 503) && stristr($postResult->getHeader(), 'retry-after')) { - return -10; - } - - if (strpos($xml, 'status)) { - return -11; - } - - // Possibly old servers had returned an empty value when everything was okay - if (empty($res->status)) { - $res->status = 200; - } - - if (!empty($res->message)) { - Logger::log('Delivery returned status '.$res->status.' - '.$res->message, Logger::DEBUG); - } - - return intval($res->status); - } - /** * Transmits atom content to the contacts via the Diaspora transport layer * @@ -1402,21 +971,21 @@ class DFRN { if (!$public_batch) { if (empty($contact['addr'])) { - Logger::log('Empty contact handle for ' . $contact['id'] . ' - ' . $contact['url'] . ' - trying to update it.'); + Logger::notice('Empty contact handle for ' . $contact['id'] . ' - ' . $contact['url'] . ' - trying to update it.'); if (Contact::updateFromProbe($contact['id'])) { $new_contact = DBA::selectFirst('contact', ['addr'], ['id' => $contact['id']]); $contact['addr'] = $new_contact['addr']; } if (empty($contact['addr'])) { - Logger::log('Unable to find contact handle for ' . $contact['id'] . ' - ' . $contact['url']); + Logger::notice('Unable to find contact handle for ' . $contact['id'] . ' - ' . $contact['url']); return -21; } } $fcontact = FContact::getByURL($contact['addr']); if (empty($fcontact)) { - Logger::log('Unable to find contact details for ' . $contact['id'] . ' - ' . $contact['addr']); + Logger::notice('Unable to find contact details for ' . $contact['id'] . ' - ' . $contact['addr']); return -22; } $pubkey = $fcontact['pubkey']; @@ -1444,22 +1013,22 @@ class DFRN $content_type = ($public_batch ? "application/magic-envelope+xml" : "application/json"); - $postResult = DI::httpRequest()->post($dest_url, $envelope, ["Content-Type: " . $content_type]); + $postResult = DI::httpClient()->post($dest_url, $envelope, ['Content-Type' => $content_type]); $xml = $postResult->getBody(); $curl_stat = $postResult->getReturnCode(); if (empty($curl_stat) || empty($xml)) { - Logger::log('Empty answer from ' . $contact['id'] . ' - ' . $dest_url); + Logger::notice('Empty answer from ' . $contact['id'] . ' - ' . $dest_url); return -9; // timed out } - if (($curl_stat == 503) && (stristr($postResult->getHeader(), 'retry-after'))) { + if (($curl_stat == 503) && $postResult->inHeader('retry-after')) { return -10; } if (strpos($xml, 'message)) { - Logger::log('Transmit to ' . $dest_url . ' returned status '.$res->status.' - '.$res->message, Logger::DEBUG); + Logger::info('Transmit to ' . $dest_url . ' returned status '.$res->status.' - '.$res->message); } return intval($res->status); @@ -1479,19 +1048,19 @@ class DFRN /** * 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 - * @param array $importer Record of the importer user mixed with contact of the content - * @param string $element Element name from which the data is fetched - * @param bool $onlyfetch Should the data only be fetched or should it update the contact record as well - * @param string $xml optional, default empty + * @param \DOMXPath $xpath XPath object + * @param \DOMNode $context In which context should the data be searched + * @param array $importer Record of the importer user mixed with contact of the content + * @param string $element Element name from which the data is fetched + * @param bool $onlyfetch Should the data only be fetched or should it update the contact record as well + * @param string $xml optional, default empty * * @return array Relevant data of the author * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException * @todo Find good type-hints for all parameter */ - private static function fetchauthor($xpath, $context, $importer, $element, $onlyfetch, $xml = "") + private static function fetchauthor(\DOMXPath $xpath, \DOMNode $context, $importer, $element, $onlyfetch, $xml = "") { $author = []; $author["name"] = XML::getFirstNodeValue($xpath, $element."/atom:name/text()", $context); @@ -1499,18 +1068,20 @@ class DFRN $fields = ['id', 'uid', 'url', 'network', 'avatar-date', 'avatar', 'name-date', 'uri-date', 'addr', 'name', 'nick', 'about', 'location', 'keywords', 'xmpp', 'bdyear', 'bd', 'hidden', 'contact-type']; - $condition = ["`uid` = ? AND `nurl` = ? AND `network` != ? AND NOT `pending` AND NOT `blocked` AND `rel` IN (?, ?)", - $importer["importer_uid"], Strings::normaliseLink($author["link"]), Protocol::STATUSNET, - Contact::SHARING, Contact::FRIEND]; + $condition = ["`uid` = ? AND `nurl` = ? AND `network` != ? AND NOT `pending` AND NOT `blocked`", + $importer["importer_uid"], Strings::normaliseLink($author["link"]), Protocol::STATUSNET]; + + if ($importer['account-type'] != User::ACCOUNT_TYPE_COMMUNITY) { + $condition = DBA::mergeConditions($condition, ['rel' => [Contact::SHARING, Contact::FRIEND]]); + } + $contact_old = DBA::selectFirst('contact', $fields, $condition); if (DBA::isResult($contact_old)) { $author["contact-id"] = $contact_old["id"]; $author["network"] = $contact_old["network"]; } else { - if (!$onlyfetch) { - Logger::debug("Contact ".$author["link"]." wasn't found for user ".$importer["importer_uid"]." XML: ".$xml); - } + Logger::info('Contact not found', ['condition' => $condition]); $author["contact-unknown"] = true; $contact = Contact::getByURL($author["link"], null, ["id", "network"]); @@ -1559,12 +1130,12 @@ class DFRN } if (empty($author['avatar'])) { - Logger::log('Empty author: ' . $xml); + Logger::notice('Empty author: ' . $xml); $author['avatar'] = ''; } if (DBA::isResult($contact_old) && !$onlyfetch) { - Logger::log("Check if contact details for contact " . $contact_old["id"] . " (" . $contact_old["nick"] . ") have to be updated.", Logger::DEBUG); + Logger::info("Check if contact details for contact " . $contact_old["id"] . " (" . $contact_old["nick"] . ") have to be updated."); $poco = ["url" => $contact_old["url"], "network" => $contact_old["network"]]; @@ -1625,7 +1196,7 @@ class DFRN // If the "hide" element is present then the profile isn't searchable. $hide = intval(XML::getFirstNodeValue($xpath, $element . "/dfrn:hide/text()", $context) == "true"); - Logger::log("Hidden status for contact " . $contact_old["url"] . ": " . $hide, Logger::DEBUG); + Logger::info("Hidden status for contact " . $contact_old["url"] . ": " . $hide); // If the contact isn't searchable then set the contact to "hidden". // Problem: This can be manually overridden by the user. @@ -1645,12 +1216,14 @@ class DFRN } // "dfrn:birthday" contains the birthday converted to UTC - $birthday = XML::getFirstNodeValue($xpath, $element . "/poco:birthday/text()", $context); - - if (strtotime($birthday) > time()) { - $bd_timestamp = strtotime($birthday); - - $poco["bdyear"] = date("Y", $bd_timestamp); + $birthday = XML::getFirstNodeValue($xpath, $element . "/dfrn:birthday/text()", $context); + try { + $birthday_date = new \DateTime($birthday); + if ($birthday_date > new \DateTime()) { + $poco["bdyear"] = $birthday_date->format("Y"); + } + } catch (\Exception $e) { + // Invalid birthday } // "poco:birthday" is the birthday in the format "yyyy-mm-dd" @@ -1679,12 +1252,12 @@ class DFRN 'xmpp' => $contact['xmpp'], 'name-date' => DateTimeFormat::utc($contact['name-date']), 'unsearchable' => $contact['hidden'], 'uri-date' => DateTimeFormat::utc($contact['uri-date'])]; - DBA::update('contact', $fields, ['id' => $contact['id'], 'network' => $contact['network']], $contact_old); + Contact::update($fields, ['id' => $contact['id'], 'network' => $contact['network']], $contact_old); // Update the public contact. Don't set the "hidden" value, this is used differently for public contacts unset($fields['hidden']); $condition = ['uid' => 0, 'nurl' => Strings::normaliseLink($contact_old['url'])]; - DBA::update('contact', $fields, $condition, true); + Contact::update($fields, $condition, true); Contact::updateAvatar($contact['id'], $author['avatar']); @@ -1764,7 +1337,7 @@ class DFRN */ private static function processMail($xpath, $mail, $importer) { - Logger::log("Processing mails"); + Logger::notice("Processing mails"); $msg = []; $msg["uid"] = $importer["importer_uid"]; @@ -1799,7 +1372,61 @@ class DFRN $cid = Contact::getIdForURL($url); $note = $xpath->evaluate('string(dfrn:note[1]/text())', $suggestion); - return FContact::addSuggestion($importer['importer_uid'], $cid, $importer['id'], $note); + return self::addSuggestion($importer['importer_uid'], $cid, $importer['id'], $note); + } + + /** + * Suggest a given contact to a given user from a given contact + * + * @param integer $uid + * @param integer $cid + * @param integer $from_cid + * @return bool Was the adding successful? + */ + private static function addSuggestion(int $uid, int $cid, int $from_cid, string $note = '') + { + $owner = User::getOwnerDataById($uid); + $contact = Contact::getById($cid); + $from_contact = Contact::getById($from_cid); + + if (DBA::exists('contact', ['nurl' => Strings::normaliseLink($contact['url']), 'uid' => $uid])) { + return false; + } + + // Quit if we already have an introduction for this person + if (DI::intro()->suggestionExistsForUser($cid, $uid)) { + return false; + } + + $suggest = []; + $suggest['uid'] = $uid; + $suggest['cid'] = $from_cid; + $suggest['url'] = $contact['url']; + $suggest['name'] = $contact['name']; + $suggest['photo'] = $contact['photo']; + $suggest['request'] = $contact['request']; + $suggest['title'] = ''; + $suggest['body'] = $note; + + DI::intro()->save(DI::introFactory()->createNew( + $suggest['uid'], + $suggest['cid'], + $suggest['body'], + null, + $cid + )); + + DI::notify()->createFromArray([ + 'type' => Notification\Type::SUGGEST, + 'otype' => Notification\ObjectType::INTRO, + 'verb' => Activity::REQ_FRIEND, + 'uid' => $owner['uid'], + 'cid' => $from_contact['uid'], + 'item' => $suggest, + 'link' => DI::baseUrl().'/notifications/intros', + ]); + + return true; } /** @@ -1815,7 +1442,7 @@ class DFRN */ private static function processRelocation($xpath, $relocation, $importer) { - Logger::log("Processing relocations"); + Logger::notice("Processing relocations"); /// @TODO Rewrite this to one statement $relocate = []; @@ -1843,19 +1470,13 @@ class DFRN } // update contact - $r = q( - "SELECT `photo`, `url` FROM `contact` WHERE `id` = %d AND `uid` = %d", - intval($importer["id"]), - intval($importer["importer_uid"]) - ); + $old = Contact::selectFirst(['photo', 'url'], ['id' => $importer["id"], 'uid' => $importer["importer_uid"]]); - if (!DBA::isResult($r)) { - Logger::log("Query failed to execute, no result returned in " . __FUNCTION__); + if (!DBA::isResult($old)) { + Logger::notice("Query failed to execute, no result returned in " . __FUNCTION__); return false; } - $old = $r[0]; - // Update the contact table. We try to find every entry. $fields = ['name' => $relocate["name"], 'avatar' => $relocate["avatar"], 'url' => $relocate["url"], 'nurl' => Strings::normaliseLink($relocate["url"]), @@ -1864,11 +1485,11 @@ class DFRN 'poll' => $relocate["poll"], 'site-pubkey' => $relocate["sitepubkey"]]; $condition = ["(`id` = ?) OR (`nurl` = ?)", $importer["id"], Strings::normaliseLink($old["url"])]; - DBA::update('contact', $fields, $condition); + Contact::update($fields, $condition); Contact::updateAvatar($importer["id"], $relocate["avatar"], true); - Logger::log('Contacts are updated.'); + Logger::notice('Contacts are updated.'); /// @TODO /// merge with current record, current contents have priority @@ -1923,51 +1544,23 @@ class DFRN */ private static function getEntryType($importer, $item) { - if ($item["parent-uri"] != $item["uri"]) { + if ($item["thr-parent"] != $item["uri"]) { $community = false; - if ($importer["page-flags"] == User::PAGE_FLAGS_COMMUNITY || $importer["page-flags"] == User::PAGE_FLAGS_PRVGROUP) { + if ($importer['account-type'] == User::ACCOUNT_TYPE_COMMUNITY) { $sql_extra = ""; $community = true; - Logger::log("possible community action"); + Logger::notice("possible community action"); } else { - $sql_extra = " AND `contact`.`self` AND `item`.`wall` "; + $sql_extra = " AND `self` AND `wall`"; } // was the top-level post for this action written by somebody on this site? // Specifically, the recipient? + $parent = Post::selectFirst(['wall'], + ["`uri` = ? AND `uid` = ?" . $sql_extra, $item["thr-parent"], $importer["importer_uid"]]); - $is_a_remote_action = false; - - $parent = Item::selectFirst(['parent-uri'], ['uri' => $item["parent-uri"]]); - if (DBA::isResult($parent)) { - $r = q( - "SELECT `item`.`forum_mode`, `item`.`wall` FROM `item` - INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` - WHERE `item`.`uri` = '%s' AND (`item`.`parent-uri` = '%s' OR `item`.`thr-parent` = '%s') - AND `item`.`uid` = %d - $sql_extra - LIMIT 1", - DBA::escape($parent["parent-uri"]), - DBA::escape($parent["parent-uri"]), - DBA::escape($parent["parent-uri"]), - intval($importer["importer_uid"]) - ); - if (DBA::isResult($r)) { - $is_a_remote_action = true; - } - } - - /* - * Does this have the characteristics of a community or private group action? - * If it's an action to a wall post on a community/prvgroup page it's a - * valid community action. Also forum_mode makes it valid for sure. - * If neither, it's not. - */ - if ($is_a_remote_action && $community && (!$r[0]["forum_mode"]) && (!$r[0]["wall"])) { - $is_a_remote_action = false; - Logger::log("not a community action"); - } + $is_a_remote_action = DBA::isResult($parent); if ($is_a_remote_action) { return DFRN::REPLY_RC; @@ -2011,29 +1604,23 @@ class DFRN } if ($Blink && Strings::compareLink($Blink, DI::baseUrl() . "/profile/" . $importer["nickname"])) { - $author = DBA::selectFirst('contact', ['name', 'thumb', 'url'], ['id' => $item['author-id']]); + $author = DBA::selectFirst('contact', ['id', 'name', 'thumb', 'url'], ['id' => $item['author-id']]); - $parent = Item::selectFirst(['id'], ['uri' => $item['parent-uri'], 'uid' => $importer["importer_uid"]]); + $parent = Post::selectFirst(['id'], ['uri' => $item['thr-parent'], 'uid' => $importer["importer_uid"]]); $item['parent'] = $parent['id']; // send a notification - notification( + DI::notify()->createFromArray( [ - "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" => DI::baseUrl()."/display/".urlencode($item['guid']), - "source_name" => $author["name"], - "source_link" => $author["url"], - "source_photo" => $author["thumb"], - "verb" => $item["verb"], - "otype" => "person", - "activity" => $verb, - "parent" => $item['parent']] + "type" => Notification\Type::POKE, + "otype" => Notification\ObjectType::PERSON, + "activity" => $verb, + "verb" => $item["verb"], + "uid" => $importer["importer_uid"], + "cid" => $author["id"], + "item" => $item, + "link" => DI::baseUrl() . "/display/" . urlencode($item['guid']), + ] ); } } @@ -2053,7 +1640,7 @@ class DFRN */ private static function processVerbs($entrytype, $importer, &$item, &$is_like) { - Logger::log("Process verb ".$item["verb"]." and object-type ".$item["object-type"]." for entrytype ".$entrytype, Logger::DEBUG); + Logger::info("Process verb ".$item["verb"]." and object-type ".$item["object-type"]." for entrytype ".$entrytype); if (($entrytype == DFRN::TOP_LEVEL) && !empty($importer['id'])) { // The filling of the the "contact" variable is done for legcy reasons @@ -2065,23 +1652,23 @@ class DFRN // 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)) { - Logger::log("New follower"); + Logger::notice("New follower"); Contact::addRelationship($importer, $contact, $item); return false; } if ($activity->match($item["verb"], Activity::UNFOLLOW)) { - Logger::log("Lost follower"); - Contact::removeFollower($importer, $contact, $item); + Logger::notice("Lost follower"); + Contact::removeFollower($contact); return false; } if ($activity->match($item["verb"], Activity::REQ_FRIEND)) { - Logger::log("New friend request"); + Logger::notice("New friend request"); Contact::addRelationship($importer, $contact, $item, true); return false; } if ($activity->match($item["verb"], Activity::UNFRIEND)) { - Logger::log("Lost sharer"); - Contact::removeSharer($importer, $contact, $item); + Logger::notice("Lost sharer"); + Contact::removeSharer($contact); return false; } } else { @@ -2095,16 +1682,16 @@ class DFRN $is_like = true; $item["gravity"] = GRAVITY_ACTIVITY; // only one like or dislike per person - // splitted into two queries for performance issues + // split into two queries for performance issues $condition = ['uid' => $item["uid"], 'author-id' => $item["author-id"], 'gravity' => GRAVITY_ACTIVITY, - 'verb' => $item["verb"], 'parent-uri' => $item["parent-uri"]]; - if (Item::exists($condition)) { + 'verb' => $item['verb'], 'parent-uri' => $item['thr-parent']]; + if (Post::exists($condition)) { return false; } $condition = ['uid' => $item["uid"], 'author-id' => $item["author-id"], 'gravity' => GRAVITY_ACTIVITY, - 'verb' => $item["verb"], 'thr-parent' => $item["parent-uri"]]; - if (Item::exists($condition)) { + 'verb' => $item['verb'], 'thr-parent' => $item['thr-parent']]; + if (Post::exists($condition)) { return false; } @@ -2122,10 +1709,10 @@ class DFRN $xt = XML::parseString($item["target"]); if ($xt->type == Activity\ObjectType::NOTE) { - $item_tag = Item::selectFirst(['id', 'uri-id', 'tag'], ['uri' => $xt->id, 'uid' => $importer["importer_uid"]]); + $item_tag = Post::selectFirst(['id', 'uri-id'], ['uri' => $xt->id, 'uid' => $importer["importer_uid"]]); if (!DBA::isResult($item_tag)) { - Logger::log("Query failed to execute, no result returned in " . __FUNCTION__); + Logger::notice("Query failed to execute, no result returned in " . __FUNCTION__); return false; } @@ -2151,9 +1738,9 @@ class DFRN { $rel = ""; $href = ""; - $type = ""; - $length = "0"; - $title = ""; + $type = null; + $length = null; + $title = null; foreach ($links as $link) { foreach ($link->attributes as $attributes) { switch ($attributes->name) { @@ -2170,13 +1757,8 @@ class DFRN $item["plink"] = $href; break; case "enclosure": - if (!empty($item["attach"])) { - $item["attach"] .= ","; - } else { - $item["attach"] = ""; - } - - $item["attach"] .= '[attach]href="' . $href . '" length="' . $length . '" type="' . $type . '" title="' . $title . '"[/attach]'; + Post\Media::insert(['uri-id' => $item['uri-id'], 'type' => Post\Media::DOCUMENT, + 'url' => $href, 'mimetype' => $type, 'size' => $length, 'description' => $title]); break; } } @@ -2187,19 +1769,34 @@ class DFRN * Checks if an incoming message is wanted * * @param array $item + * @param array $imporer * @return boolean Is the message wanted? */ - private static function isSolicitedMessage(array $item) + private static function isSolicitedMessage(array $item, array $importer) { if (DBA::exists('contact', ["`nurl` = ? AND `uid` != ? AND `rel` IN (?, ?)", Strings::normaliseLink($item["author-link"]), 0, Contact::FRIEND, Contact::SHARING])) { - Logger::info('Author has got followers - accepted', ['uri' => $item['uri'], 'author' => $item["author-link"]]); + Logger::debug('Author has got followers - accepted', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri'], 'author' => $item["author-link"]]); return true; } - $taglist = Tag::getByURIId($item['uri-id'], [Tag::HASHTAG]); - $tags = array_column($taglist, 'name'); - return Relay::isSolicitedPost($tags, $item['body'], $item['author-id'], $item['uri'], Protocol::DFRN); + if ($importer['importer_uid'] != 0) { + Logger::debug('Message is directed to a user - accepted', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri'], 'importer' => $importer['importer_uid']]); + return true; + } + + if ($item['uri'] != $item['thr-parent']) { + Logger::debug('Message is no parent - accepted', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri']]); + return true; + } + + $tags = array_column(Tag::getByURIId($item['uri-id'], [Tag::HASHTAG]), 'name'); + if (Relay::isSolicitedPost($tags, $item['body'], $item['author-id'], $item['uri'], Protocol::DFRN)) { + Logger::debug('Post is accepted because of the relay settings', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri'], 'author' => $item["author-link"]]); + return true; + } else { + return false; + } } /** @@ -2215,13 +1812,13 @@ class DFRN * @throws \ImagickException * @todo Add type-hints */ - private static function processEntry($header, $xpath, $entry, $importer, $xml) + private static function processEntry($header, $xpath, $entry, $importer, $xml, $protocol) { - Logger::log("Processing entries"); + Logger::notice("Processing entries"); $item = $header; - $item["protocol"] = Conversation::PARCEL_DFRN; + $item["protocol"] = $protocol; $item["source"] = $xml; @@ -2230,12 +1827,12 @@ class DFRN $item["edited"] = XML::getFirstNodeValue($xpath, "atom:updated/text()", $entry); - $current = Item::selectFirst(['id', 'uid', 'edited', 'body'], + $current = Post::selectFirst(['id', 'uid', 'edited', 'body'], ['uri' => $item["uri"], 'uid' => $importer["importer_uid"]] ); // Is there an existing item? if (DBA::isResult($current) && !self::isEditedTimestampNewer($current, $item)) { - Logger::log("Item ".$item["uri"]." (".$item['edited'].") already existed.", Logger::DEBUG); + Logger::info("Item ".$item["uri"]." (".$item['edited'].") already existed."); return; } @@ -2259,6 +1856,12 @@ class DFRN $item["title"] = XML::getFirstNodeValue($xpath, "atom:title/text()", $entry); + if (!empty($item["title"])) { + $item["post-type"] = Item::PT_ARTICLE; + } else { + $item["post-type"] = Item::PT_NOTE; + } + $item["created"] = XML::getFirstNodeValue($xpath, "atom:published/text()", $entry); $item["body"] = XML::getFirstNodeValue($xpath, "dfrn:env/text()", $entry); @@ -2303,6 +1906,8 @@ class DFRN $item['uri-id'] = ItemURI::insert(['uri' => $item['uri'], 'guid' => $item['guid']]); + $item["body"] = Item::improveSharedDataInBody($item); + 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" @@ -2380,25 +1985,23 @@ class DFRN } // Is it a reply or a top level posting? - $item["parent-uri"] = $item["uri"]; + $item['thr-parent'] = $item['uri']; $inreplyto = $xpath->query("thr:in-reply-to", $entry); if (is_object($inreplyto->item(0))) { foreach ($inreplyto->item(0)->attributes as $attributes) { if ($attributes->name == "ref") { - $item["parent-uri"] = $attributes->textContent; + $item['thr-parent'] = $attributes->textContent; } } } // Check if the message is wanted - if (($importer["importer_uid"] == 0) && ($item['uri'] == $item['parent-uri'])) { - if (!self::isSolicitedMessage($item)) { - DBA::delete('item-uri', ['uri' => $item['uri']]); - return 403; - } + if (!self::isSolicitedMessage($item, $importer)) { + DBA::delete('item-uri', ['uri' => $item['uri']]); + return 403; } - + // Get the type of the item (Top level post, reply or remote reply) $entrytype = self::getEntryType($importer, $item); @@ -2437,17 +2040,21 @@ class DFRN // Is it an event? if (($item["object-type"] == Activity\ObjectType::EVENT) && !$owner_unknown) { - Logger::log("Item ".$item["uri"]." seems to contain an event.", Logger::DEBUG); + Logger::info("Item ".$item["uri"]." seems to contain an event."); $ev = Event::fromBBCode($item["body"]); if ((!empty($ev['desc']) || !empty($ev['summary'])) && !empty($ev['start'])) { - Logger::log("Event in item ".$item["uri"]." was found.", Logger::DEBUG); - $ev["cid"] = $importer["id"]; - $ev["uid"] = $importer["importer_uid"]; - $ev["uri"] = $item["uri"]; - $ev["edited"] = $item["edited"]; - $ev["private"] = $item["private"]; - $ev["guid"] = $item["guid"]; - $ev["plink"] = $item["plink"]; + Logger::info("Event in item ".$item["uri"]." was found."); + $ev["cid"] = $importer["id"]; + $ev["uid"] = $importer["importer_uid"]; + $ev["uri"] = $item["uri"]; + $ev["edited"] = $item["edited"]; + $ev["private"] = $item["private"]; + $ev["guid"] = $item["guid"]; + $ev["plink"] = $item["plink"]; + $ev["network"] = $item["network"]; + $ev["protocol"] = $item["protocol"]; + $ev["direction"] = $item["direction"]; + $ev["source"] = $item["source"]; $condition = ['uri' => $item["uri"], 'uid' => $importer["importer_uid"]]; $event = DBA::selectFirst('event', ['id'], $condition); @@ -2456,20 +2063,21 @@ class DFRN } $event_id = Event::store($ev); - Logger::log("Event ".$event_id." was stored", Logger::DEBUG); - return; + Logger::info('Event was stored', ['id' => $event_id]); + + $item = Event::getItemArrayForImportedId($event_id, $item); } } } if (!self::processVerbs($entrytype, $importer, $item, $is_like)) { - Logger::log("Exiting because 'processVerbs' told us so", Logger::DEBUG); + Logger::info("Exiting because 'processVerbs' told us so"); return; } // This check is done here to be able to receive connection requests in "processVerbs" if (($entrytype == DFRN::TOP_LEVEL) && $owner_unknown) { - Logger::log("Item won't be stored because user " . $importer["importer_uid"] . " doesn't follow " . $item["owner-link"] . ".", Logger::DEBUG); + Logger::info("Item won't be stored because user " . $importer["importer_uid"] . " doesn't follow " . $item["owner-link"] . "."); return; } @@ -2477,22 +2085,22 @@ class DFRN // Update content if 'updated' changes if (DBA::isResult($current)) { if (self::updateContent($current, $item, $importer, $entrytype)) { - Logger::log("Item ".$item["uri"]." was updated.", Logger::DEBUG); + Logger::info("Item ".$item["uri"]." was updated."); } else { - Logger::log("Item " . $item["uri"] . " already existed.", Logger::DEBUG); + Logger::info("Item " . $item["uri"] . " already existed."); } return; } if (in_array($entrytype, [DFRN::REPLY, DFRN::REPLY_RC])) { // Will be overwritten for sharing accounts in Item::insert - if (empty($item['post-type']) && ($entrytype == DFRN::REPLY)) { - $item['post-type'] = Item::PT_COMMENT; + if (empty($item['post-reason']) && ($entrytype == DFRN::REPLY)) { + $item['post-reason'] = Item::PR_COMMENT; } $posted_id = Item::insert($item); if ($posted_id) { - Logger::log("Reply from contact ".$item["contact-id"]." was stored with id ".$posted_id, Logger::DEBUG); + Logger::info("Reply from contact ".$item["contact-id"]." was stored with id ".$posted_id); if ($item['uid'] == 0) { Item::distribute($posted_id); @@ -2502,7 +2110,7 @@ class DFRN } } else { // $entrytype == DFRN::TOP_LEVEL if (($importer["uid"] == 0) && ($importer["importer_uid"] != 0)) { - Logger::log("Contact ".$importer["id"]." isn't known to user ".$importer["importer_uid"].". The post will be ignored.", Logger::DEBUG); + Logger::info("Contact ".$importer["id"]." isn't known to user ".$importer["importer_uid"].". The post will be ignored."); return; } if (!Strings::compareLink($item["owner-link"], $importer["url"])) { @@ -2512,13 +2120,13 @@ class DFRN * the tgroup delivery code called from Item::insert will correct it if it's a forum, * but we're going to unconditionally correct it here so that the post will always be owned by our contact. */ - Logger::log('Correcting item owner.', Logger::DEBUG); + Logger::info('Correcting item owner.'); $item["owner-link"] = $importer["url"]; $item["owner-id"] = Contact::getIdForURL($importer["url"], 0); } if (($importer["rel"] == Contact::FOLLOWER) && (!self::tgroupCheck($importer["importer_uid"], $item))) { - Logger::log("Contact ".$importer["id"]." is only follower and tgroup check was negative.", Logger::DEBUG); + Logger::info("Contact ".$importer["id"]." is only follower and tgroup check was negative."); return; } @@ -2532,7 +2140,7 @@ class DFRN $posted_id = $notify; } - Logger::log("Item was stored with id ".$posted_id, Logger::DEBUG); + Logger::info("Item was stored with id ".$posted_id); if ($item['uid'] == 0) { Item::distribute($posted_id); @@ -2557,7 +2165,7 @@ class DFRN */ private static function processDeletion($xpath, $deletion, $importer) { - Logger::log("Processing deletions"); + Logger::notice("Processing deletions"); $uri = null; foreach ($deletion->attributes as $attributes) { @@ -2571,28 +2179,28 @@ class DFRN } $condition = ['uri' => $uri, 'uid' => $importer["importer_uid"]]; - $item = Item::selectFirst(['id', 'parent', 'contact-id', 'file', 'deleted', 'gravity'], $condition); + $item = Post::selectFirst(['id', 'parent', 'contact-id', 'uri-id', 'deleted', 'gravity'], $condition); if (!DBA::isResult($item)) { - Logger::log("Item with uri " . $uri . " for user " . $importer["importer_uid"] . " wasn't found.", Logger::DEBUG); + Logger::info("Item with uri " . $uri . " for user " . $importer["importer_uid"] . " wasn't found."); return; } - if (strstr($item['file'], '[')) { - Logger::log("Item with uri " . $uri . " for user " . $importer["importer_uid"] . " is filed. So it won't be deleted.", Logger::DEBUG); + if (DBA::exists('post-category', ['uri-id' => $item['uri-id'], 'uid' => $importer['importer_uid'], 'type' => Post\Category::FILE])) { + Logger::notice("Item is filed. It won't be deleted.", ['uri' => $uri, 'uri-id' => $item['uri_id'], 'uid' => $importer["importer_uid"]]); return; } // When it is a starting post it has to belong to the person that wants to delete it if (($item['gravity'] == GRAVITY_PARENT) && ($item['contact-id'] != $importer["id"])) { - Logger::log("Item with uri " . $uri . " don't belong to contact " . $importer["id"] . " - ignoring deletion.", Logger::DEBUG); + Logger::info("Item with uri " . $uri . " don't belong to contact " . $importer["id"] . " - ignoring deletion."); return; } // Comments can be deleted by the thread owner or comment owner if (($item['gravity'] != GRAVITY_PARENT) && ($item['contact-id'] != $importer["id"])) { $condition = ['id' => $item['parent'], 'contact-id' => $importer["id"]]; - if (!Item::exists($condition)) { - Logger::log("Item with uri " . $uri . " wasn't found or mustn't be deleted by contact " . $importer["id"] . " - ignoring deletion.", Logger::DEBUG); + if (!Post::exists($condition)) { + Logger::info("Item with uri " . $uri . " wasn't found or mustn't be deleted by contact " . $importer["id"] . " - ignoring deletion."); return; } } @@ -2601,7 +2209,7 @@ class DFRN return; } - Logger::log('deleting item '.$item['id'].' uri='.$uri, Logger::DEBUG); + Logger::info('deleting item '.$item['id'].' uri='.$uri); Item::markForDeletion(['id' => $item['id']]); } @@ -2609,15 +2217,16 @@ class DFRN /** * Imports a DFRN message * - * @param string $xml The DFRN message - * @param array $importer Record of the importer user mixed with contact of the content - * @param bool $sort_by_date Is used when feeds are polled + * @param string $xml The DFRN message + * @param array $importer Record of the importer user mixed with contact of the content + * @param int $protocol Transport protocol + * @param int $direction Is the message pushed or pulled? * @return integer Import status * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException * @todo set proper type-hints */ - public static function import($xml, $importer, $sort_by_date = false) + public static function import($xml, $importer, $protocol, $direction) { if ($xml == "") { return 400; @@ -2644,6 +2253,11 @@ class DFRN $header["wall"] = 0; $header["origin"] = 0; $header["contact-id"] = $importer["id"]; + $header["direction"] = $direction; + + if ($direction === Conversation::RELAY) { + $header['post-reason'] = Item::PR_RELAY; + } // Update the contact table if the data has changed @@ -2657,7 +2271,11 @@ class DFRN self::fetchauthor($xpath, $doc->firstChild, $importer, "dfrn:owner", false, $xml); } - Logger::log("Import DFRN message for user " . $importer["importer_uid"] . " from contact " . $importer["id"], Logger::DEBUG); + Logger::info("Import DFRN message for user " . $importer["importer_uid"] . " from contact " . $importer["id"]); + + if (!empty($importer['gsid']) && ($protocol == Conversation::PARCEL_DIASPORA_DFRN)) { + GServer::setProtocol($importer['gsid'], Post\DeliveryData::DFRN); + } // is it a public forum? Private forums aren't exposed with this method $forum = intval(XML::getFirstNodeValue($xpath, "/atom:feed/dfrn:community/text()")); @@ -2669,36 +2287,36 @@ class DFRN $accounttype = intval(XML::getFirstNodeValue($xpath, "/atom:feed/dfrn:account_type/text()")); if ($accounttype != $importer["contact-type"]) { - DBA::update('contact', ['contact-type' => $accounttype], ['id' => $importer['id']]); + Contact::update(['contact-type' => $accounttype], ['id' => $importer['id']]); // Updating the public contact as well - DBA::update('contact', ['contact-type' => $accounttype], ['uid' => 0, 'nurl' => $importer['nurl']]); + Contact::update(['contact-type' => $accounttype], ['uid' => 0, 'nurl' => $importer['nurl']]); } // A forum contact can either have set "forum" or "prv" - but not both if ($accounttype == User::ACCOUNT_TYPE_COMMUNITY) { // It's a forum, so either set the public or private forum flag $condition = ['(`forum` != ? OR `prv` != ?) AND `id` = ?', $forum, !$forum, $importer['id']]; - DBA::update('contact', ['forum' => $forum, 'prv' => !$forum], $condition); + Contact::update(['forum' => $forum, 'prv' => !$forum], $condition); // Updating the public contact as well $condition = ['(`forum` != ? OR `prv` != ?) AND `uid` = 0 AND `nurl` = ?', $forum, !$forum, $importer['nurl']]; - DBA::update('contact', ['forum' => $forum, 'prv' => !$forum], $condition); + Contact::update(['forum' => $forum, 'prv' => !$forum], $condition); } else { // It's not a forum, so remove the flags $condition = ['(`forum` OR `prv`) AND `id` = ?', $importer['id']]; - DBA::update('contact', ['forum' => false, 'prv' => false], $condition); + Contact::update(['forum' => false, 'prv' => false], $condition); // Updating the public contact as well $condition = ['(`forum` OR `prv`) AND `uid` = 0 AND `nurl` = ?', $importer['nurl']]; - DBA::update('contact', ['forum' => false, 'prv' => false], $condition); + Contact::update(['forum' => false, 'prv' => false], $condition); } } elseif ($forum != $importer["forum"]) { // Deprecated since 3.5.1 $condition = ['`forum` != ? AND `id` = ?', $forum, $importer["id"]]; - DBA::update('contact', ['forum' => $forum], $condition); + Contact::update(['forum' => $forum], $condition); // Updating the public contact as well $condition = ['`forum` != ? AND `uid` = 0 AND `nurl` = ?', $forum, $importer['nurl']]; - DBA::update('contact', ['forum' => $forum], $condition); + Contact::update(['forum' => $forum], $condition); } @@ -2721,31 +2339,22 @@ class DFRN } $deletions = $xpath->query("/atom:feed/at:deleted-entry"); - foreach ($deletions as $deletion) { - self::processDeletion($xpath, $deletion, $importer); - } - - if (!$sort_by_date) { - $entries = $xpath->query("/atom:feed/atom:entry"); - foreach ($entries as $entry) { - self::processEntry($header, $xpath, $entry, $importer, $xml); + if (!empty($deletions)) { + foreach ($deletions as $deletion) { + self::processDeletion($xpath, $deletion, $importer); } - } else { - $newentries = []; - $entries = $xpath->query("/atom:feed/atom:entry"); - foreach ($entries as $entry) { - $created = XML::getFirstNodeValue($xpath, "atom:published/text()", $entry); - $newentries[strtotime($created)] = $entry; + if (count($deletions) > 0) { + Logger::notice('Deletions had been processed'); + return 200; } + } - // Now sort after the publishing date - ksort($newentries); - - foreach ($newentries as $entry) { - self::processEntry($header, $xpath, $entry, $importer, $xml); - } + $entries = $xpath->query("/atom:feed/atom:entry"); + foreach ($entries as $entry) { + self::processEntry($header, $xpath, $entry, $importer, $xml, $protocol); } - Logger::log("Import done for user " . $importer["importer_uid"] . " from contact " . $importer["id"], Logger::DEBUG); + + Logger::info("Import done for user " . $importer["importer_uid"] . " from contact " . $importer["id"]); return 200; } @@ -2770,18 +2379,15 @@ class DFRN // check that the message originated elsewhere and is a top-level post - if ($item['wall'] || $item['origin'] || ($item['uri'] != $item['parent-uri'])) { + if ($item['wall'] || $item['origin'] || ($item['uri'] != $item['thr-parent'])) { return false; } - $user = DBA::selectFirst('user', ['page-flags', 'nickname'], ['uid' => $uid]); + $user = DBA::selectFirst('user', ['account-type', 'nickname'], ['uid' => $uid]); if (!DBA::isResult($user)) { return false; } - $community_page = ($user['page-flags'] == User::PAGE_FLAGS_COMMUNITY); - $prvgroup = ($user['page-flags'] == User::PAGE_FLAGS_PRVGROUP); - $link = Strings::normaliseLink(DI::baseUrl() . '/profile/' . $user['nickname']); /* @@ -2795,7 +2401,7 @@ class DFRN foreach ($matches as $mtch) { if (Strings::compareLink($link, $mtch[1]) || Strings::compareLink($dlink, $mtch[1])) { $mention = true; - Logger::log('mention found: ' . $mtch[2]); + Logger::notice('mention found: ' . $mtch[2]); } } } @@ -2804,7 +2410,7 @@ class DFRN return false; } - return $community_page || $prvgroup; + return ($user['account-type'] == User::ACCOUNT_TYPE_COMMUNITY); } /**