Make the tests happy

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
index 1a429948a9d8de8ae2342c03da49910bf4ec47a0..07289e01325bcbb42bfc082f0bd08cca1bb433c8 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -32,6 +32,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;
@@ -70,7 +71,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;
@@ -187,7 +188,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
 
        if ($update) {
                $item_id = $_REQUEST['item_id'];
-               $item = Item::selectFirst(['uid', 'parent', 'parent-uri'], ['id' => $item_id]);
+               $item = Post::selectFirst(['uid', 'parent', 'parent-uri', 'parent-uri-id'], ['id' => $item_id]);
                if ($item['uid'] != 0) {
                        $a->profile = ['uid' => intval($item['uid'])];
                } else {
@@ -201,7 +202,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
 
                if ($a->argc == 2) {
                        $item_parent = 0;
-                       $fields = ['id', 'parent', 'parent-uri', 'uid'];
+                       $fields = ['id', 'parent', 'parent-uri', 'parent-uri-id', 'uid'];
 
                        if (local_user()) {
                                $condition = ['guid' => $a->argv[1], 'uid' => local_user()];
@@ -214,7 +215,7 @@ 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]);
+                               $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'];
@@ -238,8 +239,12 @@ 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(['id' => $item_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';
@@ -258,7 +263,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
 
        $parent = null;
        if (!empty($item_parent_uri)) {
-               $parent = Item::selectFirst(['uid'], ['uri' => $item_parent_uri, 'wall' => true]);
+               $parent = Post::selectFirst(['uid'], ['uri' => $item_parent_uri, 'wall' => true]);
        }
 
        if (DBA::isResult($parent)) {
@@ -301,7 +306,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
 
        if (local_user() && (local_user() == $a->profile['uid'])) {
                $condition = ['parent-uri' => $item_parent_uri, 'uid' => local_user(), 'unseen' => true];
-               $unseen = Item::exists($condition);
+               $unseen = Post::exists($condition);
        } else {
                $unseen = false;
        }