Unused variables removed

[friendica.git] / mod / ping.php

diff --git a/mod/ping.php b/mod/ping.php
index 4890197074ca93ecc780364d5d10310aa07bd1d3..3dab119700dcfeb70b322526d9989a470e2154e0 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -1,6 +1,22 @@
 <?php
 /**
- * @file include/ping.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 use Friendica\App;
@@ -13,6 +29,8 @@ use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
+use Friendica\Model\Notify\Type;
+use Friendica\Protocol\Activity;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Temporal;
 use Friendica\Util\Proxy as ProxyUtils;
@@ -41,7 +59,7 @@ use Friendica\Util\XML;
  *            "birthdays-today": 0,
  *            "groups": [ ],
  *            "forums": [ ],
- *            "notify": 0,
+ *            "notification": 0,
  *            "notifications": [ ],
  *            "sysmsgs": {
  *                "notice": [ ],
@@ -117,9 +135,10 @@ function ping_init(App $a)
 
                $notifs = ping_get_notifications(local_user());
 
-               $condition = ["`unseen` AND `uid` = ? AND `contact-id` != ?", local_user(), local_user()];
+               $condition = ["`unseen` AND `uid` = ? AND `contact-id` != ? AND (`activity` != ? OR `activity` IS NULL)",
+                       local_user(), local_user(), Item::activityToIndex(Activity::FOLLOW)];
                $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'];
+                       'network', 'created', 'object', 'parent-author-name', 'parent-author-link', 'parent-guid', 'wall', 'activity'];
                $params = ['order' => ['received' => true]];
                $items = Item::selectForUser(local_user(), $fields, $condition, $params);
 
@@ -351,7 +370,7 @@ function ping_init(App $a)
        if ($format == 'json') {
                $data['groups'] = $groups_unseen;
                $data['forums'] = $forums_unseen;
-               $data['notify'] = $sysnotify_count + $intro_count + $register_count;
+               $data['notification'] = $sysnotify_count + $intro_count + $register_count;
                $data['notifications'] = $notifications;
                $data['sysmsgs'] = [
                        'notice' => $sysmsgs,
@@ -403,8 +422,8 @@ function ping_get_notifications($uid)
                        AND NOT (`notify`.`type` IN (%d, %d))
                        AND $seensql `notify`.`seen` ORDER BY `notify`.`date` $order LIMIT %d, 50",
                        intval($uid),
-                       intval(NOTIFY_INTRO),
-                       intval(NOTIFY_MAIL),
+                       intval(Type::INTRO),
+                       intval(Type::MAIL),
                        intval($offset)
                );
 
@@ -433,7 +452,7 @@ function ping_get_notifications($uid)
                                $notification["message"] = $notification["msg_cache"];
                        } else {
                                $notification["name"] = strip_tags(BBCode::convert($notification["name"]));
-                               $notification["message"] = format_notification_message($notification["name"], strip_tags(BBCode::convert($notification["msg"])));
+                               $notification["message"] = Friendica\Model\Notify::formatMessage($notification["name"], strip_tags(BBCode::convert($notification["msg"])));
 
                                q(
                                        "UPDATE `notify` SET `name_cache` = '%s', `msg_cache` = '%s' WHERE `id` = %d",
@@ -443,7 +462,7 @@ function ping_get_notifications($uid)
                                );
                        }
 
-                       $notification["href"] = DI::baseUrl() . "/notify/view/" . $notification["id"];
+                       $notification["href"] = DI::baseUrl() . "/notification/" . $notification["id"];
 
                        if ($notification["visible"]
                                && !$notification["deleted"]