Avoid "Duplicate entry" error in apcontact

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index 7ff4de2ead7b447ffd6d963f522aa4b78f566be0..64c8228ff919c5c9d9115e7c36b457333315288c 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -28,6 +28,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
+use Friendica\Core\Theme;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
@@ -354,6 +355,13 @@ function conv_get_blocklist()
  */
 function conversation(App $a, array $items, $mode, $update, $preview = false, $order = 'commented', $uid = 0)
 {
+       $page = DI::page();
+
+       $page->registerFooterScript(Theme::getPathForFile('asset/typeahead.js/dist/typeahead.bundle.js'));
+       $page->registerFooterScript(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.js'));
+       $page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.css'));
+       $page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput-typeahead.css'));
+
        $ssl_state = (local_user() ? true : false);
 
        $profile_owner = 0;
@@ -711,6 +719,7 @@ function conversation_fetch_comments($thread_items, $pinned) {
        $parentlines = [];
        $lineno = 0;
        $direction = [];
+       $actor = [];
        $received = '';
 
        while ($row = Item::fetch($thread_items)) {
@@ -718,12 +727,13 @@ function conversation_fetch_comments($thread_items, $pinned) {
                        && ($row['thr-parent'] == $row['parent-uri']) && ($row['received'] > $received)
                        && Contact::isSharing($row['author-id'], $row['uid'])) {
                        $direction = ['direction' => 3, 'title' => DI::l10n()->t('%s reshared this.', $row['author-name'])];
+                       $actor = ['link' => $row['author-link'], 'avatar' => $row['author-avatar'], 'name' => $row['author-name']];
                        $received = $row['received'];
                }
 
                if (!empty($parentlines) && empty($direction) && ($row['gravity'] == GRAVITY_COMMENT)
                        && Contact::isSharing($row['author-id'], $row['uid'])) {
-                       $direction = ['direction' => 2, 'title' => DI::l10n()->t('%s commented this.', $row['author-name'])];
+                       $direction = ['direction' => 5, 'title' => DI::l10n()->t('%s commented on this.', $row['author-name'])];
                }
 
                if (($row['gravity'] == GRAVITY_PARENT) && !$row['origin'] && ($row['author-id'] == $row['owner-id'])
@@ -748,6 +758,11 @@ function conversation_fetch_comments($thread_items, $pinned) {
        if (!empty($direction)) {
                foreach ($parentlines as $line) {
                        $comments[$line]['direction'] = $direction;
+                       if (!empty($actor) && DI::pConfig()->get(local_user(), 'system', 'display_resharer')  ) {
+                               $comments[$line]['owner-link'] = $actor['link'];
+                               $comments[$line]['owner-avatar'] = $actor['avatar'];
+                               $comments[$line]['owner-name'] = $actor['name'];
+                       }
                }
        }
        return $comments;