X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fconversation.php;h=43854bb40f7b7e8d1486edb47d41e3a092fa7063;hb=24a4eb9699eb0eb96c74e9fb86a4d40d5a2975fe;hp=665d9d48316484d2e03cae9ef37405bb2797b0bf;hpb=dfe4413463e7cbac0971fe8f3820f5f651dafdc2;p=friendica.git

diff --git a/include/conversation.php b/include/conversation.php
index 665d9d4831..43854bb40f 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -229,12 +229,12 @@ function localize_item(&$item)
 		$xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">";
 
 		$obj = XML::parseString($xmlhead.$item['object']);
-		$links = XML::parseString($xmlhead."<links>".unxmlify($obj->link)."</links>");
 
 		$Bname = $obj->title;
-		$Blink = "";
+		$Blink = $obj->id;
 		$Bphoto = "";
-		foreach ($links->link as $l) {
+
+		foreach ($obj->link as $l) {
 			$atts = $l->attributes();
 			switch ($atts['rel']) {
 				case "alternate": $Blink = $atts['href'];
@@ -471,6 +471,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
 				. "'; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
 		}
 	} elseif ($mode === 'profile') {
+		$items = conversation_add_children($items, false, $order, $uid);
 		$profile_owner = $a->profile['profile_uid'];
 
 		if (!$update) {
@@ -490,6 +491,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
 			}
 		}
 	} elseif ($mode === 'notes') {
+		$items = conversation_add_children($items, false, $order, $uid);
 		$profile_owner = local_user();
 
 		if (!$update) {
@@ -498,6 +500,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
 				. "; var netargs = '/?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
 		}
 	} elseif ($mode === 'display') {
+		$items = conversation_add_children($items, false, $order, $uid);
 		$profile_owner = $a->profile['uid'];
 
 		if (!$update) {
@@ -514,6 +517,15 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
 				. "<script> var profile_uid = -1; var netargs = '" . substr($a->cmd, 10)
 				."/?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
 		}
+	} elseif ($mode === 'contacts') {
+		$items = conversation_add_children($items, true, $order, $uid);
+		$profile_owner = 0;
+
+		if (!$update) {
+			$live_update_div = '<div id="live-contacts"></div>' . "\r\n"
+				. "<script> var profile_uid = -1; var netargs = '" . substr($a->cmd, 9)
+				."/?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
+		}
 	} elseif ($mode === 'search') {
 		$live_update_div = '<div id="live-search"></div>' . "\r\n";
 	}
@@ -541,10 +553,10 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
 	$page_template = get_markup_template("conversation.tpl");
 
 	if (!empty($items)) {
-		if ($mode === 'community') {
+		if (in_array($mode, ['community', 'contacts'])) {
 			$writable = true;
 		} else {
-			$writable = ($items[0]['uid'] == 0) && in_array($items[0]['network'], [Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
+			$writable = ($items[0]['uid'] == 0) && in_array($items[0]['network'], [Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
 		}
 
 		if (!local_user()) {
@@ -645,7 +657,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
 					'id' => ($preview ? 'P0' : $item['id']),
 					'guid' => ($preview ? 'Q0' : $item['guid']),
 					'network' => $item['network'],
-					'network_name' => ContactSelector::networkToName($item['network'], $profile_link),
+					'network_name' => ContactSelector::networkToName($item['network'], $item['author-link']),
 					'linktitle' => L10n::t('View %s\'s profile @ %s', $profile_name, $item['author-link']),
 					'profile_url' => $profile_link,
 					'item_photo_menu' => item_photo_menu($item),
@@ -795,7 +807,7 @@ function conversation_add_children(array $parents, $block_authors, $order, $uid)
 
 	foreach ($items as $index => $item) {
 		if ($item['uid'] == 0) {
-			$items[$index]['writable'] = in_array($item['network'], [Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
+			$items[$index]['writable'] = in_array($item['network'], [Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
 		}
 	}
 
@@ -865,7 +877,7 @@ function item_photo_menu($item) {
 		}
 
 		if ((($cid == 0) || ($rel == Contact::FOLLOWER)) &&
-			in_array($item['network'], [Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA])) {
+			in_array($item['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA])) {
 			$menu[L10n::t('Connect/Follow')] = 'follow?url=' . urlencode($item['author-link']);
 		}
 	} else {
@@ -1079,21 +1091,6 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
 		'$delitems'  => L10n::t("Delete item\x28s\x29?")
 	]);
 
-	$tpl = get_markup_template('jot-end.tpl');
-	$a->page['end'] .= replace_macros($tpl, [
-		'$newpost'   => 'true',
-		'$baseurl'   => System::baseUrl(true),
-		'$geotag'    => $geotag,
-		'$nickname'  => $x['nickname'],
-		'$ispublic'  => L10n::t('Visible to <strong>everybody</strong>'),
-		'$linkurl'   => L10n::t('Please enter a link URL:'),
-		'$vidurl'    => L10n::t("Please enter a video link/URL:"),
-		'$audurl'    => L10n::t("Please enter an audio link/URL:"),
-		'$term'      => L10n::t('Tag term:'),
-		'$fileas'    => L10n::t('Save to Folder:'),
-		'$whereareu' => L10n::t('Where are you right now?')
-	]);
-
 	$jotplugins = '';
 	Addon::callHooks('jot_tool', $jotplugins);
 
@@ -1442,7 +1439,7 @@ function get_responses(array $conv_responses, array $response_verbs, $ob, array
 	$ret = [];
 	foreach ($response_verbs as $v) {
 		$ret[$v] = [];
-		$ret[$v]['count'] = defaults($conv_responses[$v], $item['uri'], '');
+		$ret[$v]['count'] = defaults($conv_responses[$v], $item['uri'], 0);
 		$ret[$v]['list']  = defaults($conv_responses[$v], $item['uri'] . '-l', []);
 		$ret[$v]['self']  = defaults($conv_responses[$v], $item['uri'] . '-self', '0');
 		if (count($ret[$v]['list']) > MAX_LIKERS) {