Merge pull request #2465 from annando/1604-no-unknown

[friendica.git] / mod / noscrape.php

diff --git a/mod/noscrape.php b/mod/noscrape.php
index 170c7377679b279800ef8e038fc8a3577ecac5f5..4be1a740cd87b6eaaa4d135c256ad6b11d77bb80 100644 (file)
--- a/mod/noscrape.php
+++ b/mod/noscrape.php
@@ -22,16 +22,26 @@ function noscrape_init(&$a) {
        $keywords = str_replace(array('#',',',' ',',,'),array('',' ',',',','),$keywords);
        $keywords = explode(',', $keywords);
 
+       $r = q("SELECT `photo` FROM `contact` WHERE `self` AND `uid` = %d",
+               intval($a->profile['uid']));
+
        $json_info = array(
                'fn' => $a->profile['name'],
+               'addr' => $a->profile['addr'],
+               'nick' => $which,
                'key' => $a->profile['pubkey'],
                'homepage' => $a->get_baseurl()."/profile/{$which}",
                'comm' => (x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY),
-               'photo' => $a->profile['photo'],
+               'photo' => $r[0]["photo"],
                'tags' => $keywords
        );
 
        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', '')",
                        intval($a->profile['uid']),