The "share" handling is improved

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

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 7caf8ac63455bf9878ce1150cf1f0aeda99f36cd..8fe3c5556ef6b5b3ef65ca43321b3118b412ecf8 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -25,6 +25,7 @@ use DOMDocument;
 use DOMElement;
 use DOMNode;
 use DOMXPath;
+use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
@@ -369,8 +370,8 @@ class DFRN
                XML::addElement($doc, $root, 'id', DI::baseUrl() . '/profile/' . $owner['nick']);
                XML::addElement($doc, $root, 'title', $owner['name']);
 
-               $attributes = ['uri' => 'https://friendi.ca', 'version' => FRIENDICA_VERSION . '-' . DB_UPDATE_VERSION];
-               XML::addElement($doc, $root, 'generator', FRIENDICA_PLATFORM, $attributes);
+               $attributes = ['uri' => 'https://friendi.ca', 'version' => App::VERSION . '-' . DB_UPDATE_VERSION];
+               XML::addElement($doc, $root, 'generator', App::PLATFORM, $attributes);
 
                $attributes = ['rel' => 'license', 'href' => 'http://creativecommons.org/licenses/by/3.0/'];
                XML::addElement($doc, $root, 'link', '', $attributes);
@@ -799,7 +800,7 @@ class DFRN
                $dfrnowner = self::addEntryAuthor($doc, "dfrn:owner", $item["owner-link"], $item);
                $entry->appendChild($dfrnowner);
 
-               if ($item['gravity'] != GRAVITY_PARENT) {
+               if ($item['gravity'] != Item::GRAVITY_PARENT) {
                        $parent = Post::selectFirst(['guid', 'plink'], ['uri' => $item['thr-parent'], 'uid' => $item['uid']]);
                        if (DBA::isResult($parent)) {
                                $attributes = ["ref" => $item['thr-parent'], "type" => "text/html",
@@ -888,7 +889,7 @@ class DFRN
 
                if ($item['object-type'] != '') {
                        XML::addElement($doc, $entry, 'activity:object-type', $item['object-type']);
-               } elseif ($item['gravity'] == GRAVITY_PARENT) {
+               } elseif ($item['gravity'] == Item::GRAVITY_PARENT) {
                        XML::addElement($doc, $entry, 'activity:object-type', Activity\ObjectType::NOTE);
                } else {
                        XML::addElement($doc, $entry, 'activity:object-type', Activity\ObjectType::COMMENT);
@@ -1612,21 +1613,21 @@ class DFRN
                                || ($item['verb'] == Activity::ATTENDMAYBE)
                                || ($item['verb'] == Activity::ANNOUNCE)
                        ) {
-                               $item['gravity'] = GRAVITY_ACTIVITY;
+                               $item['gravity'] = Item::GRAVITY_ACTIVITY;
                                // only one like or dislike per person
                                // split into two queries for performance issues
                                $condition = [
-                                       'uid' => $item['uid'],
-                                       'author-id' => $item['author-id'],
-                                       'gravity' => GRAVITY_ACTIVITY,
-                                       'verb' => $item['verb'],
+                                       'uid'        => $item['uid'],
+                                       'author-id'  => $item['author-id'],
+                                       'gravity'    => Item::GRAVITY_ACTIVITY,
+                                       'verb'       => $item['verb'],
                                        'parent-uri' => $item['thr-parent'],
                                ];
                                if (Post::exists($condition)) {
                                        return false;
                                }
 
-                               $condition = ['uid' => $item['uid'], 'author-id' => $item['author-id'], 'gravity' => GRAVITY_ACTIVITY,
+                               $condition = ['uid' => $item['uid'], 'author-id' => $item['author-id'], 'gravity' => Item::GRAVITY_ACTIVITY,
                                        'verb' => $item['verb'], 'thr-parent' => $item['thr-parent']];
                                if (Post::exists($condition)) {
                                        return false;
@@ -1938,7 +1939,7 @@ class DFRN
 
                // Now assign the rest of the values that depend on the type of the message
                if (in_array($entrytype, [self::REPLY, self::REPLY_RC])) {
-                       $item['gravity'] = GRAVITY_COMMENT;
+                       $item['gravity'] = Item::GRAVITY_COMMENT;
 
                        if (!isset($item['object-type'])) {
                                $item['object-type'] = Activity\ObjectType::COMMENT;
@@ -1961,13 +1962,10 @@ class DFRN
                        }
                }
 
-               // Ensure to have the correct share data
-               $item = Item::addShareDataFromOriginal($item);
-
                if ($entrytype == self::REPLY_RC) {
                        $item['wall'] = 1;
                } elseif ($entrytype == self::TOP_LEVEL) {
-                       $item['gravity'] = GRAVITY_PARENT;
+                       $item['gravity'] = Item::GRAVITY_PARENT;
 
                        if (!isset($item['object-type'])) {
                                $item['object-type'] = Activity\ObjectType::NOTE;
@@ -2037,7 +2035,7 @@ class DFRN
                                        Logger::info('Contact is not sharing with the user', ['uid' => $item['uid'], 'owner-id' => $item['owner-id'], 'author-id' => $item['author-id'], 'gravity' => $item['gravity'], 'uri' => $item['uri']]);
                                        return;
                                }
-                               if (($item['gravity'] == GRAVITY_ACTIVITY) && DI::pConfig()->get($item['uid'], 'system', 'accept_only_sharer') == Item::COMPLETION_COMMENT) {
+                               if (($item['gravity'] == Item::GRAVITY_ACTIVITY) && DI::pConfig()->get($item['uid'], 'system', 'accept_only_sharer') == Item::COMPLETION_COMMENT) {
                                        Logger::info('Completion is set to "comment", but this is an activity. so we stop here.', ['uid' => $item['uid'], 'owner-id' => $item['owner-id'], 'author-id' => $item['author-id'], 'gravity' => $item['gravity'], 'uri' => $item['uri']]);
                                        return;
                                }
@@ -2122,13 +2120,13 @@ class DFRN
                }
 
                // When it is a starting post it has to belong to the person that wants to delete it
-               if (($item['gravity'] == GRAVITY_PARENT) && ($item['contact-id'] != $importer['id'])) {
+               if (($item['gravity'] == Item::GRAVITY_PARENT) && ($item['contact-id'] != $importer['id'])) {
                        Logger::info('Item with URI ' . $uri . ' do not belong to contact ' . $importer['id'] . ' - ignoring deletion.');
                        return;
                }
 
                // Comments can be deleted by the thread owner or comment owner
-               if (($item['gravity'] != GRAVITY_PARENT) && ($item['contact-id'] != $importer['id'])) {
+               if (($item['gravity'] != Item::GRAVITY_PARENT) && ($item['contact-id'] != $importer['id'])) {
                        $condition = ['id' => $item['parent'], 'contact-id' => $importer['id']];
                        if (!Post::exists($condition)) {
                                Logger::info('Item with URI ' . $uri . ' was not found or must not be deleted by contact ' . $importer['id'] . ' - ignoring deletion.');