Merge pull request #5830 from nupplaphil/update_from_boot

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
index 2d32eed5eb504018f39cab567e920227fca5240f..d95404a5b135ead15ce714a898b5b19525ba3599 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -4,11 +4,13 @@
  */
 
 use Friendica\App;
+use Friendica\Content\Pager;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\ACL;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
@@ -16,6 +18,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
+use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\DFRN;
 
 function display_init(App $a)
@@ -43,7 +46,7 @@ function display_init(App $a)
 
        $item = null;
 
-       $fields = ['id', 'parent', 'author-id', 'body', 'uid'];
+       $fields = ['id', 'parent', 'author-id', 'body', 'uid', 'guid'];
 
        // If there is only one parameter, then check if this parameter could be a guid
        if ($a->argc == 2) {
@@ -72,10 +75,14 @@ function display_init(App $a)
        }
 
        if (!empty($_SERVER['HTTP_ACCEPT']) && strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) {
-               logger('Directly serving XML for id '.$item["id"], LOGGER_DEBUG);
+               Logger::log('Directly serving XML for id '.$item["id"], Logger::DEBUG);
                displayShowFeed($item["id"], false);
        }
 
+       if (ActivityPub::isRequest()) {
+               $a->internalRedirect(str_replace('display/', 'objects/', $a->query_string));
+       }
+
        if ($item["id"] != $item["parent"]) {
                $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $item["parent"]]);
        }
@@ -195,7 +202,6 @@ function display_content(App $a, $update = false, $update_uid = 0)
                return;
        }
 
-       require_once 'include/security.php';
        require_once 'include/conversation.php';
 
        $o = '';
@@ -320,7 +326,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
                $o .= status_editor($a, $x, 0, true);
        }
 
-       $sql_extra = item_permissions_sql($a->profile['uid'], $is_remote_contact, $groups);
+       $sql_extra = Item::getPermissionsSQLByUserId($a->profile['uid'], $is_remote_contact, $groups);
 
        if (local_user() && (local_user() == $a->profile['uid'])) {
                $condition = ['parent-uri' => $item_parent_uri, 'uid' => local_user(), 'unseen' => true];
@@ -333,35 +339,34 @@ function display_content(App $a, $update = false, $update_uid = 0)
                return '';
        }
 
-       $condition = ["`item`.`parent-uri` = (SELECT `parent-uri` FROM `item` WHERE `id` = ?)
-               AND `item`.`uid` IN (0, ?) " . $sql_extra, $item_id, local_user()];
-       $params = ['order' => ['uid', 'parent' => true, 'gravity', 'id']];
-       $items_obj = Item::selectForUser(local_user(), [], $condition, $params);
+       $condition = ["`id` = ? AND `item`.`uid` IN (0, ?) " . $sql_extra, $item_id, local_user()];
+       $fields = ['parent-uri', 'body', 'title', 'author-name', 'author-avatar', 'plink'];
+       $item = Item::selectFirstForUser(local_user(), $fields, $condition);
 
-       if (!DBA::isResult($items_obj)) {
+       if (!DBA::isResult($item)) {
                notice(L10n::t('Item not found.') . EOL);
                return $o;
        }
 
+       $item['uri'] = $item['parent-uri'];
+
        if ($unseen) {
                $condition = ['parent-uri' => $item_parent_uri, 'uid' => local_user(), 'unseen' => true];
                Item::update(['unseen' => false], $condition);
        }
 
-       $items = Item::inArray($items_obj);
-       $conversation_items = conv_sort($items, "`commented`");
-
        if (!$update) {
                $o .= "<script> var netargs = '?f=&item_id=" . $item_id . "'; </script>";
        }
-       $o .= conversation($a, $conversation_items, 'display', $update_uid, false, 'commented', local_user());
+
+       $o .= conversation($a, [$item], new Pager($a->query_string), 'display', $update_uid, false, 'commented', local_user());
 
        // Preparing the meta header
-       $description = trim(HTML::toPlaintext(BBCode::convert($items[0]["body"], false), 0, true));
-       $title = trim(HTML::toPlaintext(BBCode::convert($items[0]["title"], false), 0, true));
-       $author_name = $items[0]["author-name"];
+       $description = trim(HTML::toPlaintext(BBCode::convert($item["body"], false), 0, true));
+       $title = trim(HTML::toPlaintext(BBCode::convert($item["title"], false), 0, true));
+       $author_name = $item["author-name"];
 
-       $image = $a->remove_baseurl($items[0]["author-avatar"]);
+       $image = $a->removeBaseURL($item["author-avatar"]);
 
        if ($title == "") {
                $title = $author_name;
@@ -393,7 +398,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
        $a->page['htmlhead'] .= '<meta name="twitter:title" content="'.$title.'" />'."\n";
        $a->page['htmlhead'] .= '<meta name="twitter:description" content="'.$description.'" />'."\n";
        $a->page['htmlhead'] .= '<meta name="twitter:image" content="'.System::baseUrl().'/'.$image.'" />'."\n";
-       $a->page['htmlhead'] .= '<meta name="twitter:url" content="'.$items[0]["plink"].'" />'."\n";
+       $a->page['htmlhead'] .= '<meta name="twitter:url" content="'.$item["plink"].'" />'."\n";
 
        // Dublin Core
        $a->page['htmlhead'] .= '<meta name="DC.title" content="'.$title.'" />'."\n";
@@ -403,7 +408,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
        $a->page['htmlhead'] .= '<meta property="og:type" content="website" />'."\n";
        $a->page['htmlhead'] .= '<meta property="og:title" content="'.$title.'" />'."\n";
        $a->page['htmlhead'] .= '<meta property="og:image" content="'.System::baseUrl().'/'.$image.'" />'."\n";
-       $a->page['htmlhead'] .= '<meta property="og:url" content="'.$items[0]["plink"].'" />'."\n";
+       $a->page['htmlhead'] .= '<meta property="og:url" content="'.$item["plink"].'" />'."\n";
        $a->page['htmlhead'] .= '<meta property="og:description" content="'.$description.'" />'."\n";
        $a->page['htmlhead'] .= '<meta name="og:article:author" content="'.$author_name.'" />'."\n";
        // article:tag