X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FDFRN.php;h=d20864cf7f8515e55555adf83e8f10445d0e9b72;hb=3f523a88b0af4e2a73b29917da33d221abef9647;hp=fbcaf8d4b5888c02d0fc08ae9807033ca45b0346;hpb=3d4ace7a9d8541c6e5977bc43eedc02da7257089;p=friendica.git diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index fbcaf8d4b5..d20864cf7f 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -33,7 +33,7 @@ use Friendica\DI; use Friendica\Model\Contact; use Friendica\Model\Conversation; use Friendica\Model\Event; -use Friendica\Model\GContact; +use Friendica\Model\FContact; use Friendica\Model\Item; use Friendica\Model\ItemURI; use Friendica\Model\Mail; @@ -43,6 +43,7 @@ use Friendica\Model\Post\Category; use Friendica\Model\Profile; use Friendica\Model\Tag; use Friendica\Model\User; +use Friendica\Model\Verb; use Friendica\Network\Probe; use Friendica\Util\Crypto; use Friendica\Util\DateTimeFormat; @@ -256,10 +257,11 @@ class DFRN 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 `item`.`visible` $sql_extra + 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) ); @@ -755,7 +757,7 @@ class DFRN { $author = $doc->createElement($element); - $contact = Contact::getDetailsByURL($contact_url, $item["uid"]); + $contact = Contact::getByURLForUser($contact_url, $item["uid"], false, ['url', 'name', 'addr', 'photo']); if (!empty($contact)) { XML::addElement($doc, $author, "name", $contact["name"]); XML::addElement($doc, $author, "uri", $contact["url"]); @@ -951,7 +953,7 @@ class DFRN $htmlbody = "[b]" . $item['title'] . "[/b]\n\n" . $htmlbody; } - $htmlbody = BBCode::convert($htmlbody, false, 7); + $htmlbody = BBCode::convert($htmlbody, false, BBCode::OSTATUS); } $author = self::addEntryAuthor($doc, "author", $item["author-link"], $item); @@ -960,13 +962,15 @@ class DFRN $dfrnowner = self::addEntryAuthor($doc, "dfrn:owner", $item["owner-link"], $item); $entry->appendChild($dfrnowner); - if (($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) { + 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']]); - $attributes = ["ref" => $parent_item, "type" => "text/html", - "href" => $parent['plink'], - "dfrn:diaspora_guid" => $parent['guid']]; - XML::addElement($doc, $entry, "thr:in-reply-to", "", $attributes); + if (DBA::isResult($parent)) { + $attributes = ["ref" => $parent_item, "type" => "text/html", + "href" => $parent['plink'], + "dfrn:diaspora_guid" => $parent['guid']]; + XML::addElement($doc, $entry, "thr:in-reply-to", "", $attributes); + } } // Add conversation data. This is used for OStatus @@ -1059,7 +1063,7 @@ class DFRN if ($item['object-type'] != "") { XML::addElement($doc, $entry, "activity:object-type", $item['object-type']); - } elseif ($item['id'] == $item['parent']) { + } elseif ($item['gravity'] == GRAVITY_PARENT) { XML::addElement($doc, $entry, "activity:object-type", Activity\ObjectType::NOTE); } else { XML::addElement($doc, $entry, "activity:object-type", Activity\ObjectType::COMMENT); @@ -1194,7 +1198,7 @@ class DFRN Logger::log('dfrn_deliver: ' . $url); - $curlResult = Network::curl($url); + $curlResult = DI::httpRequest()->get($url); if ($curlResult->isTimeout()) { return -2; // timed out @@ -1341,9 +1345,9 @@ class DFRN } - Logger::log('dfrn_deliver: ' . "SENDING: " . print_r($postvars, true), Logger::DATA); + Logger::debug('dfrn_deliver', ['post' => $postvars]); - $postResult = Network::post($contact['notify'], $postvars); + $postResult = DI::httpRequest()->post($contact['notify'], $postvars); $xml = $postResult->getBody(); @@ -1410,7 +1414,7 @@ class DFRN } } - $fcontact = Diaspora::personByHandle($contact['addr']); + $fcontact = FContact::getByURL($contact['addr']); if (empty($fcontact)) { Logger::log('Unable to find contact details for ' . $contact['id'] . ' - ' . $contact['addr']); return -22; @@ -1440,7 +1444,7 @@ class DFRN $content_type = ($public_batch ? "application/magic-envelope+xml" : "application/json"); - $postResult = Network::post($dest_url, $envelope, ["Content-Type: ".$content_type]); + $postResult = DI::httpRequest()->post($dest_url, $envelope, ["Content-Type: " . $content_type]); $xml = $postResult->getBody(); $curl_stat = $postResult->getReturnCode(); @@ -1495,8 +1499,9 @@ 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` != ?", - $importer["importer_uid"], Strings::normaliseLink($author["link"]), Protocol::STATUSNET]; + $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]; $contact_old = DBA::selectFirst('contact', $fields, $condition); if (DBA::isResult($contact_old)) { @@ -1508,8 +1513,9 @@ class DFRN } $author["contact-unknown"] = true; - $author["contact-id"] = $importer["id"]; - $author["network"] = $importer["network"]; + $contact = Contact::getByURL($author["link"], null, ["id", "network"]); + $author["contact-id"] = $contact["id"] ?? $importer["id"]; + $author["network"] = $contact["network"] ?? $importer["network"]; $onlyfetch = true; } @@ -1560,7 +1566,7 @@ class DFRN 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); - $poco = ["url" => $contact_old["url"]]; + $poco = ["url" => $contact_old["url"], "network" => $contact_old["network"]]; // When was the last change to name or uri? $name_element = $xpath->query($element . "/atom:name", $context)->item(0); @@ -1680,27 +1686,12 @@ class DFRN $condition = ['uid' => 0, 'nurl' => Strings::normaliseLink($contact_old['url'])]; DBA::update('contact', $fields, $condition, true); - Contact::updateAvatar($author['avatar'], $importer['importer_uid'], $contact['id']); + Contact::updateAvatar($contact['id'], $author['avatar']); $pcid = Contact::getIdForURL($contact_old['url']); if (!empty($pcid)) { - Contact::updateAvatar($author['avatar'], 0, $pcid); + Contact::updateAvatar($pcid, $author['avatar']); } - - /* - * The generation is a sign for the reliability of the provided data. - * It is used in the socgraph.php to prevent that old contact data - * that was relayed over several servers can overwrite contact - * data that we received directly. - */ - - $poco["generation"] = 2; - $poco["photo"] = $author["avatar"]; - $poco["hide"] = $hide; - $poco["contact-type"] = $contact["contact-type"]; - $gcid = GContact::update($poco); - - GContact::link($gcid, $importer["importer_uid"], $contact["id"]); } return $author; @@ -1777,15 +1768,15 @@ class DFRN $msg = []; $msg["uid"] = $importer["importer_uid"]; - $msg["from-name"] = $xpath->query("dfrn:sender/dfrn:name/text()", $mail)->item(0)->nodeValue; - $msg["from-url"] = $xpath->query("dfrn:sender/dfrn:uri/text()", $mail)->item(0)->nodeValue; - $msg["from-photo"] = $xpath->query("dfrn:sender/dfrn:avatar/text()", $mail)->item(0)->nodeValue; + $msg["from-name"] = XML::getFirstValue($xpath, "dfrn:sender/dfrn:name/text()", $mail); + $msg["from-url"] = XML::getFirstValue($xpath, "dfrn:sender/dfrn:uri/text()", $mail); + $msg["from-photo"] = XML::getFirstValue($xpath, "dfrn:sender/dfrn:avatar/text()", $mail); $msg["contact-id"] = $importer["id"]; - $msg["uri"] = $xpath->query("dfrn:id/text()", $mail)->item(0)->nodeValue; - $msg["parent-uri"] = $xpath->query("dfrn:in-reply-to/text()", $mail)->item(0)->nodeValue; - $msg["created"] = DateTimeFormat::utc($xpath->query("dfrn:sentdate/text()", $mail)->item(0)->nodeValue); - $msg["title"] = $xpath->query("dfrn:subject/text()", $mail)->item(0)->nodeValue; - $msg["body"] = $xpath->query("dfrn:content/text()", $mail)->item(0)->nodeValue; + $msg["uri"] = XML::getFirstValue($xpath, "dfrn:id/text()", $mail); + $msg["parent-uri"] = XML::getFirstValue($xpath, "dfrn:in-reply-to/text()", $mail); + $msg["created"] = DateTimeFormat::utc(XML::getFirstValue($xpath, "dfrn:sentdate/text()", $mail)); + $msg["title"] = XML::getFirstValue($xpath, "dfrn:subject/text()", $mail); + $msg["body"] = XML::getFirstValue($xpath, "dfrn:content/text()", $mail); Mail::insert($msg); } @@ -1802,91 +1793,13 @@ class DFRN */ private static function processSuggestion($xpath, $suggestion, $importer) { - Logger::log('Processing suggestions'); - - /// @TODO Rewrite this to one statement - $suggest = []; - $suggest['uid'] = $importer['importer_uid']; - $suggest['cid'] = $importer['id']; - $suggest['url'] = $xpath->query('dfrn:url/text()', $suggestion)->item(0)->nodeValue; - $suggest['name'] = $xpath->query('dfrn:name/text()', $suggestion)->item(0)->nodeValue; - $suggest['photo'] = $xpath->query('dfrn:photo/text()', $suggestion)->item(0)->nodeValue; - $suggest['request'] = $xpath->query('dfrn:request/text()', $suggestion)->item(0)->nodeValue; - $suggest['body'] = $xpath->query('dfrn:note/text()', $suggestion)->item(0)->nodeValue; - - // Does our member already have a friend matching this description? - - /* - * The valid result means the friend we're about to send a friend - * suggestion already has them in their contact, which means no further - * action is required. - * - * @see https://github.com/friendica/friendica/pull/3254#discussion_r107315246 - */ - $condition = ['nurl' => Strings::normaliseLink($suggest['url']), 'uid' => $suggest['uid']]; - if (DBA::exists('contact', $condition)) { - return false; - } - // Do we already have an fcontact record for this person? - - $fid = 0; - $fcontact = DBA::selectFirst('fcontact', ['id'], ['url' => $suggest['url']]); - if (DBA::isResult($fcontact)) { - $fid = $fcontact['id']; - - // OK, we do. Do we already have an introduction for this person? - if (DBA::exists('intro', ['uid' => $suggest['uid'], 'fid' => $fid])) { - /* - * The valid result means the friend we're about to send a friend - * suggestion already has them in their contact, which means no further - * action is required. - * - * @see https://github.com/friendica/friendica/pull/3254#discussion_r107315246 - */ - return false; - } - } - - if (!$fid) { - $fields = ['name' => $suggest['name'], 'url' => $suggest['url'], - 'photo' => $suggest['photo'], 'request' => $suggest['request']]; - DBA::insert('fcontact', $fields); - $fid = DBA::lastInsertId(); - } + Logger::notice('Processing suggestions'); - /* - * If no record in fcontact is found, below INSERT statement will not - * link an introduction to it. - */ - if (empty($fid)) { - // Database record did not get created. Quietly give up. - exit(); - } - - $hash = Strings::getRandomHex(); - - $fields = ['uid' => $suggest['uid'], 'fid' => $fid, 'contact-id' => $suggest['cid'], - 'note' => $suggest['body'], 'hash' => $hash, 'datetime' => DateTimeFormat::utcNow(), 'blocked' => false]; - DBA::insert('intro', $fields); - - notification( - [ - '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' => DI::baseUrl().'/notifications/intros', - 'source_name' => $importer['name'], - 'source_link' => $importer['url'], - 'source_photo' => $importer['photo'], - 'verb' => Activity::REQ_FRIEND, - 'otype' => 'intro'] - ); + $url = $xpath->evaluate('string(dfrn:url[1]/text())', $suggestion); + $cid = Contact::getIdForURL($url); + $note = $xpath->evaluate('string(dfrn:note[1]/text())', $suggestion); - return true; + return FContact::addSuggestion($importer['importer_uid'], $cid, $importer['id'], $note); } /** @@ -1943,15 +1856,6 @@ class DFRN $old = $r[0]; - // Update the gcontact entry - $relocate["server_url"] = preg_replace("=(https?://)(.*)/profile/(.*)=ism", "$1$2", $relocate["url"]); - - $fields = ['name' => $relocate["name"], 'photo' => $relocate["avatar"], - 'url' => $relocate["url"], 'nurl' => Strings::normaliseLink($relocate["url"]), - 'addr' => $relocate["addr"], 'connect' => $relocate["addr"], - 'notify' => $relocate["notify"], 'server_url' => $relocate["server_url"]]; - DBA::update('gcontact', $fields, ['nurl' => Strings::normaliseLink($old["url"])]); - // 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"]), @@ -1962,7 +1866,7 @@ class DFRN DBA::update('contact', $fields, $condition); - Contact::updateAvatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true); + Contact::updateAvatar($importer["id"], $relocate["avatar"], true); Logger::log('Contacts are updated.'); @@ -2110,7 +2014,7 @@ class DFRN $author = DBA::selectFirst('contact', ['name', 'thumb', 'url'], ['id' => $item['author-id']]); $parent = Item::selectFirst(['id'], ['uri' => $item['parent-uri'], 'uid' => $importer["importer_uid"]]); - $item["parent"] = $parent['id']; + $item['parent'] = $parent['id']; // send a notification notification( @@ -2129,7 +2033,7 @@ class DFRN "verb" => $item["verb"], "otype" => "person", "activity" => $verb, - "parent" => $item["parent"]] + "parent" => $item['parent']] ); } } @@ -2186,6 +2090,7 @@ class DFRN || ($item["verb"] == Activity::ATTEND) || ($item["verb"] == Activity::ATTENDNO) || ($item["verb"] == Activity::ATTENDMAYBE) + || ($item["verb"] == Activity::ANNOUNCE) ) { $is_like = true; $item["gravity"] = GRAVITY_ACTIVITY; @@ -2278,6 +2183,25 @@ class DFRN } } + /** + * Checks if an incoming message is wanted + * + * @param array $item + * @return boolean Is the message wanted? + */ + private static function isSolicitedMessage(array $item) + { + 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"]]); + 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); + } + /** * Processes the entry elements which contain the items and comments * @@ -2384,7 +2308,11 @@ class DFRN // We store the data from "dfrn:diaspora_signature" in a different table, this is done in "Item::insert" $dsprsig = XML::unescape(XML::getFirstNodeValue($xpath, "dfrn:diaspora_signature/text()", $entry)); if ($dsprsig != "") { - $item["dsprsig"] = $dsprsig; + $signature = json_decode(base64_decode($dsprsig)); + // We don't store the old style signatures anymore that also contained the "signature" and "signer" + if (!empty($signature->signed_text) && empty($signature->signature) && empty($signature->signer)) { + $item["diaspora_signed_text"] = $signature->signed_text; + } } $item["verb"] = XML::getFirstNodeValue($xpath, "activity:verb/text()", $entry); @@ -2424,7 +2352,8 @@ class DFRN if (($term != "") && ($scheme != "")) { $parts = explode(":", $scheme); if ((count($parts) >= 4) && (array_shift($parts) == "X-DFRN")) { - $termurl = implode(":", $parts); + $termurl = array_pop($parts); + $termurl = array_pop($parts) . ':' . $termurl; Tag::store($item['uri-id'], Tag::IMPLICIT_MENTION, $term, $termurl); } } @@ -2462,6 +2391,14 @@ class DFRN } } + // 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; + } + } + // Get the type of the item (Top level post, reply or remote reply) $entrytype = self::getEntryType($importer, $item); @@ -2548,6 +2485,11 @@ 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; + } + $posted_id = Item::insert($item); if ($posted_id) { Logger::log("Reply from contact ".$item["contact-id"]." was stored with id ".$posted_id, Logger::DEBUG); @@ -2584,7 +2526,7 @@ class DFRN // Turn this into a wall post. $notify = Item::isRemoteSelf($importer, $item); - $posted_id = Item::insert($item, false, $notify); + $posted_id = Item::insert($item, $notify); if ($notify) { $posted_id = $notify; @@ -2629,7 +2571,7 @@ class DFRN } $condition = ['uri' => $uri, 'uid' => $importer["importer_uid"]]; - $item = Item::selectFirst(['id', 'parent', 'contact-id', 'file', 'deleted'], $condition); + $item = Item::selectFirst(['id', 'parent', 'contact-id', 'file', 'deleted', 'gravity'], $condition); if (!DBA::isResult($item)) { Logger::log("Item with uri " . $uri . " for user " . $importer["importer_uid"] . " wasn't found.", Logger::DEBUG); return; @@ -2641,13 +2583,13 @@ class DFRN } // When it is a starting post it has to belong to the person that wants to delete it - if (($item['id'] == $item['parent']) && ($item['contact-id'] != $importer["id"])) { + 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); return; } // Comments can be deleted by the thread owner or comment owner - if (($item['id'] != $item['parent']) && ($item['contact-id'] != $importer["id"])) { + 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); @@ -2897,14 +2839,13 @@ class DFRN * Checks if the given contact url does support DFRN * * @param string $url profile url - * @param boolean $update Update the profile * @return boolean * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ - public static function isSupportedByContactUrl($url, $update = false) + public static function isSupportedByContactUrl($url) { - $probe = Probe::uri($url, Protocol::DFRN, 0, !$update); + $probe = Probe::uri($url, Protocol::DFRN); return $probe['network'] == Protocol::DFRN; } }