Some more

[friendica.git] / mod / noscrape.php

diff --git a/mod/noscrape.php b/mod/noscrape.php
index 814dc885cd5498f20a071dab391ea5cd7d9349e4..113ad8746266ac0ebbc466e00bec45bde59cfe8a 100644 (file)
--- a/mod/noscrape.php
+++ b/mod/noscrape.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 function noscrape_init(App $a) {
 
@@ -35,14 +36,16 @@ function noscrape_init(App $a) {
                'fn'       => $a->profile['name'],
                'addr'     => $a->profile['addr'],
                'nick'     => $which,
+               'guid'     => $a->profile['guid'],
                'key'      => $a->profile['pubkey'],
-               'homepage' => App::get_baseurl()."/profile/{$which}",
+               'homepage' => System::baseUrl()."/profile/{$which}",
                'comm'     => (x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY),
                'photo'    => $r[0]["photo"],
                'tags'     => $keywords
        );
 
        if (is_array($a->profile) && !$a->profile['hide-friends']) {
+               /// @todo What should this value tell us?
                $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 (dbm::is_result($r)) {
@@ -61,6 +64,23 @@ function noscrape_init(App $a) {
                }
        }
 
+       // We display the last activity (post or login), reduced to year and week number
+       $last_active = 0;
+       $condition = array('uid' => $a->profile['uid'], 'self' => true);
+       $contact = dba::select('contact', array('last-item'), $condition, array('limit' => 1));
+       if (dbm::is_result($contact)) {
+               $last_active = strtotime($contact['last-item']);
+       }
+
+       $condition = array('uid' => $a->profile['uid']);
+       $user = dba::select('user', array('login_date'), $condition, array('limit' => 1));
+       if (dbm::is_result($user)) {
+               if ($last_active < strtotime($user['login_date'])) {
+                       $last_active = strtotime($user['login_date']);
+               }
+       }
+       $json_info["last-activity"] = date("o-W", $last_active);
+
        //These are optional fields.
        $profile_fields = array('pdesc', 'locality', 'region', 'postal-code', 'country-name', 'gender', 'marital', 'about');
        foreach ($profile_fields as $field) {
@@ -71,7 +91,7 @@ function noscrape_init(App $a) {
 
        $dfrn_pages = array('request', 'confirm', 'notify', 'poll');
        foreach ($dfrn_pages as $dfrn) {
-               $json_info["dfrn-{$dfrn}"] = App::get_baseurl()."/dfrn_{$dfrn}/{$which}";
+               $json_info["dfrn-{$dfrn}"] = System::baseUrl()."/dfrn_{$dfrn}/{$which}";
        }
 
        //Output all the JSON!