Issue 11953: Split a message in parts

[friendica.git] / src / Content / Conversation.php

diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php
index 1088497983522f432dd008523efd3fede925ae27..744e9ed18ff2bd0988e641229c502985f8bcbf4f 100644 (file)
--- a/src/Content/Conversation.php
+++ b/src/Content/Conversation.php
@@ -582,7 +582,7 @@ class Conversation
 
                                        $uriids[] = $item['uri-id'];
 
-                                       if (!$this->item->visibleActivity($item)) {
+                                       if (!$this->item->isVisibleActivity($item)) {
                                                continue;
                                        }
 
@@ -745,7 +745,7 @@ class Conversation
                                                continue;
                                        }
 
-                                       if (!$this->item->visibleActivity($item)) {
+                                       if (!$this->item->isVisibleActivity($item)) {
                                                continue;
                                        }
 
@@ -854,10 +854,10 @@ class Conversation
                                $row['direction'] = ['direction' => 7, 'title' => $this->l10n->t('You had been addressed (%s).', 'bcc')];
                                break;
                        case ItemModel::PR_FOLLOWER:
-                               $row['direction'] = ['direction' => 6, 'title' => $this->l10n->t('You are following %s.', $row['author-name'])];
+                               $row['direction'] = ['direction' => 6, 'title' => $this->l10n->t('You are following %s.', $row['causer-name'] ?: $row['author-name'])];
                                break;
                        case ItemModel::PR_TAG:
-                               $row['direction'] = ['direction' => 4, 'title' => $this->l10n->t('Tagged')];
+                               $row['direction'] = ['direction' => 4, 'title' => $this->l10n->t('You subscribed to one or more tags in this post.')];
                                break;
                        case ItemModel::PR_ANNOUNCEMENT:
                                if (!empty($row['causer-id']) && $this->pConfig->get(local_user(), 'system', 'display_resharer')) {
@@ -878,17 +878,32 @@ class Conversation
                                $row['direction'] = ['direction' => 5, 'title' => $this->l10n->t('%s is participating in this thread.', $row['author-name'])];
                                break;
                        case ItemModel::PR_STORED:
-                               $row['direction'] = ['direction' => 8, 'title' => $this->l10n->t('Stored')];
+                               $row['direction'] = ['direction' => 8, 'title' => $this->l10n->t('Stored for general reasons')];
                                break;
                        case ItemModel::PR_GLOBAL:
-                               $row['direction'] = ['direction' => 9, 'title' => $this->l10n->t('Global')];
+                               $row['direction'] = ['direction' => 9, 'title' => $this->l10n->t('Global post')];
                                break;
                        case ItemModel::PR_RELAY:
-                               $row['direction'] = ['direction' => 10, 'title' => (empty($row['causer-id']) ? $this->l10n->t('Relayed') : $this->l10n->t('Relayed by %s <%s>', $row['causer-name'], $row['causer-link']))];
+                               $row['direction'] = ['direction' => 10, 'title' => (empty($row['causer-id']) ? $this->l10n->t('Sent via an relay server') : $this->l10n->t('Sent via the relay server %s <%s>', $row['causer-name'], $row['causer-link']))];
                                break;
                        case ItemModel::PR_FETCHED:
                                $row['direction'] = ['direction' => 2, 'title' => (empty($row['causer-id']) ? $this->l10n->t('Fetched') : $this->l10n->t('Fetched because of %s <%s>', $row['causer-name'], $row['causer-link']))];
                                break;
+                       case ItemModel::PR_COMPLETION:
+                               $row['direction'] = ['direction' => 2, 'title' => $this->l10n->t('Stored because of a child post to complete this thread.')];
+                               break;
+                       case ItemModel::PR_DIRECT:
+                               $row['direction'] = ['direction' => 6, 'title' => $this->l10n->t('Local delivery')];
+                               break;
+                       case ItemModel::PR_ACTIVITY:
+                               $row['direction'] = ['direction' => 2, 'title' => $this->l10n->t('Stored because of your activity (like, comment, star, ...)')];
+                               break;
+                       case ItemModel::PR_DISTRIBUTE:
+                               $row['direction'] = ['direction' => 6, 'title' => $this->l10n->t('Distributed')];
+                               break;
+                       case ItemModel::PR_PUSHED:
+                               $row['direction'] = ['direction' => 1, 'title' => $this->l10n->t('Pushed to us')];
+                               break;
                }
 
                $row['thr-parent-row'] = $thr_parent;