Avoid tagging both '@Robert Johnson' and also '@Robert', when '@Robert Johnson' was...

[friendica.git] / mod / like.php

diff --git a/mod/like.php b/mod/like.php
index f256cd9a1f62e9ddc12e2608df5e08baa0833e88..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;
@@ -101,9 +118,7 @@ function like_content(&$a) {
                        intval($r[0]['id'])
                );
 
-               $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
-               proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"like\" \"$post_id\" &",
-                       array(),$foo));
+               proc_run('php',"include/notifier.php","like","$post_id");
                return;
        }
 
@@ -126,9 +141,9 @@ function like_content(&$a) {
        </object>
 EOT;
        if($verb === 'like')
-               $bodyverb = t('likes');
+               $bodyverb = t('%1$s likes %2$s\'s %3$s');
        if($verb === 'dislike')
-               $bodyverb = t('doesn\'t like');
+               $bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s');
 
        if(! isset($bodyverb))
                        return; 
@@ -139,19 +154,22 @@ 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'];
-       $arr['body'] = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]' . ' ' .  t('likes') . ' ' 
-               . '[url=' . $item['author-link'] . ']' . $item['author-name'] . t('\'s') . '[/url]' . ' '
-               . '[url=' . $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . ']' . $post_type . '[/url]' ;
+       
+       $ulink = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]';
+       $alink = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
+       $plink = '[url=' . $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . ']' . $post_type . '[/url]';
+       $arr['body'] =  sprintf( $bodyverb, $ulink, $alink, $plink );
 
        $arr['verb'] = $activity;
        $arr['object-type'] = $objtype;
@@ -173,11 +191,12 @@ EOT;
                );
        }                       
 
+       $arr['id'] = $post_id;
 
-       $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
+       call_hooks('post_local_end', $arr);
 
-       proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"like\" \"$post_id\" &",
-               array(),$foo));
+       proc_run('php',"include/notifier.php","like","$post_id");
 
-       return; // NOTREACHED
+       killme();
+//     return; // NOTREACHED
 }
\ No newline at end of file