Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-30 21:44:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix noscrape publishing and pulling, added header

Browse source
This commit is contained in:
Michael 2021-06-17 11:23:32 +00:00
parent 5419d1d426
commit fe07dc828b
16 changed files with 36 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Network/Probe.php
View file

@ -87,8 +87,8 @@ class Probe
*/
private static function rearrangeData($data)
{
$fields = ["name", "nick", "guid", "url", "addr", "alias", "photo", "account-type",
"community", "keywords", "location", "about", "hide",
$fields = ["name", "nick", "guid", "url", "addr", "alias", "photo", "header",
"account-type", "community", "keywords", "location", "about", "hide",
"batch", "notify", "poll", "request", "confirm", "subscribe", "poco",
"following", "followers", "inbox", "outbox", "sharedinbox",
"priority", "network", "pubkey", "manually-approve", "baseurl", "gsid"];
@ -1016,18 +1016,18 @@ class Probe
$curlResult = DI::httpRequest()->get($noscrape_url);
if ($curlResult->isTimeout()) {
self::$istimeout = true;
return [];
return $data;
}
$content = $curlResult->getBody();
if (!$content) {
Logger::info('Empty body', ['url' => $noscrape_url]);
return [];
return $data;
}
$json = json_decode($content, true);
if (!is_array($json)) {
Logger::info('No json data', ['url' => $noscrape_url]);
return [];
return $data;
}
if (!empty($json["fn"])) {
@ -2222,7 +2222,7 @@ class Probe
$data = ['name' => $profile['name'], 'nick' => $profile['nick'], 'guid' => $approfile['diaspora:guid'] ?? '',
'url' => $profile['url'], 'addr' => $profile['addr'], 'alias' => $profile['alias'],
'photo' => $profile['photo'], 'account-type' => $profile['contact-type'],
'photo' => $profile['photo'], 'header' => $profile['header'], 'account-type' => $profile['contact-type'],
'community' => ($profile['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY),
'keywords' => $profile['keywords'], 'location' => $profile['location'], 'about' => $profile['about'],
'hide' => !$profile['net-publish'], 'batch' => '', 'notify' => $profile['notify'],