use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Database\DBA;
+use Friendica\Database\DBStructure;
use Friendica\DI;
use Friendica\Network\Probe;
use Friendica\Protocol\ActivityNamespace;
$apcontact['photo'] = JsonLD::fetchElement($compacted['as:icon'], 'as:url', '@id');
}
+ $apcontact['header'] = JsonLD::fetchElement($compacted, 'as:image', '@id');
+ if (is_array($apcontact['header']) || !empty($compacted['as:image']['as:url']['@id'])) {
+ $apcontact['header'] = JsonLD::fetchElement($compacted['as:image'], 'as:url', '@id');
+ }
+
if (empty($apcontact['alias'])) {
$apcontact['alias'] = JsonLD::fetchElement($compacted, 'as:url', '@id');
if (is_array($apcontact['alias'])) {
unset($parts['path']);
if (empty($apcontact['addr'])) {
- if (!empty($apcontact['nick'])) {
+ if (!empty($apcontact['nick']) && is_array($parts)) {
$apcontact['addr'] = $apcontact['nick'] . '@' . str_replace('//', '', Network::unparseURL($parts));
} else {
$apcontact['addr'] = '';
}
if (!empty($apcontact['following'])) {
- $data = ActivityPub::fetchContent($apcontact['following']);
- if (!empty($data)) {
- if (!empty($data['totalItems'])) {
- $apcontact['following_count'] = $data['totalItems'];
- }
+ $following = ActivityPub::fetchContent($apcontact['following']);
+ if (!empty($following['totalItems'])) {
+ $apcontact['following_count'] = $following['totalItems'];
}
}
if (!empty($apcontact['followers'])) {
- $data = ActivityPub::fetchContent($apcontact['followers']);
- if (!empty($data)) {
- if (!empty($data['totalItems'])) {
- $apcontact['followers_count'] = $data['totalItems'];
- }
+ $followers = ActivityPub::fetchContent($apcontact['followers']);
+ if (!empty($followers['totalItems'])) {
+ $apcontact['followers_count'] = $followers['totalItems'];
}
}
if (!empty($apcontact['outbox'])) {
- $data = ActivityPub::fetchContent($apcontact['outbox']);
- if (!empty($data)) {
- if (!empty($data['totalItems'])) {
- $apcontact['statuses_count'] = $data['totalItems'];
- }
+ $outbox = ActivityPub::fetchContent($apcontact['outbox']);
+ if (!empty($outbox['totalItems'])) {
+ $apcontact['statuses_count'] = $outbox['totalItems'];
}
}
if (empty($apcontact['subscribe'])) {
$apcontact['subscribe'] = null;
- }
+ }
if (!empty($apcontact['baseurl']) && empty($fetched_contact['gsid'])) {
$apcontact['gsid'] = GServer::getID($apcontact['baseurl']);
DBA::delete('apcontact', ['url' => $url]);
}
+ // Limit the length on incoming fields
+ $apcontact = DBStructure::getFieldsForTable('apcontact', $apcontact);
+
if (DBA::exists('apcontact', ['url' => $apcontact['url']])) {
DBA::update('apcontact', $apcontact, ['url' => $apcontact['url']]);
} else {
Logger::info('Updated profile', ['url' => $url]);
- return $apcontact;
+ return DBA::selectFirst('apcontact', [], ['url' => $apcontact['url']]) ?: [];
}
/**