More test data

[friendica.git] / mod / ping.php

diff --git a/mod/ping.php b/mod/ping.php
index 762d0a0f8187f0d6a1b4eda6cbc8924df5360633..c7ac8d8059dcd06d1e2c6d3e2a080eac954c937f 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\Notification;
+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);
 
@@ -412,14 +412,14 @@ 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",
                        intval($uid),
-                       intval(Type::INTRO),
-                       intval(Type::MAIL),
+                       intval(Notification\Type::INTRO),
+                       intval(Notification\Type::MAIL),
                        intval($offset)
                );
 
@@ -448,7 +448,7 @@ function ping_get_notifications($uid)
                                $notification["message"] = $notification["msg_cache"];
                        } else {
                                $notification["name"] = strip_tags(BBCode::convert($notification["name"]));
-                               $notification["message"] = Friendica\Model\Notify::formatMessage($notification["name"], strip_tags(BBCode::convert($notification["msg"])));
+                               $notification["message"] = Notification::formatMessage($notification["name"], strip_tags(BBCode::convert($notification["msg"])));
 
                                q(
                                        "UPDATE `notify` SET `name_cache` = '%s', `msg_cache` = '%s' WHERE `id` = %d",