Merge pull request #10045 from annando/fix-notification

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index b2353db2a36a23fb3bb6afb4a5db1549e6058221..cef0bc0e80e0da21858e53193965d8bd6f7c887e 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -145,7 +145,7 @@ function localize_item(&$item)
                $item['body'] = item_redir_and_replace_images($extracted['body'], $extracted['images'], $item['contact-id']);
        }
 
-       /// @todo The following functionality needs to be cleaned up. 
+       /// @todo The following functionality needs to be cleaned up.
        if (!empty($item['verb'])) {
                $activity = DI::activity();
 
@@ -160,9 +160,6 @@ function localize_item(&$item)
                                return;
                        }
 
-                       $Aname = $item['author-name'];
-                       $Alink = $item['author-link'];
-
                        $obj = XML::parseString($xmlhead . $item['object']);
 
                        $Bname = $obj->title;
@@ -177,9 +174,17 @@ function localize_item(&$item)
                                }
                        }
 
-                       $A = '[url=' . Contact::magicLink($Alink) . ']' . $Aname . '[/url]';
-                       $B = '[url=' . Contact::magicLink($Blink) . ']' . $Bname . '[/url]';
-                       if ($Bphoto != "") {
+                       $author = ['uid' => 0, 'id' => $item['author-id'],
+                               'network' => $item['author-network'], 'url' => $item['author-link']];
+                       $A = '[url=' . Contact::magicLinkByContact($author) . ']' . $item['author-name'] . '[/url]';
+
+                       if (!empty($Blink)) {
+                               $B = '[url=' . Contact::magicLink($Blink) . ']' . $Bname . '[/url]';
+                       } else {
+                               $B = '';
+                       }
+
+                       if ($Bphoto != "" && !empty($Blink)) {
                                $Bphoto = '[url=' . Contact::magicLink($Blink) . '][img=80x80]' . $Bphoto . '[/img][/url]';
                        }
 
@@ -262,11 +267,10 @@ function localize_item(&$item)
        }
 
        // add sparkle links to appropriate permalinks
-       $author = ['uid' => 0, 'id' => $item['author-id'],
-               'network' => $item['author-network'], 'url' => $item['author-link']];
-
        // Only create a redirection to a magic link when logged in
        if (!empty($item['plink']) && Session::isAuthenticated()) {
+               $author = ['uid' => 0, 'id' => $item['author-id'],
+                       'network' => $item['author-network'], 'url' => $item['author-link']];
                $item['plink'] = Contact::magicLinkByContact($author, $item['plink']);
        }
 }
@@ -477,7 +481,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                'attendyes'   => [],
                'attendno'    => [],
                'attendmaybe' => [],
-               'announce'    => [],    
+               'announce'    => [],
        ];
 
        if (DI::pConfig()->get(local_user(), 'system', 'hide_dislike')) {
@@ -763,7 +767,9 @@ function conversation_fetch_comments($thread_items, bool $pinned, array $activit
                                }
 
                                if (($row['gravity'] == GRAVITY_PARENT) && !empty($row['causer-id'])) {
-                                       $row['reshared'] = DI::l10n()->t('%s reshared this.', '<a href="'. htmlentities(Contact::magicLinkById($row['causer-id'])) .'">' . htmlentities($name) . '</a>');
+                                       $causer = ['uid' => 0, 'id' => $row['causer-id'],
+                                               'network' => $row['causer-network'], 'url' => $row['causer-link']];
+                                       $row['reshared'] = DI::l10n()->t('%s reshared this.', '<a href="'. htmlentities(Contact::magicLinkByContact($causer)) .'">' . htmlentities($name) . '</a>');
                                }
                                $row['direction'] = ['direction' => 3, 'title' => (empty($row['causer-id']) ? DI::l10n()->t('Reshared') : DI::l10n()->t('Reshared by %s', $name))];
                                break;
@@ -833,8 +839,8 @@ function conversation_add_children(array $parents, $block_authors, $order, $uid)
                                $activity = ['causer-id' => $parent['author-id']];
                                foreach (['commented', 'received', 'created'] as $orderfields) {
                                        if (!empty($parent[$orderfields])) {
-                                               $activity[$orderfields] = $parent[$orderfields];        
-                                       }       
+                                               $activity[$orderfields] = $parent[$orderfields];
+                                       }
                                }
                        }
                } else {
@@ -893,8 +899,8 @@ function item_photo_menu($item) {
        $block_link = '';
        $ignore_link = '';
 
-       if (local_user() && local_user() == $item['uid'] && $item['gravity'] == GRAVITY_PARENT && !$item['self']) {
-               $sub_link = 'javascript:dosubthread(' . $item['id'] . '); return false;';
+       if (local_user() && local_user() == $item['uid'] && $item['gravity'] == GRAVITY_PARENT && !$item['self'] && !$item['mention']) {
+               $sub_link = 'javascript:doFollowThread(' . $item['id'] . '); return false;';
        }
 
        $author = ['uid' => 0, 'id' => $item['author-id'],
@@ -903,7 +909,7 @@ function item_photo_menu($item) {
        $sparkle = (strpos($profile_link, 'redir/') === 0);
 
        $cid = 0;
-       $pcid = Contact::getIdForURL($item['author-link'], 0, false);
+       $pcid = $item['author-id'];
        $network = '';
        $rel = 0;
        $condition = ['uid' => local_user(), 'nurl' => Strings::normaliseLink($item['author-link'])];