Custom fields appear on your profile page.
diff --git a/src/Worker/CheckRelMeProfileLink.php b/src/Worker/CheckRelMeProfileLink.php new file mode 100644 index 000000000..e5727cc83 --- /dev/null +++ b/src/Worker/CheckRelMeProfileLink.php @@ -0,0 +1,98 @@ +. + * + */ + +namespace Friendica\Worker; + +use DOMDocument; +use Friendica\DI; +use Friendica\Core\Logger; +use Friendica\Model\Profile; +use Friendica\Model\User; +use Friendica\Network\HTTPClient\Client\HttpClientAccept; +use Friendica\Network\HTTPClient\Client\HttpClientOptions; +use Friendica\Util\Network; +use Friendica\Util\Strings; + +/* This class is used to verify the homepage link of a user profile. + * To do so, we look for rel="me" links in the given homepage, if one + * of them points to the Friendica profile of the user, a verification + * mark is added to the link. + * + * To reverse the process, if a homepage link is given, it is displayed + * with the rel="me" attribute as well, so that 3rd party tools can + * verify the connection between the two pages. + * + * This task will be performed by the worker on a daily basis _and_ every + * time the user changes their homepage link. In the first case the priority + * of the task is set to LOW, with the second case it is MEDIUM. + * + * rel-me microformat docs https://microformats.org/wiki/rel-me + */ +class CheckRelMeProfileLink +{ + /* Cheks the homepage of a profile for a rel-me link back to the user profile + * + * @param $uid (int) the UID of the user + */ + public static function execute(int $uid) + { + Logger::notice('Verifying the homepage', ['uid' => $uid]); + Profile::update(['homepage_verified' => false], $uid); + $homepageUrlVerified = false; + $owner = User::getOwnerDataById($uid); + if (!empty($owner['homepage'])) { + $xrd_timeout = DI::config()->get('system', 'xrd_timeout'); + $curlResult = DI::httpClient()->get($owner['homepage'], $accept_content = HttpClientAccept::HTML, [HttpClientOptions::TIMEOUT => $xrd_timeout]); + if ($curlResult->isSuccess()) { + $content = $curlResult->getBody(); + if (!$content) { + Logger::notice('Empty body of the fetched homepage link). Cannot verify the relation to profile of UID %s.', ['uid' => $uid, 'owner homepage' => $owner['homepage']]); + } else { + $doc = new DOMDocument(); + $doc->loadHTML($content); + if (!$doc) { + Logger::notice('Could not parse the content'); + } else { + foreach ($doc->getElementsByTagName('a') as $link) { + $rel = $link->getAttribute('rel'); + if ($rel == 'me') { + $href = $link->getAttribute('href'); + if (!$homepageUrlVerified && Network::isValidHttpUrl($href)) { + $homepageUrlVerified = Strings::compareLink($owner['url'], $href); + } + } + } + } + if ($homepageUrlVerified) { + Profile::update(['homepage_verified' => true], $uid); + Logger::notice('Homepage URL verified', ['uid' => $uid, 'owner homepage' => $owner['homepage']]); + } else { + Logger::notice('Homepage URL could not be verified', ['uid' => $uid, 'owner homepage' => $owner['homepage']]); + } + } + } else { + Logger::notice('Could not cURL the homepage URL', ['owner homepage' => $owner['homepage']]); + } + } else { + Logger::notice('The user has no homepage link.', ['uid' => $uid]); + } + } +} diff --git a/src/Worker/Cron.php b/src/Worker/Cron.php index 21d2f8a20..e0ef134a2 100644 --- a/src/Worker/Cron.php +++ b/src/Worker/Cron.php @@ -27,6 +27,7 @@ use Friendica\Core\Worker; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Tag; +use Friendica\Model\User; use Friendica\Protocol\ActivityPub\Queue; use Friendica\Protocol\Relay; @@ -85,6 +86,7 @@ class Cron // Hourly cron calls if (DI::config()->get('system', 'last_cron_hourly', 0) + 3600 < time()) { + // Update trending tags cache for the community page Tag::setLocalTrendingHashtags(24, 20); Tag::setGlobalTrendingHashtags(24, 20); @@ -132,6 +134,10 @@ class Cron Worker::add(Worker::PRIORITY_LOW, 'OptimizeTables'); } + foreach (User::getList(1, PHP_INT_MAX, 'active') as $user) { + Worker::add(Worker::PRIORITY_LOW, 'CheckRelMeProfileLink', $user['uid']); + } + // Resubscribe to relay servers Relay::reSubscribe(); diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php index 262d7d307..79b1539f8 100644 --- a/static/dbstructure.config.php +++ b/static/dbstructure.config.php @@ -55,7 +55,7 @@ use Friendica\Database\DBA; if (!defined('DB_UPDATE_VERSION')) { - define('DB_UPDATE_VERSION', 1486); + define('DB_UPDATE_VERSION', 1487); } return [ @@ -1580,6 +1580,7 @@ return [ "education" => ["type" => "text", "comment" => "Deprecated"], "contact" => ["type" => "text", "comment" => "Deprecated"], "homepage" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], + "homepage_verified" => ["type" => "boolean", "not null" => 1, "default" => "0", "comment" => "was the homepage verified by a rel-me link back to the profile"], "xmpp" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "XMPP address"], "matrix" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Matrix address"], "photo" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => ""], diff --git a/static/dbview.config.php b/static/dbview.config.php index c12cccb4c..925f82462 100644 --- a/static/dbview.config.php +++ b/static/dbview.config.php @@ -919,6 +919,7 @@ "postal-code" => ["profile", "postal-code"], "country-name" => ["profile", "country-name"], "homepage" => ["profile", "homepage"], + "homepage_verified" => ["profile", "homepage_verified"], "dob" => ["profile", "dob"], ], "query" => "FROM `user` diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 1ec18f46b..7fcf6e217 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2022.12-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-11-05 19:31-0400\n" +"POT-Creation-Date: 2022-11-07 11:21+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAMECustom fields appear on your profile page.
\n" diff --git a/view/templates/profile/vcard.tpl b/view/templates/profile/vcard.tpl index fed6fb251..a304a9a1f 100644 --- a/view/templates/profile/vcard.tpl +++ b/view/templates/profile/vcard.tpl @@ -39,7 +39,7 @@ {{if $updated}}{{/if}} - {{if $homepage}}