X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdisplay.php;h=50f405495600c531e9f6fbca5719502406167981;hb=f84c696925467f4091a6ac2e27f97d6a921c1643;hp=5e24bd4b43d26981d4c32dd04ebd59416058760b;hpb=15b93b4459f051c1cf6d394a597399f17f9748f3;p=friendica.git

diff --git a/mod/display.php b/mod/display.php
index 5e24bd4b43..50f4054956 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -40,7 +40,7 @@ use Friendica\Protocol\DFRN;
 function display_init(App $a)
 {
 	if (ActivityPub::isRequest()) {
-		Objects::rawContent(['guid' => DI::args()->getArgv()[1] ?? null]);
+		(new Objects(DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), $_SERVER, ['guid' => DI::args()->getArgv()[1] ?? null]))->run();
 	}
 
 	if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
@@ -99,7 +99,7 @@ function display_init(App $a)
 	}
 
 	if (!empty($_SERVER['HTTP_ACCEPT']) && strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) {
-		Logger::log('Directly serving XML for uri-id '.$item['uri-id'], Logger::DEBUG);
+		Logger::info('Directly serving XML for uri-id '.$item['uri-id']);
 		displayShowFeed($item['uri-id'], $item['uid'], false);
 	}
 
@@ -121,7 +121,7 @@ function display_fetchauthor($item)
 	$shared = Item::getShareArray($item);
 	if (!empty($shared) && empty($shared['comment'])) {
 		$profiledata = [
-			'uid' => -1,
+			'uid' => 0,
 			'id' => -1,
 			'nickname' => '',
 			'name' => '',
@@ -144,7 +144,7 @@ function display_fetchauthor($item)
 		}
 
 		$profiledata['nickname'] = $profiledata['name'];
-		$profiledata['network'] = Protocol::matchByProfileUrl($profiledata['url']);
+		$profiledata['network'] = Protocol::PHANTOM;
 
 		$profiledata['address'] = '';
 		$profiledata['about'] = '';
@@ -173,7 +173,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
 
 	if ($update) {
 		$uri_id = $_REQUEST['uri_id'];
-		$item = Post::selectFirst(['uid', 'parent-uri-id'], ['uri-id' => $uri_id, 'uid' => $update_uid]);
+		$item = Post::selectFirst(['uid', 'parent-uri-id'], ['uri-id' => $uri_id, 'uid' => [0, $update_uid]], ['order' => ['uid' => true]]);
 		if (!empty($item)) {
 			if ($item['uid'] != 0) {
 				$a->setProfileOwner($item['uid']);
@@ -190,8 +190,8 @@ function display_content(App $a, $update = false, $update_uid = 0)
 			$fields = ['uri-id', 'parent-uri-id', 'uid'];
 
 			if (local_user()) {
-				$condition = ['guid' => DI::args()->getArgv()[1], 'uid' => local_user()];
-				$item = Post::selectFirstForUser(local_user(), $fields, $condition);
+				$condition = ['guid' => DI::args()->getArgv()[1], 'uid' => [0, local_user()]];
+				$item = Post::selectFirstForUser(local_user(), $fields, $condition, ['order' => ['uid' => true]]);
 				if (DBA::isResult($item)) {
 					$uri_id = $item['uri-id'];
 					$parent_uri_id = $item['parent-uri-id'];
@@ -222,8 +222,8 @@ function display_content(App $a, $update = false, $update_uid = 0)
 	}
 
 	if (!DI::pConfig()->get(local_user(), 'system', 'detailed_notif')) {
-		DBA::update('notification', ['seen' => true], ['parent-uri-id' => $item['parent-uri-id'], 'uid' => local_user()]);
-		DBA::update('notify', ['seen' => true], ['parent-uri-id' => $item['parent-uri-id'], 'uid' => local_user()]);
+		DI::notification()->setAllSeenForUser(local_user(), ['parent-uri-id' => $item['parent-uri-id']]);
+		DI::notify()->setAllSeenForUser(local_user(), ['parent-uri-id' => $item['parent-uri-id']]);
 	}
 
 	// We are displaying an "alternate" link if that post was public. See issue 2864
@@ -246,7 +246,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
 	$page_uid = 0;
 
 	$parent = null;
-	if (!empty($parent_uri_id)) {
+	if (!local_user() && !empty($parent_uri_id)) {
 		$parent = Post::selectFirst(['uid'], ['uri-id' => $parent_uri_id, 'wall' => true]);
 	}
 
@@ -272,7 +272,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
 
 	// We need the editor here to be able to reshare an item.
 	if ($is_owner && !$update) {
-		$o .= status_editor($a, [], 0, true);
+		$o .= DI::conversation()->statusEditor([], 0, true);
 	}
 	$sql_extra = Item::getPermissionsSQLByUserId($page_uid);
 
@@ -306,7 +306,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
 		$o .= "<script> var netargs = '?uri_id=" . $item['uri-id'] . "'; </script>";
 	}
 
-	$o .= conversation($a, [$item], 'display', $update_uid, false, 'commented', $item_uid);
+	$o .= DI::conversation()->create([$item], 'display', $update_uid, false, 'commented', $item_uid);
 
 	// Preparing the meta header
 	$description = trim(BBCode::toPlaintext($item['body']));