X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FConversation.php;h=e441e8ba4b3b7cae3e9fcf317c5887cb3e09dfcc;hb=ece09f4919f9692921c40d5811e17b3388634c20;hp=7bd7ea69fbb436d909832ea5946c232933dd4b97;hpb=516018861e011865a902587876d484d6f0f42a66;p=friendica.git

diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php
index 7bd7ea69fb..e441e8ba4b 100644
--- a/src/Content/Conversation.php
+++ b/src/Content/Conversation.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -154,7 +154,7 @@ class Conversation
 
 				// Skip when the causer of the parent is the same than the author of the announce
 				if (($verb == Activity::ANNOUNCE) && Post::exists(['uri-id' => $activity['thr-parent-id'],
-					'uid' => $activity['uid'], 'causer-id' => $activity['author-id'], 'gravity' => GRAVITY_PARENT])) {
+					'uid' => $activity['uid'], 'causer-id' => $activity['author-id'], 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT]])) {
 					continue;
 				}
 
@@ -223,12 +223,12 @@ class Conversation
 					break;
 			}
 		} elseif ($total > 1) {
-			if ($total < MAX_LIKERS) {
+			if ($total < $this->config->get('system', 'max_likers')) {
 				$likers = implode(', ', array_slice($links, 0, -1));
 				$likers .= ' ' . $this->l10n->t('and') . ' ' . $links[count($links) - 1];
 			} else {
-				$likers = implode(', ', array_slice($links, 0, MAX_LIKERS - 1));
-				$likers .= ' ' . $this->l10n->t('and %d other people', $total - MAX_LIKERS);
+				$likers = implode(', ', array_slice($links, 0, $this->config->get('system', 'max_likers') - 1));
+				$likers .= ' ' . $this->l10n->t('and %d other people', $total - $this->config->get('system', 'max_likers'));
 			}
 
 			$spanatts = "class=\"fakelink\" onclick=\"openClose('{$verb}list-$id');\"";
@@ -669,6 +669,7 @@ class Conversation
 						'folders'              => $folders,
 						'text'                 => strip_tags($body_html),
 						'localtime'            => DateTimeFormat::local($item['created'], 'r'),
+						'utc'                  => DateTimeFormat::utc($item['created'], 'c'),
 						'ago'                  => (($item['app']) ? $this->l10n->t('%s from %s', Temporal::getRelativeDate($item['created']), $item['app']) : Temporal::getRelativeDate($item['created'])),
 						'location_html'        => $location_html,
 						'indent'               => '',
@@ -842,7 +843,7 @@ class Conversation
 					$row['owner-name']   = $row['causer-name'];
 				}
 
-				if (($row['gravity'] == GRAVITY_PARENT) && !empty($row['causer-id'])) {
+				if (in_array($row['gravity'], [GRAVITY_PARENT, GRAVITY_COMMENT]) && !empty($row['causer-id'])) {
 					$causer = ['uid' => 0, 'id' => $row['causer-id'], 'network' => $row['causer-network'], 'url' => $row['causer-link']];
 
 					$row['reshared'] = $this->l10n->t('%s reshared this.', '<a href="'. htmlentities(Contact::magicLinkByContact($causer)) .'">' . htmlentities($row['causer-name']) . '</a>');