X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdisplay.php;h=2750102d7b4ea10f4af6b7cb4e9c4392ac7a47aa;hb=8fa791073b5a390e7a903f8f4bc3bd6c30251ca6;hp=61e1529e4dff6493ac25f9daea56aa966a914fcb;hpb=631095eefdd8cc9698190c60a26322a35b57fc1b;p=friendica.git

diff --git a/mod/display.php b/mod/display.php
index 61e1529e4d..2750102d7b 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -20,7 +20,6 @@
  */
 
 use Friendica\App;
-use Friendica\Content\Pager;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\ACL;
@@ -32,6 +31,7 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
+use Friendica\Model\Post;
 use Friendica\Model\Profile;
 use Friendica\Module\Objects;
 use Friendica\Network\HTTPException;
@@ -54,7 +54,7 @@ function display_init(App $a)
 	$item = null;
 	$item_user = local_user();
 
-	$fields = ['id', 'parent', 'author-id', 'body', 'uid', 'guid', 'gravity'];
+	$fields = ['uri-id', 'parent-uri-id', 'author-id', 'body', 'uid', 'guid', 'gravity'];
 
 	// If there is only one parameter, then check if this parameter could be a guid
 	if ($a->argc == 2) {
@@ -62,7 +62,7 @@ function display_init(App $a)
 
 		// Does the local user have this item?
 		if (local_user()) {
-			$item = Item::selectFirstForUser(local_user(), $fields, ['guid' => $a->argv[1], 'uid' => local_user()]);
+			$item = Post::selectFirstForUser(local_user(), $fields, ['guid' => $a->argv[1], 'uid' => local_user()]);
 			if (DBA::isResult($item)) {
 				$nick = $a->user["nickname"];
 			}
@@ -70,7 +70,7 @@ function display_init(App $a)
 
 		// Is this item private but could be visible to the remove visitor?
 		if (!DBA::isResult($item) && remote_user()) {
-			$item = Item::selectFirst($fields, ['guid' => $a->argv[1], 'private' => Item::PRIVATE, 'origin' => true]);
+			$item = Post::selectFirst($fields, ['guid' => $a->argv[1], 'private' => Item::PRIVATE, 'origin' => true]);
 			if (DBA::isResult($item)) {
 				if (!Contact::isFollower(remote_user(), $item['uid'])) {
 					$item = null;
@@ -82,14 +82,14 @@ function display_init(App $a)
 
 		// Is it an item with uid=0?
 		if (!DBA::isResult($item)) {
-			$item = Item::selectFirstForUser(local_user(), $fields, ['guid' => $a->argv[1], 'private' => [Item::PUBLIC, Item::UNLISTED], 'uid' => 0]);
+			$item = Post::selectFirstForUser(local_user(), $fields, ['guid' => $a->argv[1], 'private' => [Item::PUBLIC, Item::UNLISTED], 'uid' => 0]);
 		}
 	} elseif ($a->argc >= 3 && $nick == 'feed-item') {
-		$item_id = $a->argv[2];
-		if (substr($item_id, -5) == '.atom') {
-			$item_id = substr($item_id, 0, -5);
+		$uri_id = $a->argv[2];
+		if (substr($uri_id, -5) == '.atom') {
+			$uri_id = substr($uri_id, 0, -5);
 		}
-		$item = Item::selectFirstForUser(local_user(), $fields, ['id' => $item_id, 'private' => [Item::PUBLIC, Item::UNLISTED], 'uid' => 0]);
+		$item = Post::selectFirstForUser(local_user(), $fields, ['uri-id' => $uri_id, 'private' => [Item::PUBLIC, Item::UNLISTED], 'uid' => 0]);
 	}
 
 	if (!DBA::isResult($item)) {
@@ -97,16 +97,16 @@ function display_init(App $a)
 	}
 
 	if ($a->argc >= 3 && $nick == 'feed-item') {
-		displayShowFeed($item['id'], $a->argc > 3 && $a->argv[3] == 'conversation.atom');
+		displayShowFeed($item['uri-id'], $item['uid'], $a->argc > 3 && $a->argv[3] == 'conversation.atom');
 	}
 
 	if (!empty($_SERVER['HTTP_ACCEPT']) && strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) {
-		Logger::log('Directly serving XML for id '.$item['id'], Logger::DEBUG);
-		displayShowFeed($item['id'], false);
+		Logger::log('Directly serving XML for uri-id '.$item['uri-id'], Logger::DEBUG);
+		displayShowFeed($item['uri-id'], $item['uid'], false);
 	}
 
 	if ($item['gravity'] != GRAVITY_PARENT) {
-		$parent = Item::selectFirstForUser($item_user, $fields, ['id' => $item['parent']]);
+		$parent = Post::selectFirstForUser($item_user, $fields, ['uid' => $item['uid'], 'uri-id' => $item['parent-uri-id']]);
 		$item = $parent ?: $item;
 	}
 
@@ -164,7 +164,7 @@ function display_fetchauthor($a, $item)
 		$profiledata["about"] = "";
 	}
 
-	$profiledata = array_merge($profiledata, Contact::getByURLForUser($profiledata["url"], local_user()));
+	$profiledata = Contact::getByURLForUser($profiledata["url"], local_user()) ?: $profiledata;
 
 	if (!empty($profiledata["photo"])) {
 		$profiledata["photo"] = DI::baseUrl()->remove($profiledata["photo"]);
@@ -186,49 +186,46 @@ function display_content(App $a, $update = false, $update_uid = 0)
 	$force = (bool)($_REQUEST['force'] ?? false);
 
 	if ($update) {
-		$item_id = $_REQUEST['item_id'];
-		$item = Item::selectFirst(['uid', 'parent', 'parent-uri'], ['id' => $item_id]);
-		if ($item['uid'] != 0) {
-			$a->profile = ['uid' => intval($item['uid'])];
-		} else {
-			$a->profile = ['uid' => intval($update_uid)];
+		$uri_id = $_REQUEST['uri_id'];
+		$item = Post::selectFirst(['uid', 'parent-uri-id'], ['uri-id' => $uri_id, 'uid' => $update_uid]);
+		if (!empty($item)) {
+			if ($item['uid'] != 0) {
+				$a->profile = ['uid' => intval($item['uid'])];
+			} else {
+				$a->profile = ['uid' => intval($update_uid)];
+			}
+			$parent_uri_id = $item['parent-uri-id'];
 		}
-		$item_parent = $item['parent'];
-		$item_parent_uri = $item['parent-uri'];
 	} else {
-		$item_id = (($a->argc > 2) ? $a->argv[2] : 0);
-		$item_parent = $item_id;
+		$uri_id = (($a->argc > 2) ? $a->argv[2] : 0);
+		$parent_uri_id = $uri_id;
 
 		if ($a->argc == 2) {
-			$item_parent = 0;
-			$fields = ['id', 'parent', 'parent-uri', 'uid'];
+			$fields = ['uri-id', 'parent-uri-id', 'uid'];
 
 			if (local_user()) {
 				$condition = ['guid' => $a->argv[1], 'uid' => local_user()];
-				$item = Item::selectFirstForUser(local_user(), $fields, $condition);
+				$item = Post::selectFirstForUser(local_user(), $fields, $condition);
 				if (DBA::isResult($item)) {
-					$item_id = $item['id'];
-					$item_parent = $item['parent'];
-					$item_parent_uri = $item['parent-uri'];
+					$uri_id = $item['uri-id'];
+					$parent_uri_id = $item['parent-uri-id'];
 				}
 			}
 
-			if (($item_parent == 0) && remote_user()) {
-				$item = Item::selectFirst($fields, ['guid' => $a->argv[1], 'private' => Item::PRIVATE, 'origin' => true]);
+			if (($parent_uri_id == 0) && remote_user()) {
+				$item = Post::selectFirst($fields, ['guid' => $a->argv[1], 'private' => Item::PRIVATE, 'origin' => true]);
 				if (DBA::isResult($item) && Contact::isFollower(remote_user(), $item['uid'])) {
-					$item_id = $item['id'];
-					$item_parent = $item['parent'];
-					$item_parent_uri = $item['parent-uri'];
+					$uri_id = $item['uri-id'];
+					$parent_uri_id = $item['parent-uri-id'];
 				}
 			}
 
-			if ($item_parent == 0) {
+			if ($parent_uri_id == 0) {
 				$condition = ['private' => [Item::PUBLIC, Item::UNLISTED], 'guid' => $a->argv[1], 'uid' => 0];
-				$item = Item::selectFirstForUser(local_user(), $fields, $condition);
+				$item = Post::selectFirstForUser(local_user(), $fields, $condition);
 				if (DBA::isResult($item)) {
-					$item_id = $item['id'];
-					$item_parent = $item['parent'];
-					$item_parent_uri = $item['parent-uri'];
+					$uri_id = $item['uri-id'];
+					$parent_uri_id = $item['parent-uri-id'];
 				}
 			}
 		}
@@ -238,12 +235,16 @@ function display_content(App $a, $update = false, $update_uid = 0)
 		throw new HTTPException\NotFoundException(DI::l10n()->t('The requested item doesn\'t exist or has been deleted.'));
 	}
 
+	if (!DI::pConfig()->get(local_user(), 'system', 'detailed_notif')) {
+		DBA::update('notify', ['seen' => true], ['parent-uri-id' => $item['parent-uri-id'], 'uid' => local_user()]);
+	}
+
 	// We are displaying an "alternate" link if that post was public. See issue 2864
-	$is_public = Item::exists(['id' => $item_id, 'private' => [Item::PUBLIC, Item::UNLISTED]]);
+	$is_public = Post::exists(['uri-id' => $uri_id, 'private' => [Item::PUBLIC, Item::UNLISTED]]);
 	if ($is_public) {
 		// For the atom feed the nickname doesn't matter at all, we only need the item id.
-		$alternate = DI::baseUrl().'/display/feed-item/'.$item_id.'.atom';
-		$conversation = DI::baseUrl().'/display/feed-item/'.$item_parent.'/conversation.atom';
+		$alternate = DI::baseUrl().'/display/feed-item/'.$uri_id.'.atom';
+		$conversation = DI::baseUrl().'/display/feed-item/' . $parent_uri_id . '/conversation.atom';
 	} else {
 		$alternate = '';
 		$conversation = '';
@@ -257,8 +258,8 @@ function display_content(App $a, $update = false, $update_uid = 0)
 	$item_uid = local_user();
 
 	$parent = null;
-	if (!empty($item_parent_uri)) {
-		$parent = Item::selectFirst(['uid'], ['uri' => $item_parent_uri, 'wall' => true]);
+	if (!empty($parent_uri_id)) {
+		$parent = Post::selectFirst(['uid'], ['uri-id' => $parent_uri_id, 'wall' => true]);
 	}
 
 	if (DBA::isResult($parent)) {
@@ -300,8 +301,8 @@ function display_content(App $a, $update = false, $update_uid = 0)
 	$sql_extra = Item::getPermissionsSQLByUserId($a->profile['uid']);
 
 	if (local_user() && (local_user() == $a->profile['uid'])) {
-		$condition = ['parent-uri' => $item_parent_uri, 'uid' => local_user(), 'unseen' => true];
-		$unseen = Item::exists($condition);
+		$condition = ['parent-uri-id' => $parent_uri_id, 'uid' => local_user(), 'unseen' => true];
+		$unseen = Post::exists($condition);
 	} else {
 		$unseen = false;
 	}
@@ -310,23 +311,23 @@ function display_content(App $a, $update = false, $update_uid = 0)
 		return '';
 	}
 
-	$condition = ["`id` = ? AND `item`.`uid` IN (0, ?) " . $sql_extra, $item_id, $item_uid];
-	$fields = ['parent-uri', 'body', 'title', 'author-name', 'author-avatar', 'plink', 'author-id', 'owner-id', 'contact-id'];
-	$item = Item::selectFirstForUser($a->profile['uid'], $fields, $condition);
+	$condition = ["`uri-id` = ? AND `uid` IN (0, ?) " . $sql_extra, $uri_id, $item_uid];
+	$fields = ['parent-uri-id', 'body', 'title', 'author-name', 'author-avatar', 'plink', 'author-id', 'owner-id', 'contact-id'];
+	$item = Post::selectFirstForUser($a->profile['uid'], $fields, $condition);
 
 	if (!DBA::isResult($item)) {
 		throw new HTTPException\NotFoundException(DI::l10n()->t('The requested item doesn\'t exist or has been deleted.'));
 	}
 
-	$item['uri'] = $item['parent-uri'];
+	$item['uri-id'] = $item['parent-uri-id'];
 
 	if ($unseen) {
-		$condition = ['parent-uri' => $item_parent_uri, 'uid' => local_user(), 'unseen' => true];
+		$condition = ['parent-uri-id' => $parent_uri_id, 'uid' => local_user(), 'unseen' => true];
 		Item::update(['unseen' => false], $condition);
 	}
 
-	if (!$update) {
-		$o .= "<script> var netargs = '?item_id=" . $item_id . "'; </script>";
+	if (!$update && local_user()) {
+		$o .= "<script> var netargs = '?uri_id=" . $item['uri-id'] . "'; </script>";
 	}
 
 	$o .= conversation($a, [$item], 'display', $update_uid, false, 'commented', $item_uid);
@@ -391,9 +392,9 @@ function display_content(App $a, $update = false, $update_uid = 0)
 	return $o;
 }
 
-function displayShowFeed($item_id, $conversation)
+function displayShowFeed(int $uri_id, int $uid, bool $conversation)
 {
-	$xml = DFRN::itemFeed($item_id, $conversation);
+	$xml = DFRN::itemFeed($uri_id, $uid, $conversation);
 	if ($xml == '') {
 		throw new HTTPException\InternalServerErrorException(DI::l10n()->t('The feed for this item is unavailable.'));
 	}