Refactor header with feed_mode

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

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index 754f4df87aebe92f7e524a96dae47a46b76ca599..0ea6512d1d026a41b69fe61ea3ce1077b208262d 100644 (file)
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -1263,10 +1263,11 @@ class OStatus
         * @param object $doc    XML document
         * @param array  $owner  Contact data of the poster
         * @param string $filter The related feed filter (activity, posts or comments)
+        * @param bool   $feed_mode Behave like a regular feed for users if true
         *
         * @return object header root element
         */
-       private static function addHeader(DOMDocument $doc, array $owner, $filter)
+       private static function addHeader(DOMDocument $doc, array $owner, $filter, $feed_mode = false)
        {
                $a = get_app();
 
@@ -1283,10 +1284,19 @@ class OStatus
                $root->setAttribute("xmlns:mastodon", NAMESPACE_MASTODON);
 
                $title = '';
+               $selfUri = '/feed/' . $owner["nick"] . '/';
                switch ($filter) {
-                       case 'activity': $title = L10n::t('%s\'s timeline', $owner['name']); break;
-                       case 'posts'   : $title = L10n::t('%s\'s posts'   , $owner['name']); break;
-                       case 'comments': $title = L10n::t('%s\'s comments', $owner['name']); break;
+                       case 'activity':
+                               $title = L10n::t('%s\'s timeline', $owner['name']);
+                               $selfUri .= $filter;
+                               break;
+                       case 'posts':
+                               $title = L10n::t('%s\'s posts', $owner['name']);
+                               break;
+                       case 'comments':
+                               $title = L10n::t('%s\'s comments', $owner['name']);
+                               $selfUri .= $filter;
+                               break;
                }
 
                $attributes = ["uri" => "https://friendi.ca", "version" => FRIENDICA_VERSION . "-" . DB_UPDATE_VERSION];
@@ -1320,8 +1330,10 @@ class OStatus
                $attributes = ["href" => System::baseUrl() . "/salmon/" . $owner["nick"], "rel" => "http://salmon-protocol.org/ns/salmon-mention"];
                XML::addElement($doc, $root, "link", "", $attributes);
 
-               $attributes = ["href" => System::baseUrl() . "/dfrn_poll/" . $owner["nick"],
-                       "rel" => "self", "type" => "application/atom+xml"];
+               if (!$feed_mode) {
+                       $selfUri = "/dfrn_poll/" . $owner["nick"];
+               }
+               $attributes = ["href" => System::baseUrl() . $selfUri, "rel" => "self", "type" => "application/atom+xml"];
                XML::addElement($doc, $root, "link", "", $attributes);
 
                if ($owner['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY) {
@@ -1874,7 +1886,7 @@ class OStatus
 
                self::entryContent($doc, $entry, $item, $owner, $title, '', true, $feed_mode);
 
-               self::entryFooter($doc, $entry, $item, $owner);
+               self::entryFooter($doc, $entry, $item, $owner, !$feed_mode, $feed_mode);
 
                return $entry;
        }
@@ -1961,11 +1973,13 @@ class OStatus
                                                                "href" => System::baseUrl()."/display/".$item["guid"]]
                );
 
-               if ($complete && ($item["id"] > 0)) {
+               if (!$feed_mode && $complete && ($item["id"] > 0)) {
                        XML::addElement($doc, $entry, "status_net", "", ["notice_id" => $item["id"]]);
                }
 
-               XML::addElement($doc, $entry, "activity:verb", $verb);
+               if (!$feed_mode) {
+                       XML::addElement($doc, $entry, "activity:verb", $verb);
+               }
 
                XML::addElement($doc, $entry, "published", DateTimeFormat::utc($item["created"]."+00:00", DateTimeFormat::ATOM));
                XML::addElement($doc, $entry, "updated", DateTimeFormat::utc($item["edited"]."+00:00", DateTimeFormat::ATOM));
@@ -1974,14 +1988,15 @@ class OStatus
        /**
         * @brief Adds the elements at the foot of an entry to the XML document
         *
-        * @param object $doc      XML document
-        * @param object $entry    The entry element where the elements are added
-        * @param array  $item     Data of the item that is to be posted
-        * @param array  $owner    Contact data of the poster
-        * @param bool   $complete default true
+        * @param object $doc       XML document
+        * @param object $entry     The entry element where the elements are added
+        * @param array  $item      Data of the item that is to be posted
+        * @param array  $owner     Contact data of the poster
+        * @param bool   $complete  default true
+        * @param bool   $feed_mode Behave like a regular feed for users if true
         * @return void
         */
-       private static function entryFooter(DOMDocument $doc, $entry, array $item, array $owner, $complete = true)
+       private static function entryFooter(DOMDocument $doc, $entry, array $item, array $owner, $complete = true, $feed_mode = false)
        {
                $mentioned = [];
 
@@ -2012,7 +2027,7 @@ class OStatus
                        XML::addElement($doc, $entry, "link", "", $attributes);
                }
 
-               if (intval($item["parent"]) > 0) {
+               if (!$feed_mode && (intval($item["parent"]) > 0)) {
                        $conversation_href = $conversation_uri = str_replace('/objects/', '/context/', $item['parent-uri']);
 
                        if (isset($parent_item)) {
@@ -2084,7 +2099,7 @@ class OStatus
                        ]);
                }
 
-               if (!$item["private"]) {
+               if (!$item["private"] && !$feed_mode) {
                        XML::addElement($doc, $entry, "link", "", ["rel" => "ostatus:attention",
                                                                        "href" => "http://activityschema.org/collection/public"]);
                        XML::addElement($doc, $entry, "link", "", ["rel" => "mentioned",
@@ -2203,7 +2218,7 @@ class OStatus
                $doc = new DOMDocument('1.0', 'utf-8');
                $doc->formatOutput = true;
 
-               $root = self::addHeader($doc, $owner, $filter);
+               $root = self::addHeader($doc, $owner, $filter, $feed_mode);
 
                foreach ($items as $item) {
                        if (Config::get('system', 'ostatus_debug')) {