Merge remote-tracking branch 'remotes/upstream/master'

[friendica.git] / mod / like.php

diff --git a/mod/like.php b/mod/like.php
index 3c6dfa59b5426a55967830f05211d5bba70af969..aaa85928c7c81059984e47bf55c9995480c1e9bf 100755 (executable)
--- a/mod/like.php
+++ b/mod/like.php
@@ -106,17 +106,18 @@ function like_content(&$a) {
 
 
        $r = q("SELECT * FROM `item` WHERE `verb` = '%s' AND `deleted` = 0 
-               AND `contact-id` = %d AND ( `parent` = '%s' OR `parent-uri` = '%s') LIMIT 1",
+               AND `contact-id` = %d AND ( `parent` = '%s' OR `parent-uri` = '%s' OR `thr-parent` = '%s') LIMIT 1",
                dbesc($activity),
                intval($contact['id']),
                dbesc($item_id),
-               dbesc($item_id)
+               dbesc($item_id),
+               dbesc($item['uri'])
        );
        if(count($r)) {
                $like_item = $r[0];
 
                // Already voted, undo it
-               $r = q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d LIMIT 1",
+               $r = q("UPDATE `item` SET `deleted` = 1, `unseen` = 1, `changed` = '%s' WHERE `id` = %d LIMIT 1",
                        dbesc(datetime_convert()),
                        intval($like_item['id'])
                );
@@ -211,7 +212,7 @@ EOT;
 
 
        // Save the author information for the like in case we need to relay to Diaspora
-       store_diaspora_like_sig($activity, $item, $like_item, $contact);
+       store_diaspora_like_sig($activity, $post_type, $contact, $post_id);
 
 
        $arr['id'] = $post_id;
@@ -245,28 +246,25 @@ function store_diaspora_like_retract_sig($activity, $item, $like_item, $contact)
        if(($activity === ACTIVITY_LIKE) && (! $item['resource-id'])) {
                $signed_text = $like_item['guid'] . ';' . 'Like';
 
-               if( $contact['network'] === NETWORK_DIASPORA)
-                       $diaspora_handle = $contact['addr'];
-               else { // Only works for NETWORK_DFRN
-                       $contact_baseurl_start = strpos($contact['url'],'://') + 3;
-                       $contact_baseurl_length = strpos($contact['url'],'/profile') - $contact_baseurl_start;
-                       $contact_baseurl = substr($contact['url'], $contact_baseurl_start, $contact_baseurl_length);
-                       $diaspora_handle = $contact['nick'] . '@' . $contact_baseurl;
-
-                       // Get contact's private key if he's a user of the local Friendica server
-                       $r = q("SELECT `contact`.`uid` FROM `contact` WHERE `url` = '%s' AND `self` = 1 LIMIT 1",
-                               dbesc($contact['url'])
-                       );
+               // Only works for NETWORK_DFRN
+               $contact_baseurl_start = strpos($contact['url'],'://') + 3;
+               $contact_baseurl_length = strpos($contact['url'],'/profile') - $contact_baseurl_start;
+               $contact_baseurl = substr($contact['url'], $contact_baseurl_start, $contact_baseurl_length);
+               $diaspora_handle = $contact['nick'] . '@' . $contact_baseurl;
 
-                       if( $r) {
-                               $contact_uid = $r['uid'];
-                               $r = q("SELECT prvkey FROM user WHERE uid = %d LIMIT 1",
-                                       intval($contact_uid)
-                               );
+               // Get contact's private key if he's a user of the local Friendica server
+               $r = q("SELECT `contact`.`uid` FROM `contact` WHERE `url` = '%s' AND `self` = 1 LIMIT 1",
+                       dbesc($contact['url'])
+               );
 
-                               if( $r)
-                                       $authorsig = base64_encode(rsa_sign($signed_text,$r['prvkey'],'sha256'));
-                       }
+               if( $r) {
+                       $contact_uid = $r['uid'];
+                       $r = q("SELECT prvkey FROM user WHERE uid = %d LIMIT 1",
+                               intval($contact_uid)
+                       );
+
+                       if( $r)
+                               $authorsig = base64_encode(rsa_sign($signed_text,$r['prvkey'],'sha256'));
                }
 
                if(! isset($authorsig))
@@ -298,28 +296,25 @@ function store_diaspora_like_sig($activity, $post_type, $contact, $post_id) {
        logger('mod_like: storing diaspora like signature');
 
        if(($activity === ACTIVITY_LIKE) && ($post_type === t('status'))) {
-               if( $contact['network'] === NETWORK_DIASPORA)
-                       $diaspora_handle = $contact['addr'];
-               else { // Only works for NETWORK_DFRN
-                       $contact_baseurl_start = strpos($contact['url'],'://') + 3;
-                       $contact_baseurl_length = strpos($contact['url'],'/profile') - $contact_baseurl_start;
-                       $contact_baseurl = substr($contact['url'], $contact_baseurl_start, $contact_baseurl_length);
-                       $diaspora_handle = $contact['nick'] . '@' . $contact_baseurl;
-
-                       // Get contact's private key if he's a user of the local Friendica server
-                       $r = q("SELECT `contact`.`uid` FROM `contact` WHERE `url` = '%s' AND `self` = 1 LIMIT 1",
-                               dbesc($contact['url'])
-                       );
+               // Only works for NETWORK_DFRN
+               $contact_baseurl_start = strpos($contact['url'],'://') + 3;
+               $contact_baseurl_length = strpos($contact['url'],'/profile') - $contact_baseurl_start;
+               $contact_baseurl = substr($contact['url'], $contact_baseurl_start, $contact_baseurl_length);
+               $diaspora_handle = $contact['nick'] . '@' . $contact_baseurl;
+
+               // Get contact's private key if he's a user of the local Friendica server
+               $r = q("SELECT `contact`.`uid` FROM `contact` WHERE `url` = '%s' AND `self` = 1 LIMIT 1",
+                       dbesc($contact['url'])
+               );
 
-                       if( $r) {
-                               $contact_uid = $r['uid'];
-                               $r = q("SELECT prvkey FROM user WHERE uid = %d LIMIT 1",
-                                       intval($contact_uid)
-                               );
+               if( $r) {
+                       $contact_uid = $r['uid'];
+                       $r = q("SELECT prvkey FROM user WHERE uid = %d LIMIT 1",
+                               intval($contact_uid)
+                       );
 
-                               if( $r)
-                                       $contact_uprvkey = $r['prvkey'];
-                       }
+                       if( $r)
+                               $contact_uprvkey = $r['prvkey'];
                }
 
                $r = q("SELECT guid, parent FROM `item` WHERE id = %d LIMIT 1",