X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fdisplay.php;h=c9d39b1db08051549ab92cbd3b9f8d153fa94545;hb=3f0937dd428714c9bd3aa78c1f26b5295149e0b9;hp=b5edafc5f93f84db4a20fa61125df4853ab229b3;hpb=4f29e4c4a7459c07da71aab52869b1e9591f0fcc;p=friendica.git
diff --git a/mod/display.php b/mod/display.php
index b5edafc5f9..c9d39b1db0 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -1,10 +1,25 @@
.
+ *
*/
use Friendica\App;
-use Friendica\Content\Pager;
use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\HTML;
use Friendica\Core\ACL;
@@ -16,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;
@@ -26,7 +42,7 @@ use Friendica\Util\Strings;
function display_init(App $a)
{
if (ActivityPub::isRequest()) {
- Objects::rawContent();
+ Objects::rawContent(['guid' => $a->argv[1] ?? null]);
}
if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
@@ -38,7 +54,7 @@ function display_init(App $a)
$item = null;
$item_user = local_user();
- $fields = ['id', 'parent', 'author-id', 'body', 'uid', 'guid'];
+ $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) {
@@ -46,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"];
}
@@ -54,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' => 1, '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;
@@ -66,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' => [0, 2], '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' => [0, 2], 'uid' => 0]);
+ $item = Post::selectFirstForUser(local_user(), $fields, ['uri-id' => $uri_id, 'private' => [Item::PUBLIC, Item::UNLISTED], 'uid' => 0]);
}
if (!DBA::isResult($item)) {
@@ -81,30 +97,26 @@ 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["id"] != $item["parent"]) {
- $parent = Item::selectFirstForUser($item_user, $fields, ['id' => $item["parent"]]);
+ if ($item['gravity'] != GRAVITY_PARENT) {
+ $parent = Post::selectFirstForUser($item_user, $fields, ['uid' => $item['uid'], 'uri-id' => $item['parent-uri-id']]);
$item = $parent ?: $item;
}
$profiledata = display_fetchauthor($a, $item);
- if (strstr(Strings::normaliseLink($profiledata["url"]), Strings::normaliseLink(DI::baseUrl()))) {
- $nickname = str_replace(Strings::normaliseLink(DI::baseUrl())."/profile/", "", Strings::normaliseLink($profiledata["url"]));
+ if (strstr(Strings::normaliseLink($profiledata['url']), Strings::normaliseLink(DI::baseUrl()))) {
+ $nickname = str_replace(Strings::normaliseLink(DI::baseUrl()) . '/profile/', '', Strings::normaliseLink($profiledata['url']));
- if ($nickname != $a->user["nickname"]) {
- $profile = DBA::fetchFirst("SELECT `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
- INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
- WHERE `user`.`nickname` = ? AND `profile`.`is-default` AND `contact`.`self` LIMIT 1",
- $nickname
- );
+ if (!empty($a->user['nickname']) && $nickname != $a->user['nickname']) {
+ $profile = DBA::selectFirst('owner-view', [], ['nickname' => $nickname]);
if (DBA::isResult($profile)) {
$profiledata = $profile;
}
@@ -114,7 +126,7 @@ function display_init(App $a)
}
}
- Profile::load($a, $nick, 0, $profiledata);
+ Profile::load($a, $nick, $profiledata);
}
function display_fetchauthor($a, $item)
@@ -152,7 +164,7 @@ function display_fetchauthor($a, $item)
$profiledata["about"] = "";
}
- $profiledata = Contact::getDetailsByURL($profiledata["url"], local_user(), $profiledata);
+ $profiledata = Contact::getByURLForUser($profiledata["url"], local_user()) ?: $profiledata;
if (!empty($profiledata["photo"])) {
$profiledata["photo"] = DI::baseUrl()->remove($profiledata["photo"]);
@@ -171,50 +183,49 @@ function display_content(App $a, $update = false, $update_uid = 0)
$item = null;
+ $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' => 1, '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) {
- $condition = ['private' => [0, 2], 'guid' => $a->argv[1], 'uid' => 0];
- $item = Item::selectFirstForUser(local_user(), $fields, $condition);
+ if ($parent_uri_id == 0) {
+ $condition = ['private' => [Item::PUBLIC, Item::UNLISTED], 'guid' => $a->argv[1], 'uid' => 0];
+ $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'];
}
}
}
@@ -224,12 +235,17 @@ 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('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()]);
+ }
+
// We are displaying an "alternate" link if that post was public. See issue 2864
- $is_public = Item::exists(['id' => $item_id, 'private' => [0, 2]]);
+ $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 = '';
@@ -243,8 +259,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)) {
@@ -269,7 +285,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) {
+ if ($is_owner && !$update) {
$x = [
'is_owner' => true,
'allow_location' => $a->user['allow_location'],
@@ -286,36 +302,36 @@ 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;
}
- if ($update && !$unseen) {
+ if ($update && !$unseen && !$force) {
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 .= "";
+ if (!$update && local_user()) {
+ $o .= "";
}
- $o .= conversation($a, [$item], new Pager(DI::args()->getQueryString()), 'display', $update_uid, false, 'commented', $item_uid);
+ $o .= conversation($a, [$item], 'display', $update_uid, false, 'commented', $item_uid);
// Preparing the meta header
$description = trim(HTML::toPlaintext(BBCode::convert($item["body"], false), 0, true));
@@ -377,9 +393,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.'));
}