Merge pull request #9517 from annando/no-duplicated

[friendica.git] / mod / ping.php

diff --git a/mod/ping.php b/mod/ping.php
index 4b972369c7021e732b5703c866f03083b812f5d1..8e00ae31f177235a7e3be2be73747c881f9b3bab 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -34,7 +34,6 @@ use Friendica\Model\Verb;
 use Friendica\Protocol\Activity;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Temporal;
-use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\XML;
 
 /**
@@ -138,7 +137,7 @@ 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'], $condition);
+               $items = Item::selectForUser(local_user(), ['wall', 'uid', 'uri-id'], $condition);
                if (DBA::isResult($items)) {
                        $items_unseen = Item::inArray($items);
                        $arr = ['items' => $items_unseen];
@@ -178,15 +177,15 @@ function ping_init(App $a)
                $intros1 = q(
                        "SELECT  `intro`.`id`, `intro`.`datetime`,
                        `fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo`
-                       FROM `intro` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
-                       WHERE `intro`.`uid` = %d  AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`fid` != 0",
+                       FROM `intro` INNER JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
+                       WHERE `intro`.`uid` = %d AND NOT `intro`.`blocked` AND NOT `intro`.`ignore` AND `intro`.`fid` != 0",
                        intval(local_user())
                );
                $intros2 = q(
                        "SELECT `intro`.`id`, `intro`.`datetime`,
                        `contact`.`name`, `contact`.`url`, `contact`.`photo`
-                       FROM `intro` LEFT JOIN `contact` ON `intro`.`contact-id` = `contact`.`id`
-                       WHERE `intro`.`uid` = %d  AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`contact-id` != 0",
+                       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",
                        intval(local_user())
                );
 
@@ -290,16 +289,30 @@ function ping_init(App $a)
                }
 
                if (DBA::isResult($regs)) {
-                       foreach ($regs as $reg) {
+                       if (count($regs) <= 1 || DI::pConfig()->get(local_user(), 'system', 'detailed_notif')) {
+                               foreach ($regs as $reg) {
+                                       $notif = [
+                                               'id'      => 0,
+                                               'href'    => DI::baseUrl() . '/admin/users/pending',
+                                               'name'    => $reg['name'],
+                                               'url'     => $reg['url'],
+                                               'photo'   => $reg['micro'],
+                                               'date'    => $reg['created'],
+                                               'seen'    => false,
+                                               'message' => DI::l10n()->t('{0} requested registration'),
+                                       ];
+                                       $notifs[] = $notif;
+                               }
+                       } else {
                                $notif = [
                                        'id'      => 0,
-                                       'href'    => DI::baseUrl() . '/admin/users/',
-                                       'name'    => $reg['name'],
-                                       'url'     => $reg['url'],
-                                       'photo'   => $reg['micro'],
-                                       'date'    => $reg['created'],
+                                       'href'    => DI::baseUrl() . '/admin/users/pending',
+                                       'name'    => $regs[0]['name'],
+                                       'url'     => $regs[0]['url'],
+                                       'photo'   => $regs[0]['micro'],
+                                       'date'    => $regs[0]['created'],
                                        'seen'    => false,
-                                       'message' => DI::l10n()->t('{0} requested registration'),
+                                       'message' => DI::l10n()->t('{0} and %d others requested registration', count($regs) - 1),
                                ];
                                $notifs[] = $notif;
                        }
@@ -328,12 +341,8 @@ function ping_init(App $a)
 
                if (DBA::isResult($notifs)) {
                        foreach ($notifs as $notif) {
-                               $contact = Contact::getByURL($notif['url'], false, ['micro']);
-                               if (isset($contact['micro'])) {
-                                       $notif['photo'] = ProxyUtils::proxifyUrl($contact['micro'], false, ProxyUtils::SIZE_MICRO);
-                               } else {
-                                       $notif['photo'] = ProxyUtils::proxifyUrl($notif['photo'], false, ProxyUtils::SIZE_MICRO);
-                               }
+                               $contact = Contact::getByURL($notif['url'], false, ['micro', 'id', 'avatar']);
+                               $notif['photo'] = Contact::getMicro($contact, $notif['photo']);
 
                                $local_time = DateTimeFormat::local($notif['date']);