Merge pull request #8733 from annando/fix-notice

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

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 74352906de6266f0248124d9b6608ebf0463e86e..10541c0e3e47ed710470681b807c8f24cecdccf3 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) {
@@ -956,7 +951,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);
@@ -965,7 +960,7 @@ 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",
@@ -1064,7 +1059,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);
@@ -2115,7 +2110,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(
@@ -2134,7 +2129,7 @@ class DFRN
                                        "verb"         => $item["verb"],
                                        "otype"        => "person",
                                        "activity"     => $verb,
-                                       "parent"       => $item["parent"]]
+                                       "parent"       => $item['parent']]
                                );
                        }
                }
@@ -2389,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);
@@ -2429,7 +2428,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);
                                        }
                                }
@@ -2589,7 +2589,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;
@@ -2634,7 +2634,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;
@@ -2646,13 +2646,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);