X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fconversation.php;h=6adc00d0c40d795dad1e2fcfb7d03542dc36b2c2;hb=e076998ffe7ed9e29c01463c10a0b36a49659e9d;hp=0ceb9e068ceb7d58f57de918ea557829b2e8094e;hpb=5cf369c026d6ed9f22fc05da9b97707f2a4592e9;p=friendica.git

diff --git a/include/conversation.php b/include/conversation.php
index 0ceb9e068c..6adc00d0c4 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -452,8 +452,8 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
 		$profile_owner = 0;
 
 		if (!$update) {
-			$live_update_div = '<div id="live-contacts"></div>' . "\r\n"
-				. "<script> var profile_uid = -1; var netargs = '" . substr(DI::args()->getCommand(), 9)
+			$live_update_div = '<div id="live-contact"></div>' . "\r\n"
+				. "<script> var profile_uid = -1; var netargs = '" . substr(DI::args()->getCommand(), 8)
 				."/?f='; </script>\r\n";
 		}
 	} elseif ($mode === 'search') {
@@ -501,7 +501,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
 			$writable = false;
 		}
 
-		if (in_array($mode, ['network-new', 'search', 'contact-posts'])) {
+		if (in_array($mode, ['filed', 'search', 'contact-posts'])) {
 
 			/*
 			 * "New Item View" on network page or search page results
@@ -548,7 +548,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
 				$location_html = $locate['html'] ?: Strings::escapeHtml($locate['location'] ?: $locate['coord'] ?: '');
 
 				localize_item($item);
-				if ($mode === 'network-new') {
+				if ($mode === 'filed') {
 					$dropping = true;
 				} else {
 					$dropping = false;
@@ -562,9 +562,10 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
 				];
 
 				$likebuttons = [
-					'like'    => null,
-					'dislike' => null,
-					'share'   => null,
+					'like'     => null,
+					'dislike'  => null,
+					'share'    => null,
+					'announce' => null,
 				];
 
 				if (DI::pConfig()->get(local_user(), 'system', 'hide_dislike')) {
@@ -585,6 +586,10 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
 					'template' => $tpl,
 					'id' => ($preview ? 'P0' : $item['id']),
 					'guid' => ($preview ? 'Q0' : $item['guid']),
+					'commented' => $item['commented'],
+					'received' => $item['received'],
+					'created_date' => $item['created'],
+					'uriid' => $item['uri-id'],
 					'network' => $item['network'],
 					'network_name' => ContactSelector::networkToName($item['author-network'], $item['author-link'], $item['network']),
 					'network_icon' => ContactSelector::networkToIcon($item['network'], $item['author-link']),
@@ -692,6 +697,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
 		'$live_update' => $live_update_div,
 		'$remove' => DI::l10n()->t('remove'),
 		'$mode' => $mode,
+		'$update' => $update,
 		'$user' => $a->user,
 		'$threads' => $threads,
 		'$dropping' => ($page_dropping ? DI::l10n()->t('Delete Selected Items') : False),
@@ -734,7 +740,7 @@ function conversation_fetch_comments($thread_items, $pinned) {
 				$row['direction'] = ['direction' => 4, 'title' => DI::l10n()->t('Tagged')];
 				break;
 			case Item::PT_ANNOUNCEMENT:
-				if (!empty($row['causer-id']) && DI::pConfig()->get(local_user(), 'system', 'display_resharer')  ) {
+				if (!empty($row['causer-id']) && DI::pConfig()->get(local_user(), 'system', 'display_resharer')) {
 					$row['owner-link'] = $row['causer-link'];
 					$row['owner-avatar'] = $row['causer-avatar'];
 					$row['owner-name'] = $row['causer-name'];
@@ -913,13 +919,17 @@ function item_photo_menu($item) {
 			DI::l10n()->t('Ignore') => $ignore_link
 		];
 
+		if (!empty($item['language'])) {
+			$menu[DI::l10n()->t('Languages')] = 'javascript:alert(\'' . Item::getLanguageMessage($item) . '\');';
+		}
+
 		if ($network == Protocol::DFRN) {
 			$menu[DI::l10n()->t("Poke")] = $poke_link;
 		}
 
 		if ((($cid == 0) || ($rel == Contact::FOLLOWER)) &&
 			in_array($item['network'], Protocol::FEDERATED)) {
-			$menu[DI::l10n()->t('Connect/Follow')] = 'follow?url=' . urlencode($item['author-link']);
+			$menu[DI::l10n()->t('Connect/Follow')] = 'follow?url=' . urlencode($item['author-link']) . '&auto=1';
 		}
 	} else {
 		$menu = [DI::l10n()->t('View Profile') => $item['author-link']];
@@ -1006,10 +1016,9 @@ function builtin_activity_puller($item, &$conv_responses) {
 			}
 
 			// Skip when the causer of the parent is the same than the author of the announce
-			if ($verb == Activity::ANNOUNCE) {
-				if (Item::exists(['uri' => $item['thr-parent'], 'uid' => $item['uid'], 'causer-id' => $item['author-id'], 'gravity' => GRAVITY_PARENT])) {
-					continue;
-				}
+			if (($verb == Activity::ANNOUNCE) && Item::exists(['uri' => $item['thr-parent'],
+				'uid' => $item['uid'], 'causer-id' => $item['author-id'], 'gravity' => GRAVITY_PARENT])) {
+				continue;
 			}
 
 			if (!isset($conv_responses[$mode][$item['thr-parent']])) {