Merge pull request #8558 from annando/corrected-view

[friendica.git] / src / Protocol / DFRN.php

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 6fb63c3d46a4c006498ed268b3aeb7c510e1bf3a..4e5aac37d990d930bbda690e221d8e2d6c3a32dd 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -35,10 +35,12 @@ use Friendica\Model\Conversation;
 use Friendica\Model\Event;
 use Friendica\Model\GContact;
 use Friendica\Model\Item;
+use Friendica\Model\ItemURI;
 use Friendica\Model\Mail;
 use Friendica\Model\Notify\Type;
 use Friendica\Model\PermissionSet;
 use Friendica\Model\Profile;
+use Friendica\Model\Tag;
 use Friendica\Model\Term;
 use Friendica\Model\User;
 use Friendica\Network\Probe;
@@ -181,19 +183,12 @@ class DFRN
 
                $sql_extra = sprintf(" AND `item`.`private` != %s ", Item::PRIVATE);
 
-               $r = q(
-                       "SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`, `user`.`account-type`
-                       FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
-                       WHERE `contact`.`self` AND `user`.`nickname` = '%s' LIMIT 1",
-                       DBA::escape($owner_nick)
-               );
-
-               if (! DBA::isResult($r)) {
+               $owner = DBA::selectFirst('owner-view', [], ['nickname' => $owner_nick]);
+               if (!DBA::isResult($owner)) {
                        Logger::log(sprintf('No contact found for nickname=%d', $owner_nick), Logger::WARNING);
                        exit();
                }
 
-               $owner = $r[0];
                $owner_id = $owner['uid'];
 
                $sql_post_table = "";
@@ -682,18 +677,10 @@ class DFRN
                }
 
                // Only show contact details when we are allowed to
-               $r = q(
-                       "SELECT `profile`.`about`, `profile`.`name`, `profile`.`homepage`, `user`.`nickname`,
-                               `user`.`timezone`, `profile`.`locality`, `profile`.`region`, `profile`.`country-name`,
-                               `profile`.`pub_keywords`, `profile`.`xmpp`, `profile`.`dob`
-                       FROM `profile`
-                               INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
-                               WHERE NOT `user`.`hidewall` AND `user`.`uid` = %d",
-                       intval($owner['uid'])
-               );
-               if (DBA::isResult($r)) {
-                       $profile = $r[0];
-
+               $profile = DBA::selectFirst('owner-view',
+                       ['about', 'name', 'homepage', 'nickname', 'timezone', 'locality', 'region', 'country-name', 'pub_keywords', 'xmpp', 'dob'],
+                       ['uid' => $owner['uid'], 'hidewall' => false]);
+               if (DBA::isResult($profile)) {
                        XML::addElement($doc, $author, "poco:displayName", $profile["name"]);
                        XML::addElement($doc, $author, "poco:updated", $namdate);
 
@@ -818,7 +805,7 @@ class DFRN
                if ($activity) {
                        $entry = $doc->createElement($element);
 
-                       $r = XML::parseString($activity, false);
+                       $r = XML::parseString($activity);
                        if (!$r) {
                                return false;
                        }
@@ -844,7 +831,7 @@ class DFRN
                                        $r->link = preg_replace('/\<link(.*?)\"\>/', '<link$1"/>', $r->link);
 
                                        // XML does need a single element as root element so we add a dummy element here
-                                       $data = XML::parseString("<dummy>" . $r->link . "</dummy>", false);
+                                       $data = XML::parseString("<dummy>" . $r->link . "</dummy>");
                                        if (is_object($data)) {
                                                foreach ($data->link as $link) {
                                                        $attributes = [];
@@ -1069,7 +1056,7 @@ class DFRN
                // The signed text contains the content in Markdown, the sender handle and the signatur for the content
                // It is needed for relayed comments to Diaspora.
                if ($item['signed_text']) {
-                       $sign = base64_encode(json_encode(['signed_text' => $item['signed_text'],'signature' => $item['signature'],'signer' => $item['signer']]));
+                       $sign = base64_encode(json_encode(['signed_text' => $item['signed_text'],'signature' => '','signer' => '']));
                        XML::addElement($doc, $entry, "dfrn:diaspora_signature", $sign);
                }
 
@@ -2114,7 +2101,7 @@ class DFRN
                if (!$verb) {
                        return;
                }
-               $xo = XML::parseString($item["object"], false);
+               $xo = XML::parseString($item["object"]);
 
                if (($xo->type == Activity\ObjectType::PERSON) && ($xo->id)) {
                        // somebody was poked/prodded. Was it me?
@@ -2237,11 +2224,11 @@ class DFRN
                        }
 
                        if (($item["verb"] == Activity::TAG) && ($item["object-type"] == Activity\ObjectType::TAGTERM)) {
-                               $xo = XML::parseString($item["object"], false);
-                               $xt = XML::parseString($item["target"], false);
+                               $xo = XML::parseString($item["object"]);
+                               $xt = XML::parseString($item["target"]);
 
                                if ($xt->type == Activity\ObjectType::NOTE) {
-                                       $item_tag = Item::selectFirst(['id', 'tag'], ['uri' => $xt->id, 'uid' => $importer["importer_uid"]]);
+                                       $item_tag = Item::selectFirst(['id', 'uri-id', 'tag'], ['uri' => $xt->id, 'uid' => $importer["importer_uid"]]);
 
                                        if (!DBA::isResult($item_tag)) {
                                                Logger::log("Query failed to execute, no result returned in " . __FUNCTION__);
@@ -2250,6 +2237,8 @@ class DFRN
 
                                        // extract tag, if not duplicate, add to parent item
                                        if ($xo->content) {
+                                               Tag::store($item_tag['uri-id'], Tag::HASHTAG, $xo->content);
+
                                                if (!stristr($item_tag["tag"], trim($xo->content))) {
                                                        $tag = $item_tag["tag"] . (strlen($item_tag["tag"]) ? ',' : '') . '#[url=' . $xo->id . ']'. $xo->content . '[/url]';
                                                        Item::update(['tag' => $tag], ['id' => $item_tag["id"]]);
@@ -2404,6 +2393,10 @@ class DFRN
 
                $item["guid"] = XML::getFirstNodeValue($xpath, "dfrn:diaspora_guid/text()", $entry);
 
+               $item['uri-id'] = ItemURI::insert(['uri' => $item['uri'], 'guid' => $item['guid']]);
+
+               Tag::storeFromBody($item['uri-id'], $item["body"]);
+
                // We store the data from "dfrn:diaspora_signature" in a different table, this is done in "Item::insert"
                $dsprsig = XML::unescape(XML::getFirstNodeValue($xpath, "dfrn:diaspora_signature/text()", $entry));
                if ($dsprsig != "") {
@@ -2420,7 +2413,7 @@ class DFRN
                $item["object"] = self::transformActivity($xpath, $object, "object");
 
                if (trim($item["object"]) != "") {
-                       $r = XML::parseString($item["object"], false);
+                       $r = XML::parseString($item["object"]);
                        if (isset($r->type)) {
                                $item["object-type"] = $r->type;
                        }
@@ -2457,6 +2450,8 @@ class DFRN
                                                }
 
                                                $item["tag"] .= $termhash . "[url=" . $termurl . "]" . $term . "[/url]";
+
+                                               Tag::store($item['uri-id'], Tag::IMPLICIT_MENTION, $term, $termurl);
                                        }
                                }
                        }