X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FDFRN.php;h=2c2309ba4d31e269ea357d88466040eadfd853d8;hb=eea355ae3b3d0c9a47fa6153f3a73b4b29cd81ac;hp=4d5a9289778812795ac68dd45b29b90bdf9b7550;hpb=c1226bff071c38e708e91f5ba07436c88cfaa737;p=friendica.git diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index 4d5a928977..2c2309ba4d 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)) { - $items = Post::selectToArray(Item::DELIVER_FIELDLIST, ['id' => $ids]); - } 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]; } + $condition['uid'] = $uid; + $items = Post::selectToArray(Item::DELIVER_FIELDLIST, $condition); if (!DBA::isResult($items)) { return ''; @@ -647,7 +448,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::getAvatarUrlForId($owner['uid'], Proxy::SIZE_SMALL)]; if (!$public || !$hide) { $attributes["dfrn:updated"] = $picdate; @@ -792,12 +594,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 +647,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; @@ -928,10 +731,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. @@ -945,7 +748,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); @@ -1060,12 +863,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); } @@ -1115,268 +918,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 * @@ -1435,7 +976,7 @@ 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(); @@ -1444,7 +985,7 @@ class DFRN return -9; // timed out } - if (($curl_stat == 503) && (stristr($postResult->getHeader(), 'retry-after'))) { + if (($curl_stat == 503) && $postResult->inHeader('retry-after')) { return -10; } @@ -1470,19 +1011,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); @@ -1638,12 +1179,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" @@ -1672,12 +1215,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']); @@ -1857,7 +1400,7 @@ 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); @@ -1924,32 +1467,15 @@ class DFRN $community = true; Logger::log("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(['forum_mode', 'wall'], + ["`uri` = ? AND `uid` = ?" . $sql_extra, $item["thr-parent"], $importer["importer_uid"]]); - $is_a_remote_action = false; - - $parent = Post::selectFirst(['thr-parent'], ['uri' => $item["thr-parent"]]); - 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`.`thr-parent` = '%s' OR `item`.`thr-parent` = '%s') - AND `item`.`uid` = %d - $sql_extra - LIMIT 1", - DBA::escape($parent["thr-parent"]), - DBA::escape($parent["thr-parent"]), - DBA::escape($parent["thr-parent"]), - intval($importer["importer_uid"]) - ); - if (DBA::isResult($r)) { - $is_a_remote_action = true; - } - } + $is_a_remote_action = DBA::isResult($parent); /* * Does this have the characteristics of a community or private group action? @@ -1957,7 +1483,7 @@ class DFRN * 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"])) { + if ($is_a_remote_action && $community && (!$parent["forum_mode"]) && (!$parent["wall"])) { $is_a_remote_action = false; Logger::log("not a community action"); } @@ -2012,8 +1538,8 @@ class DFRN // send a notification notification( [ - "type" => Type::POKE, - "otype" => Notify\ObjectType::PERSON, + "type" => Notification\Type::POKE, + "otype" => Notification\ObjectType::PERSON, "activity" => $verb, "verb" => $item["verb"], "uid" => $importer["importer_uid"], @@ -2058,7 +1584,7 @@ class DFRN } if ($activity->match($item["verb"], Activity::UNFOLLOW)) { Logger::log("Lost follower"); - Contact::removeFollower($importer, $contact, $item); + Contact::removeFollower($contact); return false; } if ($activity->match($item["verb"], Activity::REQ_FRIEND)) { @@ -2109,7 +1635,7 @@ class DFRN $xt = XML::parseString($item["target"]); if ($xt->type == Activity\ObjectType::NOTE) { - $item_tag = Post::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__); @@ -2241,6 +1767,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); @@ -2285,6 +1817,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,7 +1914,7 @@ class DFRN return 403; } } - + // Get the type of the item (Top level post, reply or remote reply) $entrytype = self::getEntryType($importer, $item); @@ -2442,8 +1976,9 @@ 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); } } } @@ -2472,8 +2007,8 @@ class DFRN 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); @@ -2557,14 +2092,14 @@ class DFRN } $condition = ['uri' => $uri, 'uid' => $importer["importer_uid"]]; - $item = Post::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); 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; } @@ -2634,7 +2169,7 @@ class DFRN $header["direction"] = $direction; if ($direction === Conversation::RELAY) { - $header['post-type'] = Item::PT_RELAY; + $header['post-reason'] = Item::PR_RELAY; } // Update the contact table if the data has changed @@ -2651,6 +2186,10 @@ class DFRN Logger::log("Import DFRN message for user " . $importer["importer_uid"] . " from contact " . $importer["id"], Logger::DEBUG); + 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()")); @@ -2661,36 +2200,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); }