X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdisplay.php;h=ff98e689d38b2aac51274a2b0b1f80357b48e2b7;hb=8c7e5bb776583ac97b31bc023fbc335b1a2b1251;hp=c30e2262630f6412835c63e899d6783de9b8e6e2;hpb=e06fc2aa6900d8cf5ae4e8d5cf52f9262bf7ada7;p=friendica.git

diff --git a/mod/display.php b/mod/display.php
index c30e226263..ff98e689d3 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -17,6 +17,7 @@ use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
 use Friendica\Protocol\DFRN;
+use Friendica\Protocol\ActivityPub;
 
 function display_init(App $a)
 {
@@ -43,7 +44,7 @@ function display_init(App $a)
 
 	$item = null;
 
-	$fields = ['id', 'parent', 'author-id', 'body', 'uid'];
+	$fields = ['id', 'parent', 'author-id', 'body', 'uid', 'guid'];
 
 	// If there is only one parameter, then check if this parameter could be a guid
 	if ($a->argc == 2) {
@@ -76,6 +77,14 @@ function display_init(App $a)
 		displayShowFeed($item["id"], false);
 	}
 
+	if (ActivityPub::isRequest()) {
+		$wall_item = Item::selectFirst(['id', 'uid'], ['guid' => $item['guid'], 'wall' => true]);
+		if (DBA::isResult($wall_item)) {
+			$data = ActivityPub::createObjectFromItemID($wall_item['id']);
+			echo json_encode($data);
+			exit();
+		}
+	}
 	if ($item["id"] != $item["parent"]) {
 		$item = Item::selectFirstForUser(local_user(), $fields, ['id' => $item["parent"]]);
 	}
@@ -247,7 +256,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
 	}
 
 	// We are displaying an "alternate" link if that post was public. See issue 2864
-	$is_public = DBA::exists('item', ['id' => $item_id, 'private' => [0, 2]]);
+	$is_public = Item::exists(['id' => $item_id, 'private' => [0, 2]]);
 	if ($is_public) {
 		// For the atom feed the nickname doesn't matter at all, we only need the item id.
 		$alternate = System::baseUrl().'/display/feed-item/'.$item_id.'.atom';
@@ -324,7 +333,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
 
 	if (local_user() && (local_user() == $a->profile['uid'])) {
 		$condition = ['parent-uri' => $item_parent_uri, 'uid' => local_user(), 'unseen' => true];
-		$unseen = DBA::exists('item', $condition);
+		$unseen = Item::exists($condition);
 	} else {
 		$unseen = false;
 	}
@@ -333,35 +342,34 @@ function display_content(App $a, $update = false, $update_uid = 0)
 		return '';
 	}
 
-	$condition = ["`item`.`parent-uri` = (SELECT `parent-uri` FROM `item` WHERE `id` = ?)
-		AND `item`.`uid` IN (0, ?) " . $sql_extra, $item_id, local_user()];
-	$params = ['order' => ['uid', 'parent' => true, 'gravity', 'id']];
-	$items_obj = Item::selectForUser(local_user(), [], $condition, $params);
+	$condition = ["`id` = ? AND `item`.`uid` IN (0, ?) " . $sql_extra, $item_id, local_user()];
+	$fields = ['parent-uri', 'body', 'title', 'author-name', 'author-avatar', 'plink'];
+	$item = Item::selectFirstForUser(local_user(), $fields, $condition);
 
-	if (!DBA::isResult($items_obj)) {
+	if (!DBA::isResult($item)) {
 		notice(L10n::t('Item not found.') . EOL);
 		return $o;
 	}
 
+	$item['uri'] = $item['parent-uri'];
+
 	if ($unseen) {
 		$condition = ['parent-uri' => $item_parent_uri, 'uid' => local_user(), 'unseen' => true];
 		Item::update(['unseen' => false], $condition);
 	}
 
-	$items = Item::inArray($items_obj);
-	$conversation_items = conv_sort($items, "`commented`");
-
 	if (!$update) {
 		$o .= "<script> var netargs = '?f=&item_id=" . $item_id . "'; </script>";
 	}
-	$o .= conversation($a, $conversation_items, 'display', $update_uid, false, 'commented', local_user());
+
+	$o .= conversation($a, [$item], 'display', $update_uid, false, 'commented', local_user());
 
 	// Preparing the meta header
-	$description = trim(HTML::toPlaintext(BBCode::convert($items[0]["body"], false), 0, true));
-	$title = trim(HTML::toPlaintext(BBCode::convert($items[0]["title"], false), 0, true));
-	$author_name = $items[0]["author-name"];
+	$description = trim(HTML::toPlaintext(BBCode::convert($item["body"], false), 0, true));
+	$title = trim(HTML::toPlaintext(BBCode::convert($item["title"], false), 0, true));
+	$author_name = $item["author-name"];
 
-	$image = $a->remove_baseurl($items[0]["author-avatar"]);
+	$image = $a->remove_baseurl($item["author-avatar"]);
 
 	if ($title == "") {
 		$title = $author_name;
@@ -393,7 +401,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
 	$a->page['htmlhead'] .= '<meta name="twitter:title" content="'.$title.'" />'."\n";
 	$a->page['htmlhead'] .= '<meta name="twitter:description" content="'.$description.'" />'."\n";
 	$a->page['htmlhead'] .= '<meta name="twitter:image" content="'.System::baseUrl().'/'.$image.'" />'."\n";
-	$a->page['htmlhead'] .= '<meta name="twitter:url" content="'.$items[0]["plink"].'" />'."\n";
+	$a->page['htmlhead'] .= '<meta name="twitter:url" content="'.$item["plink"].'" />'."\n";
 
 	// Dublin Core
 	$a->page['htmlhead'] .= '<meta name="DC.title" content="'.$title.'" />'."\n";
@@ -403,7 +411,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
 	$a->page['htmlhead'] .= '<meta property="og:type" content="website" />'."\n";
 	$a->page['htmlhead'] .= '<meta property="og:title" content="'.$title.'" />'."\n";
 	$a->page['htmlhead'] .= '<meta property="og:image" content="'.System::baseUrl().'/'.$image.'" />'."\n";
-	$a->page['htmlhead'] .= '<meta property="og:url" content="'.$items[0]["plink"].'" />'."\n";
+	$a->page['htmlhead'] .= '<meta property="og:url" content="'.$item["plink"].'" />'."\n";
 	$a->page['htmlhead'] .= '<meta property="og:description" content="'.$description.'" />'."\n";
 	$a->page['htmlhead'] .= '<meta name="og:article:author" content="'.$author_name.'" />'."\n";
 	// article:tag