The item notifications now are based upon the "user-item" field

[friendica.git] / mod / ping.php

diff --git a/mod/ping.php b/mod/ping.php
index 9b844cc48ddc02ad7ce52f3753e20f3d74cd08ce..c76780f69744c7cf11c0f0eaff2ea7a65fe0ed05 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -11,8 +11,8 @@ use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
@@ -123,7 +123,7 @@ function ping_init(App $a)
                $condition = ["`unseen` AND `uid` = ? AND `contact-id` != ?", local_user(), local_user()];
                $fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'contact-avatar',
                        'network', 'created', 'object', 'parent-author-name', 'parent-author-link', 'parent-guid', 'wall'];
-               $params = ['order' => ['created' => true]];
+               $params = ['order' => ['received' => true]];
                $items = Item::selectForUser(local_user(), $fields, $condition, $params);
 
                if (DBA::isResult($items)) {
@@ -179,7 +179,7 @@ function ping_init(App $a)
                $intro_count = count($intros1) + count($intros2);
                $intros = $intros1 + $intros2;
 
-               $myurl = System::baseUrl() . '/profile/' . $a->user['nickname'];
+               $myurl = DI::baseUrl() . '/profile/' . $a->user['nickname'];
                $mails = q(
                        "SELECT `id`, `from-name`, `from-url`, `from-photo`, `created` FROM `mail`
                        WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ",
@@ -263,7 +263,7 @@ function ping_init(App $a)
                        foreach ($intros as $intro) {
                                $notif = [
                                        'id'      => 0,
-                                       'href'    => System::baseUrl() . '/notifications/intros/' . $intro['id'],
+                                       'href'    => DI::baseUrl() . '/notifications/intros/' . $intro['id'],
                                        'name'    => $intro['name'],
                                        'url'     => $intro['url'],
                                        'photo'   => $intro['photo'],
@@ -279,7 +279,7 @@ function ping_init(App $a)
                        foreach ($regs as $reg) {
                                $notif = [
                                        'id'      => 0,
-                                       'href'    => System::baseUrl() . '/admin/users/',
+                                       'href'    => DI::baseUrl() . '/admin/users/',
                                        'name'    => $reg['name'],
                                        'url'     => $reg['url'],
                                        'photo'   => $reg['micro'],
@@ -446,7 +446,7 @@ function ping_get_notifications($uid)
                                );
                        }
 
-                       $notification["href"] = System::baseUrl() . "/notify/view/" . $notification["id"];
+                       $notification["href"] = DI::baseUrl() . "/notify/view/" . $notification["id"];
 
                        if ($notification["visible"]
                                && !$notification["deleted"]