Merge pull request #9843 from annando/no-filetag

[friendica.git] / mod / ping.php

diff --git a/mod/ping.php b/mod/ping.php
index b588c1fb0baf2d2fa37664b2532539b8049f76e9..810598a0b3e5addda5d340df66fed33a86529a41 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -28,8 +28,8 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
-use Friendica\Model\Item;
 use Friendica\Model\Notify\Type;
+use Friendica\Model\Post;
 use Friendica\Model\Verb;
 use Friendica\Protocol\Activity;
 use Friendica\Util\DateTimeFormat;
@@ -137,9 +137,9 @@ function ping_init(App $a)
 
                $condition = ["`unseen` AND `uid` = ? AND NOT `origin` AND (`vid` != ? OR `vid` IS NULL)",
                        local_user(), Verb::getID(Activity::FOLLOW)];
-               $items = Item::selectForUser(local_user(), ['wall', 'uid', 'uri-id'], $condition);
+               $items = Post::selectForUser(local_user(), ['wall', 'uid', 'uri-id'], $condition);
                if (DBA::isResult($items)) {
-                       $items_unseen = Item::inArray($items);
+                       $items_unseen = Post::toArray($items);
                        $arr = ['items' => $items_unseen];
                        Hook::callAll('network_ping', $arr);
 
@@ -185,7 +185,7 @@ function ping_init(App $a)
                        "SELECT `intro`.`id`, `intro`.`datetime`,
                        `contact`.`name`, `contact`.`url`, `contact`.`photo`
                        FROM `intro` INNER JOIN `contact` ON `intro`.`contact-id` = `contact`.`id`
-                       WHERE `intro`.`uid` = %d AND NOT `intro`.`blocked` AND NOT `intro`.`ignore` AND `intro`.`contact-id` != 0 AND `intro`.`fid` = 0",
+                       WHERE `intro`.`uid` = %d AND NOT `intro`.`blocked` AND NOT `intro`.`ignore` AND `intro`.`contact-id` != 0 AND (`intro`.`fid` = 0 OR `intro`.`fid` IS NULL)",
                        intval(local_user())
                );
 
@@ -346,6 +346,7 @@ function ping_init(App $a)
                        }
 
                        $notification['timestamp'] = DateTimeFormat::local($notification['date']);
+                       $notification['date'] = Temporal::getRelativeDate($notification['date']);
                });
        }
 
@@ -411,8 +412,8 @@ function ping_get_notifications($uid)
 
        do {
                $r = q(
-                       "SELECT `notify`.*, `item`.`visible`, `item`.`deleted`
-                       FROM `notify` LEFT JOIN `item` ON `item`.`id` = `notify`.`iid`
+                       "SELECT `notify`.*, `post-view`.`visible`, `post-view`.`deleted`
+                       FROM `notify` LEFT JOIN `post-view` ON `post-view`.`id` = `notify`.`iid`
                        WHERE `notify`.`uid` = %d AND `notify`.`msg` != ''
                        AND NOT (`notify`.`type` IN (%d, %d))
                        AND $seensql `notify`.`seen` ORDER BY `notify`.`date` $order LIMIT %d, 50",