From edc49ec9b4653d9ab64294904f81fc72a76ae4f2 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 23 Jul 2022 13:21:44 -0400 Subject: [PATCH 1/4] Add expected "users" property to NodeInfo usage property for all versions --- src/Model/Nodeinfo.php | 1 + src/Module/NodeInfo110.php | 8 ++------ src/Module/NodeInfo120.php | 8 ++------ src/Module/NodeInfo210.php | 8 ++------ 4 files changed, 7 insertions(+), 18 deletions(-) diff --git a/src/Model/Nodeinfo.php b/src/Model/Nodeinfo.php index 047fe0e58a..84a14a294d 100644 --- a/src/Model/Nodeinfo.php +++ b/src/Model/Nodeinfo.php @@ -79,6 +79,7 @@ class Nodeinfo $config = DI::config(); $usage = new stdClass(); + $usage->users = []; if (!empty($config->get('system', 'nodeinfo'))) { $usage->users = [ diff --git a/src/Module/NodeInfo110.php b/src/Module/NodeInfo110.php index 9935e9089a..a308f8e6f5 100644 --- a/src/Module/NodeInfo110.php +++ b/src/Module/NodeInfo110.php @@ -63,8 +63,8 @@ class NodeInfo110 extends BaseModule 'friendica' ], ], - 'services' => [], - 'usage' => [], + 'services' => Nodeinfo::getServices(), + 'usage' => Nodeinfo::getUsage(), 'openRegistrations' => intval($this->config->get('config', 'register_policy')) !== Register::CLOSED, 'metadata' => [ 'nodeName' => $this->config->get('config', 'sitename'), @@ -81,10 +81,6 @@ class NodeInfo110 extends BaseModule $nodeinfo['protocols']['outbound'][] = 'gnusocial'; } - $nodeinfo['usage'] = Nodeinfo::getUsage(); - - $nodeinfo['services'] = Nodeinfo::getServices(); - $nodeinfo['metadata']['protocols'] = $nodeinfo['protocols']; $nodeinfo['metadata']['protocols']['outbound'][] = 'atom1.0'; $nodeinfo['metadata']['protocols']['inbound'][] = 'atom1.0'; diff --git a/src/Module/NodeInfo120.php b/src/Module/NodeInfo120.php index 34bff37425..3e6a69b749 100644 --- a/src/Module/NodeInfo120.php +++ b/src/Module/NodeInfo120.php @@ -56,8 +56,8 @@ class NodeInfo120 extends BaseModule 'version' => FRIENDICA_VERSION . '-' . DB_UPDATE_VERSION, ], 'protocols' => ['dfrn', 'activitypub'], - 'services' => [], - 'usage' => [], + 'services' => Nodeinfo::getServices(), + 'usage' => Nodeinfo::getUsage(), 'openRegistrations' => intval($this->config->get('config', 'register_policy')) !== Register::CLOSED, 'metadata' => [ 'nodeName' => $this->config->get('config', 'sitename'), @@ -72,10 +72,6 @@ class NodeInfo120 extends BaseModule $nodeinfo['protocols'][] = 'ostatus'; } - $nodeinfo['usage'] = Nodeinfo::getUsage(); - - $nodeinfo['services'] = Nodeinfo::getServices(); - if (Addon::isEnabled('twitter')) { $nodeinfo['services']['inbound'][] = 'twitter'; } diff --git a/src/Module/NodeInfo210.php b/src/Module/NodeInfo210.php index 7e9291b492..723736a618 100644 --- a/src/Module/NodeInfo210.php +++ b/src/Module/NodeInfo210.php @@ -59,9 +59,9 @@ class NodeInfo210 extends BaseModule ], 'organization' => Nodeinfo::getOrganization($this->config), 'protocols' => ['dfrn', 'activitypub'], - 'services' => [], + 'services' => Nodeinfo::getServices(), 'openRegistrations' => intval($this->config->get('config', 'register_policy')) !== Register::CLOSED, - 'usage' => [], + 'usage' => Nodeinfo::getUsage(true), ]; if (!empty($this->config->get('system', 'diaspora_enabled'))) { @@ -72,10 +72,6 @@ class NodeInfo210 extends BaseModule $nodeinfo['protocols'][] = 'ostatus'; } - $nodeinfo['usage'] = Nodeinfo::getUsage(true); - - $nodeinfo['services'] = Nodeinfo::getServices(); - if (Addon::isEnabled('twitter')) { $nodeinfo['services']['inbound'][] = 'twitter'; } From a2a7d04fa1f3073e1bf79703e9516b20e502c225 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Wed, 20 Jul 2022 17:04:08 +0200 Subject: [PATCH 2/4] Changed double-quotes to single --- src/Model/FContact.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Model/FContact.php b/src/Model/FContact.php index cc6b2d2a7a..713d74dc19 100644 --- a/src/Model/FContact.php +++ b/src/Model/FContact.php @@ -53,8 +53,8 @@ class FContact if (is_null($update)) { // update record occasionally so it doesn't get stale - $d = strtotime($person["updated"]." +00:00"); - if ($d < strtotime("now - 14 days")) { + $d = strtotime($person['updated'] . ' +00:00'); + if ($d < strtotime('now - 14 days')) { $update = true; } From ba1c1049d6b17a107d5e1022c257273ad60e6894 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Thu, 21 Jul 2022 16:01:38 +0200 Subject: [PATCH 3/4] Changes: - added some type-hints - added some documentation - used self::exists() instead of DBA::exists('user', ['uid' => $uid]) --- src/Model/Profile.php | 104 ++++++++++++++++++++++++++---------------- src/Model/User.php | 5 +- 2 files changed, 68 insertions(+), 41 deletions(-) diff --git a/src/Model/Profile.php b/src/Model/Profile.php index d27faaf5cd..46828009a3 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -96,6 +96,7 @@ class Profile * * @param array $fields Profile fields to update * @param integer $uid User id + * * @return boolean Whether update was successful */ public static function update(array $fields, int $uid): bool @@ -139,6 +140,7 @@ class Profile * * @param int $uid User id * @param bool $force Force publishing to the directory + * * @return void */ public static function publishUpdate(int $uid, bool $force = false) @@ -162,6 +164,7 @@ class Profile * Returns a formatted location string from the given profile array * * @param array $profile Profile array (Generated from the "profile" table) + * * @return string Location string */ public static function formatLocation(array $profile): string @@ -212,13 +215,13 @@ class Profile * @param App $a * @param string $nickname string * @param bool $show_contacts - * @return array Profile * + * @return array Profile * @throws HTTPException\NotFoundException * @throws HTTPException\InternalServerErrorException * @throws \ImagickException */ - public static function load(App $a, string $nickname, bool $show_contacts = true) + public static function load(App $a, string $nickname, bool $show_contacts = true): array { $profile = User::getOwnerDataByNick($nickname); if (!isset($profile['account_removed']) || $profile['account_removed']) { @@ -285,7 +288,7 @@ class Profile * @hooks 'profile_sidebar' * array $arr */ - public static function getVCardHtml(array $profile, bool $block, bool $show_contacts) + public static function getVCardHtml(array $profile, bool $block, bool $show_contacts): string { $o = ''; $location = false; @@ -386,16 +389,16 @@ class Profile if (!empty($profile['guid'])) { $diaspora = [ - 'guid' => $profile['guid'], - 'podloc' => DI::baseUrl(), + 'guid' => $profile['guid'], + 'podloc' => DI::baseUrl(), 'searchable' => ($profile['net-publish'] ? 'true' : 'false'), - 'nickname' => $profile['nickname'], - 'fullname' => $profile['name'], - 'firstname' => $firstname, - 'lastname' => $lastname, - 'photo300' => $profile['photo'] ?? '', - 'photo100' => $profile['thumb'] ?? '', - 'photo50' => $profile['micro'] ?? '', + 'nickname' => $profile['nickname'], + 'fullname' => $profile['name'], + 'firstname' => $firstname, + 'lastname' => $lastname, + 'photo300' => $profile['photo'] ?? '', + 'photo100' => $profile['thumb'] ?? '', + 'photo50' => $profile['micro'] ?? '', ]; } else { $diaspora = false; @@ -414,13 +417,13 @@ class Profile if (is_array($profile) && !$profile['hide-friends']) { $contact_count = DBA::count('contact', [ - 'uid' => $profile['uid'], - 'self' => false, + 'uid' => $profile['uid'], + 'self' => false, 'blocked' => false, 'pending' => false, - 'hidden' => false, + 'hidden' => false, 'archive' => false, - 'failed' => false, + 'failed' => false, 'network' => Protocol::FEDERATED, ]); } @@ -429,7 +432,7 @@ class Profile // Expected profile/vcard.tpl profile.* template variables $p = [ 'address' => null, - 'edit' => null, + 'edit' => null, 'upubkey' => null, ]; foreach ($profile as $k => $v) { @@ -484,7 +487,6 @@ class Profile * Returns the upcoming birthdays of contacts of the current user as HTML content * * @return string The upcoming birthdays (HTML) - * * @throws HTTPException\InternalServerErrorException * @throws HTTPException\ServiceUnavailableException * @throws \ImagickException @@ -583,7 +585,12 @@ class Profile ]); } - public static function getEventsReminderHTML() + /** + * Renders HTML for event reminder (e.g. contact birthdays + * + * @return string Rendered HTML + */ + public static function getEventsReminderHTML(): string { $a = DI::app(); $o = ''; @@ -674,9 +681,9 @@ class Profile * * @return string */ - public static function getMyURL() + public static function getMyURL(): string { - return Session::get('my_url'); + return Session::get('my_url') ?? ''; } /** @@ -695,6 +702,8 @@ class Profile * It would be favourable to harmonize the two implementations. * * @param App $a Application instance. + * + * @return void * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ @@ -764,9 +773,10 @@ class Profile * Set the visitor cookies (see remote_user()) for the given handle * * @param string $handle Visitor handle + * * @return array Visitor contact array */ - public static function addVisitorCookieForHandle($handle) + public static function addVisitorCookieForHandle(string $handle): array { $a = DI::app(); @@ -798,9 +808,10 @@ class Profile /** * Set the visitor cookies (see remote_user()) for signed HTTP requests + ( * @return array Visitor contact array */ - public static function addVisitorCookieForHTTPSigner() + public static function addVisitorCookieForHTTPSigner(): array { $requester = HTTPSignature::getSigner('', $_SERVER); if (empty($requester)) { @@ -815,10 +826,12 @@ class Profile * Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/include/zid.php * * @param string $token + * + * @return void * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ - public static function openWebAuthInit($token) + public static function openWebAuthInit(string $token) { $a = DI::app(); @@ -857,23 +870,34 @@ class Profile Logger::info('OpenWebAuth: auth success from ' . $visitor['addr']); } - public static function zrl($s, $force = false) + /** + * Returns URL with URL-encoded zrl parameter + * + * @param string $url URL to enhance + * @param bool $force Either to force adding zrl parameter + * + * @return string URL with 'zrl' parameter or original URL in case of no Friendica profile URL + */ + public static function zrl(string $url, bool $force = false) { - if (!strlen($s)) { - return $s; + if (!strlen($url)) { + return $url; } - if (!strpos($s, '/profile/') && !$force) { - return $s; + if (!strpos($url, '/profile/') && !$force) { + return $url; } - if ($force && substr($s, -1, 1) !== '/') { - $s = $s . '/'; + if ($force && substr($url, -1, 1) !== '/') { + $url = $url . '/'; } - $achar = strpos($s, '?') ? '&' : '?'; + + $achar = strpos($url, '?') ? '&' : '?'; $mine = self::getMyURL(); - if ($mine && !Strings::compareLink($mine, $s)) { - return $s . $achar . 'zrl=' . urlencode($mine); + + if ($mine && !Strings::compareLink($mine, $url)) { + return $url . $achar . 'zrl=' . urlencode($mine); } - return $s; + + return $url; } /** @@ -897,15 +921,15 @@ class Profile /** * search for Profiles * - * @param int $start - * @param int $count - * @param null $search + * @param int $start Starting record (see LIMIT start,count) + * @param int $count Maximum records (see LIMIT start,count) + * @param string $search Optional search word (see LIKE %s?%s) * * @return array [ 'total' => 123, 'entries' => [...] ]; * * @throws \Exception */ - public static function searchProfiles($start = 0, $count = 100, $search = null) + public static function searchProfiles(int $start = 0, int $count = 100, string $search = null) { if (!empty($search)) { $publish = (DI::config()->get('system', 'publish_all') ? '' : "AND `publish` "); @@ -946,6 +970,8 @@ class Profile * Multi profiles are converted to ACl-protected custom fields and deleted. * * @param array $profile One profile array + * + * @return void * @throws \Exception */ public static function migrate(array $profile) diff --git a/src/Model/User.php b/src/Model/User.php index d1306fcb98..a05d8a2770 100644 --- a/src/Model/User.php +++ b/src/Model/User.php @@ -276,7 +276,8 @@ class User /** * Returns true if a user record exists with the provided id * - * @param integer $uid + * @param int $uid + * * @return boolean * @throws Exception */ @@ -412,7 +413,7 @@ class User $owner = DBA::selectFirst('owner-view', [], ['uid' => $uid]); if (!DBA::isResult($owner)) { - if (!DBA::exists('user', ['uid' => $uid]) || !$repairMissing) { + if (!self::exists($uid) || !$repairMissing) { return false; } if (!DBA::exists('profile', ['uid' => $uid])) { From 86ef7c66d3533b929964e035b37d0332b2bd8c29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Sat, 23 Jul 2022 22:58:15 +0200 Subject: [PATCH 4/4] Changes: - added some missing type-hints, thanks to @MrPetovan --- src/Model/Profile.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Model/Profile.php b/src/Model/Profile.php index 46828009a3..094df729e7 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -878,7 +878,7 @@ class Profile * * @return string URL with 'zrl' parameter or original URL in case of no Friendica profile URL */ - public static function zrl(string $url, bool $force = false) + public static function zrl(string $url, bool $force = false): string { if (!strlen($url)) { return $url; @@ -909,6 +909,7 @@ class Profile * want to see anybody else's theme settings except their own while on this site. * * @param App $a + * * @return int user ID * * @note Returns local_user instead of user ID if "always_my_theme" is set to true @@ -929,7 +930,7 @@ class Profile * * @throws \Exception */ - public static function searchProfiles(int $start = 0, int $count = 100, string $search = null) + public static function searchProfiles(int $start = 0, int $count = 100, string $search = null): array { if (!empty($search)) { $publish = (DI::config()->get('system', 'publish_all') ? '' : "AND `publish` ");