repeated items from ostatus and diaspora are now using the share-element.

[friendica.git] / include / items.php

diff --git a/include/items.php b/include/items.php
index fb7a7e25d153d8bd5a93a626a388fac9d23257a3..5bd4423cfadc8a318552af0b0e3f84ef9ad6f2a4 100755 (executable)
--- a/include/items.php
+++ b/include/items.php
@@ -798,6 +798,7 @@ function get_atom_elements($feed,$item) {
                logger('get_atom_elements: Looking for status.net repeated message');
 
                $message = $child["http://activitystrea.ms/spec/1.0/"]["object"][0]["child"][SIMPLEPIE_NAMESPACE_ATOM_10]["content"][0]["data"];
+               $orig_uri = $child["http://activitystrea.ms/spec/1.0/"]["object"][0]["child"][SIMPLEPIE_NAMESPACE_ATOM_10]["id"][0]["data"];
                $author = $child[SIMPLEPIE_NAMESPACE_ATOM_10]["author"][0]["child"][SIMPLEPIE_NAMESPACE_ATOM_10];
                $uri = $author["uri"][0]["data"];
                $name = $author["name"][0]["data"];
@@ -805,17 +806,22 @@ function get_atom_elements($feed,$item) {
                $avatar = $avatar["href"];
 
                if (($name != "") and ($uri != "") and ($avatar != "") and ($message != "")) {
-                       logger('get_atom_elements: fixing sender of repeated message');
+                       logger('get_atom_elements: fixing sender of repeated message. '.print_r($child, true));
 
-                       $res["owner-name"] = $res["author-name"];
+                       /*$res["owner-name"] = $res["author-name"];
                        $res["owner-link"] = $res["author-link"];
                        $res["owner-avatar"] = $res["author-avatar"];
 
                        $res["author-name"] = $name;
                        $res["author-link"] = $uri;
-                       $res["author-avatar"] = $avatar;
+                       $res["author-avatar"] = $avatar;*/
 
-                       $res["body"] = html2bbcode($message);
+                       $prefix = "[share author='".$name.
+                                       "' profile='".$uri.
+                                       "' avatar='".$avatar.
+                                       "' link='".$orig_uri."']";
+
+                       $res["body"] = $prefix.html2bbcode($message)."[/share]";
                }
        }