Merge pull request #9815 from annando/post-again

[friendica.git] / src / Module / Update / Profile.php

diff --git a/src/Module/Update/Profile.php b/src/Module/Update/Profile.php
index 38ef3b09e028cec4b842395dec91fc3c33223c55..741bcc79c5f0f67d2c08310a23e8ef63bc053367 100644 (file)
--- a/src/Module/Update/Profile.php
+++ b/src/Module/Update/Profile.php
@@ -22,12 +22,12 @@
 namespace Friendica\Module\Update;
 
 use Friendica\BaseModule;
-use Friendica\Content\Pager;
 use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Item;
+use Friendica\Model\Post;
 use Friendica\Model\Profile as ProfileModel;
 use Friendica\Network\HTTPException\ForbiddenException;
 use Friendica\Util\DateTimeFormat;
@@ -71,27 +71,18 @@ class Profile extends BaseModule
                // If the page user is the owner of the page we should query for unseen
                // items. Otherwise use a timestamp of the last succesful update request.
                if ($is_owner || !$last_updated) {
-                       $sql_extra4 = " AND `item`.`unseen`";
+                       $sql_extra4 = " AND `unseen`";
                } else {
                        $gmupdate = gmdate(DateTimeFormat::MYSQL, $last_updated);
-                       $sql_extra4 = " AND `item`.`received` > '" . $gmupdate . "'";
+                       $sql_extra4 = " AND `received` > '" . $gmupdate . "'";
                }
 
                $items_stmt = DBA::p(
-                       "SELECT DISTINCT(`parent-uri`) AS `uri`, `item`.`created`
-                       FROM `item`
-                       INNER JOIN `contact`
-                       ON `contact`.`id` = `item`.`contact-id`
-                               AND NOT `contact`.`blocked`
-                               AND NOT `contact`.`pending`
-                       WHERE `item`.`uid` = ?
-                               AND `item`.`visible`
-                               AND     (NOT `item`.`deleted` OR `item`.`gravity` = ?)
-                               AND NOT `item`.`moderated`
-                               AND `item`.`wall`
-                               $sql_extra4
-                               $sql_extra
-                       ORDER BY `item`.`received` DESC",
+                       "SELECT DISTINCT(`parent-uri`) AS `uri`, `created` FROM `post-view`
+                               WHERE `uid` = ? AND NOT `contact-blocked` AND NOT `contact-pending`
+                               AND `visible` AND (NOT `deleted` OR `gravity` = ?)
+                               AND NOT `moderated` AND `wall` $sql_extra4 $sql_extra
+                       ORDER BY `received` DESC",
                        $a->profile['uid'],
                        GRAVITY_ACTIVITY
                );
@@ -111,7 +102,7 @@ class Profile extends BaseModule
                }
 
                if ($is_owner) {
-                       $unseen = Item::exists(['wall' => true, 'unseen' => true, 'uid' => local_user()]);
+                       $unseen = Post::exists(['wall' => true, 'unseen' => true, 'uid' => local_user()]);
                        if ($unseen) {
                                Item::update(['unseen' => false], ['wall' => true, 'unseen' => true, 'uid' => local_user()]);
                        }