keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Simplified code

Browse source
This commit is contained in:
Michael 2020-03-06 06:44:17 +00:00
parent 2f63249f3b
commit 1ce9a31ca4
1 changed files with 16 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/Model/GContact.php
View file

@ -1288,34 +1288,28 @@ class GContact
if (!empty($apcontact['followers']) && is_string($apcontact['followers'])) { if (!empty($apcontact['followers']) && is_string($apcontact['followers'])) {
$followers = ActivityPub::fetchItems($apcontact['followers']); $followers = ActivityPub::fetchItems($apcontact['followers']);
if (!empty($followers)) { } else {
Logger::info('Discover AP followers', ['url' => $url, 'contacts' => count($followers)]); $followers = [];
foreach ($followers as $follower) {
if (DBA::exists('gcontact', ['nurl' => Strings::normaliseLink(($follower))])) {
continue;
}
Logger::info('Discover new AP contact', ['url' => $follower]);
Worker::add(PRIORITY_LOW, 'UpdateGContact', $follower);
}
Logger::info('AP followers discovery finished', ['url' => $url]);
}
} }
if (!empty($apcontact['following']) && is_string($apcontact['following'])) { if (!empty($apcontact['following']) && is_string($apcontact['following'])) {
$followings = ActivityPub::fetchItems($apcontact['following']); $followings = ActivityPub::fetchItems($apcontact['following']);
if (!empty($followings)) { } else {
Logger::info('Discover AP followings', ['url' => $url, 'contacts' => count($followings)]); $followings = [];
foreach ($followings as $following) {
if (DBA::exists('gcontact', ['nurl' => Strings::normaliseLink(($following))])) {
continue;
}
Logger::info('Discover new AP contact', ['url' => $following]);
Worker::add(PRIORITY_LOW, 'UpdateGContact', $following);
}
Logger::info('AP followings discovery finished', ['url' => $url]);
}
} }
if (!empty($followers) || !empty($followings)) {
$contacts = array_unique(array_merge($followers, $followings));
Logger::info('Discover AP contacts', ['url' => $url, 'contacts' => count($contacts)]);
foreach ($contacts as $contact) {
if (DBA::exists('gcontact', ['nurl' => Strings::normaliseLink(($contact))])) {
continue;
}
Logger::info('Discover new AP contact', ['url' => $contact]);
Worker::add(PRIORITY_LOW, 'UpdateGContact', $contact);
}
Logger::info('AP contacts discovery finished', ['url' => $url]);
}
$data = Probe::uri($url); $data = Probe::uri($url);
if (empty($data['poco'])) { if (empty($data['poco'])) {