Merge pull request #8647 from annando/annando/issue8619

[friendica.git] / mod / ping.php

diff --git a/mod/ping.php b/mod/ping.php
index 3057fb9e312fbf6219be9f397127896ce48fbc63..3dab119700dcfeb70b322526d9989a470e2154e0 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -30,6 +30,7 @@ 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;
@@ -134,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);