Merge pull request #8888 from annando/rename-keywordlist

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
index fd0079f9f6992ba5009059144024c5e72b5f7225..1a429948a9d8de8ae2342c03da49910bf4ec47a0 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -42,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()) {
@@ -54,7 +54,7 @@ function display_init(App $a)
        $item = null;
        $item_user = local_user();
 
-       $fields = ['id', 'parent', 'author-id', 'body', 'uid', 'guid'];
+       $fields = ['id', 'parent', '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) {
@@ -101,12 +101,12 @@ function display_init(App $a)
        }
 
        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 id '.$item['id'], Logger::DEBUG);
+               displayShowFeed($item['id'], false);
        }
 
-       if ($item["id"] != $item["parent"]) {
-               $parent = Item::selectFirstForUser($item_user, $fields, ['id' => $item["parent"]]);
+       if ($item['gravity'] != GRAVITY_PARENT) {
+               $parent = Item::selectFirstForUser($item_user, $fields, ['id' => $item['parent']]);
                $item = $parent ?: $item;
        }
 
@@ -116,11 +116,7 @@ function display_init(App $a)
                $nickname = str_replace(Strings::normaliseLink(DI::baseUrl()) . '/profile/', '', Strings::normaliseLink($profiledata['url']));
 
                if (!empty($a->user['nickname']) && $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 `contact`.`self` LIMIT 1",
-                               $nickname
-                       );
+                       $profile = DBA::selectFirst('owner-view', [], ['nickname' => $nickname]);
                        if (DBA::isResult($profile)) {
                                $profiledata = $profile;
                        }
@@ -168,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"]);
@@ -187,6 +183,8 @@ 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]);
@@ -209,8 +207,8 @@ function display_content(App $a, $update = false, $update_uid = 0)
                                $condition = ['guid' => $a->argv[1], 'uid' => local_user()];
                                $item = Item::selectFirstForUser(local_user(), $fields, $condition);
                                if (DBA::isResult($item)) {
-                                       $item_id = $item["id"];
-                                       $item_parent = $item["parent"];
+                                       $item_id = $item['id'];
+                                       $item_parent = $item['parent'];
                                        $item_parent_uri = $item['parent-uri'];
                                }
                        }
@@ -218,8 +216,8 @@ function display_content(App $a, $update = false, $update_uid = 0)
                        if (($item_parent == 0) && remote_user()) {
                                $item = Item::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_id = $item['id'];
+                                       $item_parent = $item['parent'];
                                        $item_parent_uri = $item['parent-uri'];
                                }
                        }
@@ -228,8 +226,8 @@ function display_content(App $a, $update = false, $update_uid = 0)
                                $condition = ['private' => [Item::PUBLIC, Item::UNLISTED], 'guid' => $a->argv[1], 'uid' => 0];
                                $item = Item::selectFirstForUser(local_user(), $fields, $condition);
                                if (DBA::isResult($item)) {
-                                       $item_id = $item["id"];
-                                       $item_parent = $item["parent"];
+                                       $item_id = $item['id'];
+                                       $item_parent = $item['parent'];
                                        $item_parent_uri = $item['parent-uri'];
                                }
                        }
@@ -285,7 +283,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'],
@@ -308,7 +306,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
                $unseen = false;
        }
 
-       if ($update && !$unseen) {
+       if ($update && !$unseen && !$force) {
                return '';
        }