Merge pull request #2170 from fabrixxm/issue_1953

[friendica.git] / mod / noscrape.php

diff --git a/mod/noscrape.php b/mod/noscrape.php
index a93abd29a8b546154e35124e668b8021bdc73c08..51bd7234cf283a6b63e1d55d5af7e814ec6a589d 100644 (file)
--- a/mod/noscrape.php
+++ b/mod/noscrape.php
@@ -24,6 +24,7 @@ function noscrape_init(&$a) {
 
        $json_info = array(
                'fn' => $a->profile['name'],
+               'addr' => $a->profile['addr'],
                'key' => $a->profile['pubkey'],
                'homepage' => $a->get_baseurl()."/profile/{$which}",
                'comm' => (x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY),
@@ -32,13 +33,17 @@ function noscrape_init(&$a) {
        );
 
        if(is_array($a->profile) AND !$a->profile['hide-friends']) {
+               $r = q("SELECT `gcontact`.`updated` FROM `contact` INNER JOIN `gcontact` WHERE `gcontact`.`nurl` = `contact`.`nurl` AND `self` AND `uid` = %d LIMIT 1",
+                       intval($a->profile['uid']));
+               if(count($r))
+                       $json_info["updated"] =  date("c", strtotime($r[0]['updated']));
+
                $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0 AND `hidden` = 0 AND `archive` = 0
-                               AND `network` IN ('%s', '%s', '%s', '%s', '')",
+                               AND `network` IN ('%s', '%s', '%s', '')",
                        intval($a->profile['uid']),
                        dbesc(NETWORK_DFRN),
                        dbesc(NETWORK_DIASPORA),
-                       dbesc(NETWORK_OSTATUS),
-                       dbesc(NETWORK_STATUSNET)
+                       dbesc(NETWORK_OSTATUS)
                );
                if(count($r))
                        $json_info["contacts"] = intval($r[0]['total']);