Merge pull request #10967 from annando/api

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
index befef9753054c49271b0d9ff201e73809a993174..b53dd354381b2266cea49cace30e3e9437db1342 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -22,7 +22,6 @@
 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;
@@ -63,7 +62,7 @@ function display_init(App $a)
                if (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();
                        }
                }
 
@@ -100,7 +99,7 @@ function display_init(App $a)
        }
 
        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);
        }
 
@@ -174,7 +173,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']);
@@ -191,8 +190,8 @@ function display_content(App $a, $update = false, $update_uid = 0)
                        $fields = ['uri-id', 'parent-uri-id', 'uid'];
 
                        if (local_user()) {
-                               $condition = ['guid' => DI::args()->getArgv()[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'];
@@ -223,8 +222,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
@@ -247,7 +246,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]);
        }
 
@@ -273,18 +272,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);
 
@@ -318,7 +306,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']));