Merge pull request #3797 from rabuzarus/20171015_-_duplicate_event

[friendica.git] / include / dfrn.php

diff --git a/include/dfrn.php b/include/dfrn.php
index eb0f9fbb4ee0d0fd7513095f053d31f83e8f246b..55c51cb0118a69fd482b2f61c13a9046656647c0 100644 (file)
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -289,10 +289,17 @@ class dfrn {
         * @brief Generate an atom entry for a given item id
         *
         * @param int $item_id The item id
+        * @param boolean $conversation Show the conversation. If false show the single post.
         *
         * @return string DFRN feed entry
         */
-       public static function itemFeed($item_id) {
+       public static function itemFeed($item_id, $conversation = false) {
+               if ($conversation) {
+                       $condition = '`item`.`parent`';
+               } else {
+                       $condition = '`item`.`id`';
+               }
+
                $r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
                        `contact`.`name`, `contact`.`network`, `contact`.`photo`, `contact`.`url`,
                        `contact`.`name-date`, `contact`.`uri-date`, `contact`.`avatar-date`,
@@ -302,8 +309,9 @@ class dfrn {
                        STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
                                AND (NOT `contact`.`blocked` OR `contact`.`pending`)
                        LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id`
-                       WHERE `item`.`id` = %d AND `item`.`visible` AND NOT `item`.`moderated` AND `item`.`parent` != 0
+                       WHERE %s = %d AND `item`.`visible` AND NOT `item`.`moderated` AND `item`.`parent` != 0
                        AND NOT `item`.`private`",
+                       $condition,
                        intval($item_id)
                );
 
@@ -311,6 +319,7 @@ class dfrn {
                        killme();
                }
 
+               $items = $r;
                $item = $r[0];
 
                $r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`, `user`.`account-type`
@@ -327,12 +336,31 @@ class dfrn {
 
                $doc = new DOMDocument('1.0', 'utf-8');
                $doc->formatOutput = true;
+               $type = 'html';
 
-               $alternatelink = $owner['url'];
+               if ($conversation) {
+                       $root = $doc->createElementNS(NAMESPACE_ATOM1, 'feed');
+                       $doc->appendChild($root);
 
-               $type = 'html';
+                       $root->setAttribute("xmlns:thr", NAMESPACE_THREAD);
+                       $root->setAttribute("xmlns:at", NAMESPACE_TOMB);
+                       $root->setAttribute("xmlns:media", NAMESPACE_MEDIA);
+                       $root->setAttribute("xmlns:dfrn", NAMESPACE_DFRN);
+                       $root->setAttribute("xmlns:activity", NAMESPACE_ACTIVITY);
+                       $root->setAttribute("xmlns:georss", NAMESPACE_GEORSS);
+                       $root->setAttribute("xmlns:poco", NAMESPACE_POCO);
+                       $root->setAttribute("xmlns:ostatus", NAMESPACE_OSTATUS);
+                       $root->setAttribute("xmlns:statusnet", NAMESPACE_STATUSNET);
+
+                       //$root = self::add_header($doc, $owner, "dfrn:owner", "", false);
 
-               $root = self::entry($doc, $type, $item, $owner, true, 0, true);
+                       foreach ($items as $item) {
+                               $entry = self::entry($doc, $type, $item, $owner, true, 0);
+                               $root->appendChild($entry);
+                       }
+               } else {
+                       $root = self::entry($doc, $type, $item, $owner, true, 0, true);
+               }
 
                $atom = trim($doc->saveXML());
                return $atom;