bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Code transitioning from PortableContacts.php to GServer.php

Browse source
This commit is contained in:
Michael 2019-10-03 23:33:41 +00:00
commit d9a74bd5dd
6 changed files with 135 additions and 954 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/Worker/DiscoverPoCo.php
View file

@ -12,6 +12,7 @@ use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\Model\GContact;
use Friendica\Model\Contact;
use Friendica\Model\GServer;
use Friendica\Network\Probe;
use Friendica\Protocol\PortableContact;
use Friendica\Util\DateTimeFormat;
@ -86,7 +87,7 @@ class DiscoverPoCo
return;
}
$result = "Checking server ".$server_url." - ";
$ret = PortableContact::checkServer($server_url);
$ret = GServer::check($server_url);
if ($ret) {
$result .= "success";
} else {
@ -186,7 +187,7 @@ class DiscoverPoCo
$server_url = $user["server_url"];
}
if ((($server_url == "") && ($user["network"] == Protocol::FEED)) || $force_update || PortableContact::checkServer($server_url, $user["network"])) {
if ((($server_url == "") && ($user["network"] == Protocol::FEED)) || $force_update || GServer::check($server_url)) {
Logger::log('Check profile '.$user["url"]);
Worker::add(PRIORITY_LOW, "DiscoverPoCo", "check_profile", $user["url"]);
@ -237,7 +238,7 @@ class DiscoverPoCo
$server_url = Contact::getBasepath($jj->url);
if ($server_url != '') {
if (!PortableContact::checkServer($server_url)) {
if (!GServer::check($server_url)) {
Logger::log("Friendica server ".$server_url." doesn't answer.", Logger::DEBUG);
continue;
}

3
src/Worker/PubSubPublish.php
View file

@ -9,6 +9,7 @@ use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Model\PushSubscriber;
use Friendica\Model\GServer;
use Friendica\Protocol\OStatus;
use Friendica\Util\Network;
@ -30,7 +31,7 @@ class PubSubPublish
return;
}
/// @todo Check server status with PortableContact::checkServer()
/// @todo Check server status with GServer::check()
// Before this can be done we need a way to safely detect the server url.
Logger::log("Generate feed of user " . $subscriber['nickname']. " to " . $subscriber['callback_url']. " - last updated " . $subscriber['last_update'], Logger::DEBUG);