Merge pull request #9860 from MrPetovan/task/9640-rename-notification-classes

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
index d630d94a04ebb9722374ea2cdf1e975300e28dcc..4d03e223effc7979cab9782828147b6fec05085a 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;
@@ -62,7 +63,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"];
                        }
@@ -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;
@@ -82,14 +83,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' => [Item::PUBLIC, Item::UNLISTED], '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);
                }
-               $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $item_id, 'private' => [Item::PUBLIC, Item::UNLISTED], 'uid' => 0]);
+               $item = Post::selectFirstForUser(local_user(), $fields, ['id' => $item_id, 'private' => [Item::PUBLIC, Item::UNLISTED], 'uid' => 0]);
        }
 
        if (!DBA::isResult($item)) {
@@ -106,7 +107,7 @@ function display_init(App $a)
        }
 
        if ($item['gravity'] != GRAVITY_PARENT) {
-               $parent = Item::selectFirstForUser($item_user, $fields, ['id' => $item['parent']]);
+               $parent = Post::selectFirstForUser($item_user, $fields, ['id' => $item['parent']]);
                $item = $parent ?: $item;
        }
 
@@ -164,7 +165,7 @@ function display_fetchauthor($a, $item)
                $profiledata["about"] = "";
        }
 
-       $profiledata = array_merge($profiledata, Contact::getByURLForUser($profiledata["url"], local_user(), [], false));
+       $profiledata = Contact::getByURLForUser($profiledata["url"], local_user()) ?: $profiledata;
 
        if (!empty($profiledata["photo"])) {
                $profiledata["photo"] = DI::baseUrl()->remove($profiledata["photo"]);
@@ -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,11 +202,11 @@ 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()];
-                               $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'];
@@ -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'];
@@ -224,7 +225,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
 
                        if ($item_parent == 0) {
                                $condition = ['private' => [Item::PUBLIC, Item::UNLISTED], 'guid' => $a->argv[1], 'uid' => 0];
-                               $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'];
@@ -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;
        }
@@ -310,9 +315,9 @@ function display_content(App $a, $update = false, $update_uid = 0)
                return '';
        }
 
-       $condition = ["`id` = ? AND `item`.`uid` IN (0, ?) " . $sql_extra, $item_id, $item_uid];
+       $condition = ["`id` = ? AND `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);
+       $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.'));