missing linebreaks and a small typo

[friendica.git] / include / diaspora.php

diff --git a/include/diaspora.php b/include/diaspora.php
index af934cc937de1349865cce5794de3e5c0f4a2f23..80825273fd88333058be23fc6167855b6d3ac8bd 100644 (file)
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -1183,7 +1183,7 @@ class Diaspora {
         * @return array the item record
         */
        private static function parent_item($uid, $guid, $author, $contact) {
-               $r = q("SELECT `id`, `parent`, `body`, `wall`, `uri`, `private`, `origin`,
+               $r = q("SELECT `id`, `parent`, `body`, `wall`, `uri`, `guid`, `private`, `origin`,
                                `author-name`, `author-link`, `author-avatar`,
                                `owner-name`, `owner-link`, `owner-avatar`
                        FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
@@ -1266,26 +1266,38 @@ class Diaspora {
         *
         * @return string the post link
         */
-       private static function plink($addr, $guid) {
+       private static function plink($addr, $guid, $parent_guid = '') {
                $r = q("SELECT `url`, `nick`, `network` FROM `fcontact` WHERE `addr`='%s' LIMIT 1", dbesc($addr));
 
                // Fallback
-               if (!$r)
-                       return "https://".substr($addr,strpos($addr,"@")+1)."/posts/".$guid;
+               if (!dbm::is_result($r)) {
+                       if ($parent_guid != '') {
+                               return "https://".substr($addr,strpos($addr,"@") + 1)."/posts/".$parent_guid."#".$guid;
+                       } else {
+                               return "https://".substr($addr,strpos($addr,"@") + 1)."/posts/".$guid;
+                       }
+               }
 
                // Friendica contacts are often detected as Diaspora contacts in the "fcontact" table
                // So we try another way as well.
                $s = q("SELECT `network` FROM `gcontact` WHERE `nurl`='%s' LIMIT 1", dbesc(normalise_link($r[0]["url"])));
-               if ($s)
+               if (dbm::is_result($s)) {
                        $r[0]["network"] = $s[0]["network"];
+               }
 
-               if ($r[0]["network"] == NETWORK_DFRN)
-                       return(str_replace("/profile/".$r[0]["nick"]."/", "/display/".$guid, $r[0]["url"]."/"));
+               if ($r[0]["network"] == NETWORK_DFRN) {
+                       return str_replace("/profile/".$r[0]["nick"]."/", "/display/".$guid, $r[0]["url"]."/");
+               }
 
-               if (self::is_redmatrix($r[0]["url"]))
+               if (self::is_redmatrix($r[0]["url"])) {
                        return $r[0]["url"]."/?f=&mid=".$guid;
+               }
 
-               return "https://".substr($addr,strpos($addr,"@")+1)."/posts/".$guid;
+               if ($parent_guid != '') {
+                       return "https://".substr($addr,strpos($addr,"@")+1)."/posts/".$parent_guid."#".$guid;
+               } else {
+                       return "https://".substr($addr,strpos($addr,"@")+1)."/posts/".$guid;
+               }
        }
 
        /**
@@ -1459,6 +1471,8 @@ class Diaspora {
 
                $datarray["changed"] = $datarray["created"] = $datarray["edited"] = $created_at;
 
+               $datarray["plink"] = self::plink($author, $guid, $parent_item['guid']);
+
                $body = diaspora2bb($text);
 
                $datarray["body"] = self::replace_people_guid($body, $person["url"]);
@@ -2018,7 +2032,7 @@ class Diaspora {
 
                $a = get_app();
 
-               if ($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) {
+               if ($contact["rel"] == CONTACT_IS_SHARING) {
                        dba::update('contact', array('rel' => CONTACT_IS_FRIEND, 'writable' => true),
                                        array('id' => $contact["id"], 'uid' => $importer["uid"]));
                }
@@ -2129,8 +2143,8 @@ class Diaspora {
                // perhaps we were already sharing with this person. Now they're sharing with us.
                // That makes us friends.
                if ($contact) {
-                       if ($following && $sharing) {
-                               logger("Author ".$author." (Contact ".$contact["id"].") wants to have a bidirectional conection.", LOGGER_DEBUG);
+                       if ($following) {
+                               logger("Author ".$author." (Contact ".$contact["id"].") wants to follow us.", LOGGER_DEBUG);
                                self::receive_request_make_friend($importer, $contact);
 
                                // refetch the contact array
@@ -2138,7 +2152,7 @@ class Diaspora {
 
                                // If we are now friends, we are sending a share message.
                                // Normally we needn't to do so, but the first message could have been vanished.
-                               if (in_array($contact["rel"], array(CONTACT_IS_FRIEND, CONTACT_IS_FOLLOWER))) {
+                               if (in_array($contact["rel"], array(CONTACT_IS_FRIEND))) {
                                        $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer["uid"]));
                                        if ($u) {
                                                logger("Sending share message to author ".$author." - Contact: ".$contact["id"]." - User: ".$importer["uid"], LOGGER_DEBUG);
@@ -2146,9 +2160,10 @@ class Diaspora {
                                        }
                                }
                                return true;
-                       } else { /// @todo Handle all possible variations of adding and retracting of permissions
-                               logger("Author ".$author." (Contact ".$contact["id"].") wants to change the relationship: Following: ".$following." - sharing: ".$sharing. "(By now unsupported)", LOGGER_DEBUG);
-                               return false;
+                       } else {
+                               logger("Author ".$author." doesn't want to follow us anymore.", LOGGER_DEBUG);
+                               lose_follower($importer, $contact);
+                               return true;
                        }
                }
 
@@ -3526,7 +3541,14 @@ class Diaspora {
                $itemaddr = self::handle_from_contact($item["contact-id"], $item["gcontact-id"]);
 
                $msg_type = "retraction";
-               $target_type = "Post";
+
+               if ($item['id'] == $item['parent']) {
+                       $target_type = "Post";
+               } elseif ($item["verb"] == ACTIVITY_LIKE) {
+                       $target_type = "Like";
+               } else {
+                       $target_type = "Comment";
+               }
 
                $message = array("author" => $itemaddr,
                                "target_guid" => $item['guid'],