Replace "Probe::uri" with "Contact::getByURL"
This commit is contained in:
parent
c352af8eda
commit
d6bf7f2cda
7 changed files with 18 additions and 20 deletions
|
@ -37,7 +37,6 @@ use Friendica\Core\Logger;
|
|||
use Friendica\Core\System;
|
||||
use Friendica\Protocol\PortableContact;
|
||||
use Friendica\Protocol\Diaspora;
|
||||
use Friendica\Network\Probe;
|
||||
|
||||
/**
|
||||
* This class handles GServer related functions
|
||||
|
@ -980,8 +979,8 @@ class GServer
|
|||
}
|
||||
|
||||
foreach ($contacts as $contact) {
|
||||
$probed = Probe::uri($contact);
|
||||
if (in_array($probed['network'], Protocol::FEDERATED)) {
|
||||
$probed = Contact::getByURL($contact);
|
||||
if (!empty($probed) && in_array($probed['network'], Protocol::FEDERATED)) {
|
||||
$serverdata['network'] = $probed['network'];
|
||||
break;
|
||||
}
|
||||
|
|
|
@ -27,7 +27,6 @@ use Friendica\Core\Worker;
|
|||
use Friendica\DI;
|
||||
use Friendica\Database\DBA;
|
||||
use Friendica\Model\Notify\Type;
|
||||
use Friendica\Network\Probe;
|
||||
use Friendica\Protocol\Activity;
|
||||
use Friendica\Util\DateTimeFormat;
|
||||
use Friendica\Worker\Delivery;
|
||||
|
@ -267,7 +266,7 @@ class Mail
|
|||
$guid = System::createUUID();
|
||||
$uri = Item::newURI(local_user(), $guid);
|
||||
|
||||
$me = Probe::uri($replyto);
|
||||
$me = Contact::getByURL($replyto);
|
||||
if (!$me['name']) {
|
||||
return -2;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue