X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FNoScrape.php;h=c4138ed709db5c2c0191a3bd2b3134993f4ffe3d;hb=3bca4fe2a64671d09e08346456cdfa6c12f996e9;hp=b791c5cd7922bb992ba68deec352ec48e5abfb07;hpb=a91e3f5dbce82471a04e9a3bf3a9957589f766be;p=friendica.git diff --git a/src/Module/NoScrape.php b/src/Module/NoScrape.php index b791c5cd79..c4138ed709 100644 --- a/src/Module/NoScrape.php +++ b/src/Module/NoScrape.php @@ -1,6 +1,6 @@ parameters['nick'])) { // Get infos about a specific nick (public) - $which = $parameters['nick']; - } elseif (local_user() && isset($parameters['profile']) && DI::args()->get(2) == 'view') { + $which = $this->parameters['nick']; + } elseif (DI::userSession()->getLocalUserId() && isset($this->parameters['profile']) && DI::args()->get(2) == 'view') { // view infos about a known profile (needs a login) $which = $a->getLoggedInUserNickname(); } else { - System::jsonError(403, 'Authentication required'); + $this->jsonError(403, 'Authentication required'); } - $profile = User::getOwnerDataByNick($which); + $owner = User::getOwnerDataByNick($which); - if (empty($profile['uid'])) { - System::jsonError(404, 'Profile not found'); + if (empty($owner['uid'])) { + $this->jsonError(404, 'Profile not found'); } $json_info = [ - 'addr' => $profile['addr'], + 'addr' => $owner['addr'], 'nick' => $which, - 'guid' => $profile['guid'], - 'key' => $profile['upubkey'], - 'homepage' => DI::baseUrl() . "/profile/{$which}", - 'comm' => ($profile['account-type'] == User::ACCOUNT_TYPE_COMMUNITY), - 'account-type' => $profile['account-type'], + 'guid' => $owner['guid'], + 'key' => $owner['upubkey'], + 'homepage' => DI::baseUrl() . '/profile/' . $which, + 'comm' => ($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY), + 'account-type' => $owner['account-type'], ]; $dfrn_pages = ['request', 'confirm', 'notify', 'poll']; @@ -70,62 +69,44 @@ class NoScrape extends BaseModule $json_info["dfrn-{$dfrn}"] = DI::baseUrl() . "/dfrn_{$dfrn}/{$which}"; } - if (!$profile['net-publish']) { + if (!$owner['net-publish']) { $json_info['hide'] = true; - System::jsonExit($json_info); + $this->jsonExit($json_info); } - $keywords = $profile['pub_keywords'] ?? ''; + $keywords = $owner['pub_keywords'] ?? ''; $keywords = str_replace(['#', ',', ' ', ',,'], ['', ' ', ',', ','], $keywords); $keywords = explode(',', $keywords); - $json_info['fn'] = $profile['name']; - $json_info['photo'] = User::getAvatarUrlForId($profile['uid']); + $json_info['fn'] = $owner['name']; + $json_info['photo'] = User::getAvatarUrl($owner); $json_info['tags'] = $keywords; - $json_info['language'] = $profile['language']; + $json_info['language'] = $owner['language']; - if (!empty($profile['last-item'])) { - $json_info['updated'] = date("c", strtotime($profile['last-item'])); + if (!empty($owner['last-item'])) { + $json_info['updated'] = date("c", strtotime($owner['last-item'])); } - if (!($profile['hide-friends'] ?? false)) { - $json_info['contacts'] = DBA::count('contact', - [ - 'uid' => $profile['uid'], - 'self' => 0, - 'blocked' => 0, - 'pending' => 0, - 'hidden' => 0, - 'archive' => 0, - 'network' => [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS] - ]); + if (!($owner['hide-friends'] ?? false)) { + $apcontact = APContact::getByURL($owner['url']); + $json_info['contacts'] = max($apcontact['following_count'], $apcontact['followers_count']); } // We display the last activity (post or login), reduced to year and week number - $last_active = 0; - $condition = ['uid' => $profile['uid'], 'self' => true]; - $contact = DBA::selectFirst('contact', ['last-item'], $condition); - if (DBA::isResult($contact)) { - $last_active = strtotime($contact['last-item']); - } - - $condition = ['uid' => $profile['uid']]; - $user = DBA::selectFirst('user', ['login_date'], $condition); - if (DBA::isResult($user)) { - if ($last_active < strtotime($user['login_date'])) { - $last_active = strtotime($user['login_date']); - } + $last_active = strtotime($owner['last-item']); + if ($owner['last-activity'] && $last_active < strtotime($owner['last-activity'])) { + $last_active = strtotime($owner['last-activity']); } $json_info['last-activity'] = date('o-W', $last_active); //These are optional fields. $profile_fields = ['about', 'locality', 'region', 'postal-code', 'country-name', 'xmpp', 'matrix']; foreach ($profile_fields as $field) { - if (!empty($profile[$field])) { - $json_info["$field"] = $profile[$field]; + if (!empty($owner[$field])) { + $json_info[$field] = $owner[$field]; } } - System::jsonExit($json_info); + $this->jsonExit($json_info); } }