X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdisplay.php;h=da41c8656e9499d28fd26e8685b00dbfddac6379;hb=7ce97459d437a98ece0077b28bb36771aa36ed82;hp=c0e72837af11ff07c4f95ebb565899759835767c;hpb=69c75daf4f9173573bcfece08a1040612de88c1d;p=friendica.git

diff --git a/mod/display.php b/mod/display.php
index c0e72837af..da41c8656e 100644
--- a/mod/display.php
+++ b/mod/display.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
  *
@@ -22,9 +22,7 @@
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Widget;
-use Friendica\Core\ACL;
 use Friendica\Core\Logger;
-use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;
@@ -37,19 +35,19 @@ use Friendica\Module\ActivityPub\Objects;
 use Friendica\Network\HTTPException;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\DFRN;
-use Friendica\Util\Strings;
+use Friendica\Protocol\Diaspora;
 
 function display_init(App $a)
 {
 	if (ActivityPub::isRequest()) {
-		Objects::rawContent(['guid' => $a->argv[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()) {
 		return;
 	}
 
-	$nick = (($a->argc > 1) ? $a->argv[1] : '');
+	$nick = ((DI::args()->getArgc() > 1) ? DI::args()->getArgv()[1] : '');
 
 	$item = null;
 	$item_user = local_user();
@@ -57,20 +55,20 @@ function display_init(App $a)
 	$fields = ['uri-id', 'parent-uri-id', 'author-id', 'author-link', 'body', 'uid', 'guid', 'gravity'];
 
 	// If there is only one parameter, then check if this parameter could be a guid
-	if ($a->argc == 2) {
+	if (DI::args()->getArgc() == 2) {
 		$nick = '';
 
 		// Does the local user have this item?
 		if (local_user()) {
-			$item = Post::selectFirstForUser(local_user(), $fields, ['guid' => $a->argv[1], 'uid' => local_user()]);
+			$item = Post::selectFirstForUser(local_user(), $fields, ['guid' => DI::args()->getArgv()[1], 'uid' => local_user()]);
 			if (DBA::isResult($item)) {
-				$nick = $a->user['nickname'];
+				$nick = $a->getLoggedInUserNickname();
 			}
 		}
 
 		// Is this item private but could be visible to the remove visitor?
 		if (!DBA::isResult($item) && remote_user()) {
-			$item = Post::selectFirst($fields, ['guid' => $a->argv[1], 'private' => Item::PRIVATE, 'origin' => true]);
+			$item = Post::selectFirst($fields, ['guid' => DI::args()->getArgv()[1], 'private' => Item::PRIVATE, 'origin' => true]);
 			if (DBA::isResult($item)) {
 				if (!Contact::isFollower(remote_user(), $item['uid'])) {
 					$item = null;
@@ -82,10 +80,10 @@ function display_init(App $a)
 
 		// Is it an item with uid=0?
 		if (!DBA::isResult($item)) {
-			$item = Post::selectFirstForUser(local_user(), $fields, ['guid' => $a->argv[1], 'private' => [Item::PUBLIC, Item::UNLISTED], 'uid' => 0]);
+			$item = Post::selectFirstForUser(local_user(), $fields, ['guid' => DI::args()->getArgv()[1], 'private' => [Item::PUBLIC, Item::UNLISTED], 'uid' => 0]);
 		}
-	} elseif ($a->argc >= 3 && $nick == 'feed-item') {
-		$uri_id = $a->argv[2];
+	} elseif (DI::args()->getArgc() >= 3 && $nick == 'feed-item') {
+		$uri_id = DI::args()->getArgv()[2];
 		if (substr($uri_id, -5) == '.atom') {
 			$uri_id = substr($uri_id, 0, -5);
 		}
@@ -96,12 +94,12 @@ function display_init(App $a)
 		return;
 	}
 
-	if ($a->argc >= 3 && $nick == 'feed-item') {
-		displayShowFeed($item['uri-id'], $item['uid'], $a->argc > 3 && $a->argv[3] == 'conversation.atom');
+	if (DI::args()->getArgc() >= 3 && $nick == 'feed-item') {
+		displayShowFeed($item['uri-id'], $item['uid'], DI::args()->getArgc() > 3 && DI::args()->getArgv()[3] == 'conversation.atom');
 	}
 
 	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);
 	}
 
@@ -110,55 +108,23 @@ function display_init(App $a)
 		$item = $parent ?: $item;
 	}
 
-	$profiledata = display_fetchauthor($item);
-
-	DI::page()['aside'] = Widget\VCard::getHTML($profiledata);
+	DI::page()['aside'] = Widget\VCard::getHTML(display_fetchauthor($item));
 }
 
 function display_fetchauthor($item)
 {
-	$profiledata = Contact::getByURLForUser($item['author-link'], local_user());
-
-	// Check for a repeated message
-	$shared = Item::getShareArray($item);
-	if (!empty($shared) && empty($shared['comment'])) {
-		$profiledata = [
-			'uid' => -1,
-			'id' => -1,
-			'nickname' => '',
-			'name' => '',
-			'picdate' => '',
-			'photo' => '',
-			'url' => '',
-			'network' => '',
-		];
-
-		if (!empty($shared['author'])) {
-			$profiledata['name'] = $shared['author'];
-		}
-
+	if (Diaspora::isReshare($item['body'], true)) {
+		$shared = Item::getShareArray($item);
 		if (!empty($shared['profile'])) {
-			$profiledata['url'] = $shared['profile'];
-		}
-
-		if (!empty($shared['avatar'])) {
-			$profiledata['photo'] = $shared['avatar'];
+			$contact = Contact::getByURLForUser($shared['profile'], local_user());
 		}
-
-		$profiledata['nickname'] = $profiledata['name'];
-		$profiledata['network'] = Protocol::matchByProfileUrl($profiledata['url']);
-
-		$profiledata['address'] = '';
-		$profiledata['about'] = '';
-
-		$profiledata = Contact::getByURLForUser($profiledata['url'], local_user()) ?: $profiledata;
 	}
 
-	if (!empty($profiledata['photo'])) {
-		$profiledata['photo'] = DI::baseUrl()->remove($profiledata['photo']);
+	if (empty($contact)) {
+		$contact = Contact::getById($item['author-id']);
 	}
 
-	return $profiledata;
+	return $contact;
 }
 
 function display_content(App $a, $update = false, $update_uid = 0)
@@ -175,7 +141,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']);
@@ -185,15 +151,15 @@ function display_content(App $a, $update = false, $update_uid = 0)
 			$parent_uri_id = $item['parent-uri-id'];
 		}
 	} else {
-		$uri_id = (($a->argc > 2) ? $a->argv[2] : 0);
+		$uri_id = ((DI::args()->getArgc() > 2) ? DI::args()->getArgv()[2] : 0);
 		$parent_uri_id = $uri_id;
 
-		if ($a->argc == 2) {
+		if (DI::args()->getArgc() == 2) {
 			$fields = ['uri-id', 'parent-uri-id', 'uid'];
 
 			if (local_user()) {
-				$condition = ['guid' => $a->argv[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'];
@@ -201,7 +167,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
 			}
 
 			if (($parent_uri_id == 0) && remote_user()) {
-				$item = Post::selectFirst($fields, ['guid' => $a->argv[1], 'private' => Item::PRIVATE, 'origin' => true]);
+				$item = Post::selectFirst($fields, ['guid' => DI::args()->getArgv()[1], 'private' => Item::PRIVATE, 'origin' => true]);
 				if (DBA::isResult($item) && Contact::isFollower(remote_user(), $item['uid'])) {
 					$uri_id = $item['uri-id'];
 					$parent_uri_id = $item['parent-uri-id'];
@@ -209,7 +175,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
 			}
 
 			if ($parent_uri_id == 0) {
-				$condition = ['private' => [Item::PUBLIC, Item::UNLISTED], 'guid' => $a->argv[1], 'uid' => 0];
+				$condition = ['private' => [Item::PUBLIC, Item::UNLISTED], 'guid' => DI::args()->getArgv()[1], 'uid' => 0];
 				$item = Post::selectFirstForUser(local_user(), $fields, $condition);
 				if (DBA::isResult($item)) {
 					$uri_id = $item['uri-id'];
@@ -224,8 +190,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
@@ -248,7 +214,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]);
 	}
 
@@ -274,18 +240,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) {
-		$x = [
-			'is_owner' => true,
-			'allow_location' => $a->user['allow_location'],
-			'default_location' => $a->user['default-location'],
-			'nickname' => $a->user['nickname'],
-			'lockstate' => (is_array($a->user) && (strlen($a->user['allow_cid']) || strlen($a->user['allow_gid']) || strlen($a->user['deny_cid']) || strlen($a->user['deny_gid'])) ? 'lock' : 'unlock'),
-			'acl' => ACL::getFullSelectorHTML(DI::page(), $a->user, true),
-			'bang' => '',
-			'visitor' => 'block',
-			'profile_uid' => local_user(),
-		];
-		$o .= status_editor($a, $x, 0, true);
+		$o .= DI::conversation()->statusEditor([], 0, true);
 	}
 	$sql_extra = Item::getPermissionsSQLByUserId($page_uid);
 
@@ -319,7 +274,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']));