Merge pull request #8629 from annando/item-insert

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

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index f65a202f4818b8967b226346df7837503d0b1a11..7d8bc9dc59be756c84686e3db5639c418c86f8e3 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -39,9 +39,9 @@ use Friendica\Model\ItemURI;
 use Friendica\Model\Mail;
 use Friendica\Model\Notify\Type;
 use Friendica\Model\PermissionSet;
+use Friendica\Model\Post\Category;
 use Friendica\Model\Profile;
 use Friendica\Model\Tag;
-use Friendica\Model\Term;
 use Friendica\Model\User;
 use Friendica\Network\Probe;
 use Friendica\Util\Crypto;
@@ -241,13 +241,8 @@ class DFRN
                }
 
                if (isset($category)) {
-                       $sql_post_table = sprintf(
-                               "INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
-                               DBA::escape(Strings::protectSprintf($category)),
-                               intval(Term::OBJECT_TYPE_POST),
-                               intval(Term::CATEGORY),
-                               intval($owner_id)
-                       );
+                       $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) {
@@ -805,7 +800,7 @@ class DFRN
                if ($activity) {
                        $entry = $doc->createElement($element);
 
-                       $r = XML::parseString($activity, false);
+                       $r = XML::parseString($activity);
                        if (!$r) {
                                return false;
                        }
@@ -831,7 +826,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 = [];
@@ -1080,21 +1075,15 @@ class DFRN
                        $entry->appendChild($actarg);
                }
 
-               $tags = Item::getFeedTags($item);
+               $tags = Tag::getByURIId($item['uri-id']);
 
-               /// @TODO Combine this with similar below if() block?
                if (count($tags)) {
-                       foreach ($tags as $t) {
-                               if (($type != 'html') || ($t[0] != "@")) {
-                                       XML::addElement($doc, $entry, "category", "", ["scheme" => "X-DFRN:".$t[0].":".$t[1], "term" => $t[2]]);
+                       foreach ($tags as $tag) {
+                               if (($type != 'html') || ($tag['type'] == Tag::HASHTAG)) {
+                                       XML::addElement($doc, $entry, "category", "", ["scheme" => "X-DFRN:" . Tag::TAG_CHARACTER[$tag['type']] . ":" . $tag['url'], "term" => $tag['name']]);
                                }
-                       }
-               }
-
-               if (count($tags)) {
-                       foreach ($tags as $t) {
-                               if ($t[0] == "@") {
-                                       $mentioned[$t[1]] = $t[1];
+                               if ($tag['type'] != Tag::HASHTAG) {
+                                       $mentioned[$tag['url']] = $tag['url'];
                                }
                        }
                }
@@ -2007,7 +1996,7 @@ class DFRN
                        }
 
                        $fields = ['title' => $item['title'] ?? '', 'body' => $item['body'] ?? '',
-                                       'tag' => $item['tag'] ?? '', 'changed' => DateTimeFormat::utcNow(),
+                                       'changed' => DateTimeFormat::utcNow(),
                                        'edited' => DateTimeFormat::utc($item["edited"])];
 
                        $condition = ["`uri` = ? AND `uid` IN (0, ?)", $item["uri"], $importer["importer_uid"]];
@@ -2101,7 +2090,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?
@@ -2224,8 +2213,8 @@ 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', 'uri-id', 'tag'], ['uri' => $xt->id, 'uid' => $importer["importer_uid"]]);
@@ -2238,11 +2227,6 @@ 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"]]);
-                                               }
                                        }
                                }
                        }
@@ -2400,7 +2384,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);
@@ -2413,7 +2401,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;
                        }
@@ -2440,17 +2428,7 @@ class DFRN
                                if (($term != "") && ($scheme != "")) {
                                        $parts = explode(":", $scheme);
                                        if ((count($parts) >= 4) && (array_shift($parts) == "X-DFRN")) {
-                                               $termhash = array_shift($parts);
                                                $termurl = implode(":", $parts);
-
-                                               if (!empty($item["tag"])) {
-                                                       $item["tag"] .= ",";
-                                               } else {
-                                                       $item["tag"] = "";
-                                               }
-
-                                               $item["tag"] .= $termhash . "[url=" . $termurl . "]" . $term . "[/url]";
-
                                                Tag::store($item['uri-id'], Tag::IMPLICIT_MENTION, $term, $termurl);
                                        }
                                }
@@ -2610,7 +2588,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;