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

[friendica.git] / mod / like.php

diff --git a/mod/like.php b/mod/like.php
index d6d121ad7e5f3638ba897c702230fd2aede60e9f..6b97fafb561e291ef9dd95406f663d77880ab926 100644 (file)
--- a/mod/like.php
+++ b/mod/like.php
@@ -19,14 +19,10 @@ function like_content(&$a) {
 
        switch($verb) {
                case 'like':
-                       $activity = ACTIVITY_LIKE;
-                       break;
-               case 'dislike':
-                       $activity = ACTIVITY_DISLIKE;
-                       break;
                case 'unlike':
                        $activity = ACTIVITY_LIKE;
                        break;
+               case 'dislike':
                case 'undislike':
                        $activity = ACTIVITY_DISLIKE;
                        break;
@@ -59,6 +55,22 @@ function like_content(&$a) {
                return;
        }
 
+       $remote_owner = null;
+
+       if(! $item['wall']) {
+               // The top level post may have been written by somebody on another system
+               $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+                       intval($item['contact-id']),
+                       intval($item['uid'])
+               );
+               if(! count($r))
+                       return;
+               if(! $r[0]['self'])
+                       $remote_owner = $r[0];
+       }
+
+       // this represents the post owner on this system. 
+
        $r = q("SELECT `contact`.*, `user`.`nickname` FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
                WHERE `contact`.`self` = 1 AND `contact`.`uid` = %d LIMIT 1",
                intval($owner_uid)
@@ -71,6 +83,11 @@ function like_content(&$a) {
                return;
        }
 
+       if(! $remote_owner)
+               $remote_owner = $owner;
+
+
+       // This represents the person posting
 
        if((local_user()) && (local_user() == $owner_uid)) {
                $contact = $owner;
@@ -137,13 +154,14 @@ EOT;
        $arr['uid'] = $owner_uid;
        $arr['contact-id'] = $contact['id'];
        $arr['type'] = 'activity';
-       $arr['wall'] = 1;
+       $arr['wall'] = $item['wall'];
+       $arr['origin'] = 1;
        $arr['gravity'] = GRAVITY_LIKE;
        $arr['parent'] = $item['id'];
        $arr['parent-uri'] = $item['uri'];
-       $arr['owner-name'] = $owner['name'];
-       $arr['owner-link'] = $owner['url'];
-       $arr['owner-avatar'] = $owner['thumb'];
+       $arr['owner-name'] = $remote_owner['name'];
+       $arr['owner-link'] = $remote_owner['url'];
+       $arr['owner-avatar'] = $remote_owner['thumb'];
        $arr['author-name'] = $contact['name'];
        $arr['author-link'] = $contact['url'];
        $arr['author-avatar'] = $contact['thumb'];
@@ -173,9 +191,12 @@ EOT;
                );
        }                       
 
+       $arr['id'] = $post_id;
+
        call_hooks('post_local_end', $arr);
 
        proc_run('php',"include/notifier.php","like","$post_id");
 
-       return; // NOTREACHED
+       killme();
+//     return; // NOTREACHED
 }
\ No newline at end of file