Remote self is now working for diaspora contacts as well.

[friendica.git] / include / items.php

diff --git a/include/items.php b/include/items.php
index 2999a535b43827d49f7f453c3475882f572403d8..ac7e34286d1bb1e6769b6e8455745dbf27376e08 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -2598,52 +2598,10 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 
                                // This is my contact on another system, but it's really me.
                                // Turn this into a wall post.
-
-                               if($contact['remote_self'] AND (($contact['network'] === NETWORK_FEED) OR !$datarray['private'])) {
-                                       if ($contact['remote_self'] == 1)
-                                               // Prevent that forwarded posts will be forwarded again
-                                               $notify = (normalise_link($datarray['author-link']) == normalise_link($datarray['owner-link']));
-                                       elseif ($contact['remote_self'] == 2) {
-                                               $r = q("SELECT `id`,`url`,`name`,`photo`,`network` FROM `contact` WHERE `uid` = %d AND `self`", intval($importer['uid']));
-                                               if (count($r)) {
-                                                       $datarray['contact-id'] = $r[0]["id"];
-
-                                                       $datarray['owner-name'] = $r[0]["name"];
-                                                       $datarray['owner-link'] = $r[0]["url"];
-                                                       $datarray['owner-avatar'] = $r[0]["photo"];
-
-                                                       $datarray['author-name']   = $datarray['owner-name'];
-                                                       $datarray['author-link']   = $datarray['owner-link'];
-                                                       $datarray['author-avatar'] = $datarray['owner-avatar'];
-                                               }
-                                               $notify = true;
-                                       }
-
-                                       if ($contact['network'] === NETWORK_FEED)
-                                               $datarray['private'] = 0;
-                                       elseif ($notify) {
-                                               // At first store the original post
-                                               $r = item_store($datarray, false, false);
-
-                                               // Then create a new guid and uri and post it again as a forwarded post
-                                               $datarray["guid"] = get_guid(32);
-                                               $datarray["uri"] = item_new_uri($a->get_hostname(),$importer['uid']);
-                                               $r = q("SELECT `id`,`url`,`name`,`photo`,`network` FROM `contact` WHERE `uid` = %d AND `self`", intval($importer['uid']));
-                                               if (count($r)) {
-                                                       $datarray['contact-id'] = $r[0]["id"];
-
-                                                       $datarray['owner-name'] = $r[0]["name"];
-                                                       $datarray['owner-link'] = $r[0]["url"];
-                                                       $datarray['owner-avatar'] = $r[0]["photo"];
-                                               }
-                                       }
-
-                                       if (!isset($datarray["app"]) OR ($datarray["app"] == ""))
-                                               $datarray["app"] = network_to_name($contact['network']);
-                               } else
-                                       $notify = false;
+                               $notify = item_is_remote_self($contact, $datarray);
 
                                $r = item_store($datarray, false, $notify);
+                               logger('Stored - Contact '.$contact['url'].' Notify '.$notify.' return '.$r.' Item '.print_r($datarray, true), LOGGER_DEBUG);
                                continue;
 
                        }
@@ -2651,10 +2609,69 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
        }
 }
 
+function item_is_remote_self($contact, &$datarray) {
+       $a = get_app();
+
+       if (!$contact['remote_self'])
+               return false;
+
+       // Prevent the forwarding of posts that are forwarded
+       if (in_array($datarray["extid"], array(NETWORK_DFRN, NETWORK_DIASPORA)))
+               return false;
+
+       // Prevent to forward already forwarded posts
+       if ($datarray["app"] == $a->get_hostname())
+               return false;
+
+       if (($contact['network'] != NETWORK_FEED) AND $datarray['private'])
+               return false;
+
+       $datarray2 = $datarray;
+       logger('remote-self start - Contact '.$contact['url'].' - '.$contact['remote_self'].' Item '.print_r($datarray, true), LOGGER_DEBUG);
+       if ($contact['remote_self'] == 2) {
+               $r = q("SELECT `id`,`url`,`name`,`photo`,`network` FROM `contact` WHERE `uid` = %d AND `self`",
+                       intval($contact['uid']));
+               if (count($r)) {
+                       $datarray['contact-id'] = $r[0]["id"];
+
+                       $datarray['owner-name'] = $r[0]["name"];
+                       $datarray['owner-link'] = $r[0]["url"];
+                       $datarray['owner-avatar'] = $r[0]["avatar"];
+
+                       $datarray['author-name']   = $datarray['owner-name'];
+                       $datarray['author-link']   = $datarray['owner-link'];
+                       $datarray['author-avatar'] = $datarray['owner-avatar'];
+               }
+
+               if ($contact['network'] != NETWORK_FEED) {
+                       $datarray["guid"] = get_guid(32);
+                       unset($datarray["plink"]);
+                       $datarray["uri"] = item_new_uri($a->get_hostname(),$contact['uid']);
+                       $datarray["parent-uri"] = $datarray["uri"];
+                       $datarray["extid"] = $contact['network'];
+                       $urlpart = parse_url($datarray2['author-link']);
+                       $datarray["app"] = $urlpart["host"];
+               } else
+                       $datarray['private'] = 0;
+       }
+
+       //if (!isset($datarray["app"]) OR ($datarray["app"] == ""))
+       //      $datarray["app"] = network_to_name($contact['network']);
+
+       if ($contact['network'] != NETWORK_FEED) {
+               // Store the original post
+               $r = item_store($datarray2, false, false);
+               logger('remote-self post original item - Contact '.$contact['url'].' return '.$r.' Item '.print_r($datarray2, true), LOGGER_DEBUG);
+       } else
+               $datarray["app"] = "Feed";
+
+       return true;
+}
+
 function local_delivery($importer,$data) {
        $a = get_app();
 
-    logger(__function__, LOGGER_TRACE);
+       logger(__function__, LOGGER_TRACE);
 
        if($importer['readonly']) {
                // We aren't receiving stuff from this person. But we will quietly ignore them
@@ -3732,27 +3749,7 @@ function local_delivery($importer,$data) {
 
                        // This is my contact on another system, but it's really me.
                        // Turn this into a wall post.
-
-                       if($importer['remote_self']) {
-                               if ($importer['remote_self'] == 2) {
-                                       $r = q("SELECT `id`,`url`,`name`,`photo`,`network` FROM `contact` WHERE `uid` = %d AND `self`",
-                                               intval($importer['importer_uid']));
-                                       if (count($r)) {
-                                               $datarray['contact-id'] = $r[0]["id"];
-
-                                               $datarray['owner-name'] = $r[0]["name"];
-                                               $datarray['owner-link'] = $r[0]["url"];
-                                               $datarray['owner-avatar'] = $r[0]["photo"];
-
-                                               $datarray['author-name']   = $datarray['owner-name'];
-                                               $datarray['author-link']   = $datarray['owner-link'];
-                                               $datarray['author-avatar'] = $datarray['owner-avatar'];
-                                       }
-                               }
-
-                               $notify = true;
-                       } else
-                               $notify = false;
+                       $notify = item_is_remote_self($importer, $datarray);
 
                        $posted_id = item_store($datarray, false, $notify);