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 36fd38915d22098fde82b4ea223d6361436a94c2..744e9ed18ff2bd0988e641229c502985f8bcbf4f 100644 (file)
--- a/src/Content/Conversation.php
+++ b/src/Content/Conversation.php
@@ -854,7 +854,7 @@ 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('You subscribed to one or more tags in this post.')];
@@ -884,7 +884,7 @@ class Conversation
                                $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('Send via an relay server') : $this->l10n->t('Send via the relay server %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']))];
@@ -901,7 +901,9 @@ class Conversation
                        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;