$apcontact = DBA::selectFirst('apcontact', [], ['addr' => $url]);
}
- if (DBA::isResult($apcontact) && ($apcontact['updated'] > $ref_update)) {
+ if (DBA::isResult($apcontact) && ($apcontact['updated'] > $ref_update) && !empty($apcontact['pubkey'])) {
return $apcontact;
}
if (!is_null($update)) {
- return false;
+ return DBA::isResult($apcontact) ? $apcontact : false;
}
}
$apcontact = [];
$apcontact['url'] = $compacted['@id'];
- $apcontact['uuid'] = JsonLD::fetchElement($compacted, 'diaspora:guid');
+ $apcontact['uuid'] = JsonLD::fetchElement($compacted, 'diaspora:guid', '@value');
$apcontact['type'] = str_replace('as:', '', JsonLD::fetchElement($compacted, '@type'));
$apcontact['following'] = JsonLD::fetchElement($compacted, 'as:following', '@id');
$apcontact['followers'] = JsonLD::fetchElement($compacted, 'as:followers', '@id');
$apcontact['inbox'] = JsonLD::fetchElement($compacted, 'ldp:inbox', '@id');
+ self::unarchiveInbox($apcontact['inbox'], false);
+
$apcontact['outbox'] = JsonLD::fetchElement($compacted, 'as:outbox', '@id');
$apcontact['sharedinbox'] = '';
if (!empty($compacted['as:endpoints'])) {
$apcontact['sharedinbox'] = JsonLD::fetchElement($compacted['as:endpoints'], 'as:sharedInbox', '@id');
+ self::unarchiveInbox($apcontact['sharedinbox'], true);
}
- $apcontact['nick'] = JsonLD::fetchElement($compacted, 'as:preferredUsername');
- $apcontact['name'] = JsonLD::fetchElement($compacted, 'as:name');
+ $apcontact['nick'] = JsonLD::fetchElement($compacted, 'as:preferredUsername', '@value');
+ $apcontact['name'] = JsonLD::fetchElement($compacted, 'as:name', '@value');
if (empty($apcontact['name'])) {
$apcontact['name'] = $apcontact['nick'];
}
- $apcontact['about'] = HTML::toBBCode(JsonLD::fetchElement($compacted, 'as:summary'));
+ $apcontact['about'] = HTML::toBBCode(JsonLD::fetchElement($compacted, 'as:summary', '@value'));
$apcontact['photo'] = JsonLD::fetchElement($compacted, 'as:icon', '@id');
if (is_array($apcontact['photo']) || !empty($compacted['as:icon']['as:url']['@id'])) {
unset($parts['path']);
$apcontact['addr'] = $apcontact['nick'] . '@' . str_replace('//', '', Network::unparseURL($parts));
- $apcontact['pubkey'] = trim(JsonLD::fetchElement($compacted, 'w3id:publicKey', 'w3id:publicKeyPem'));
+ if (!empty($compacted['w3id:publicKey'])) {
+ $apcontact['pubkey'] = trim(JsonLD::fetchElement($compacted['w3id:publicKey'], 'w3id:publicKeyPem', '@value'));
+ }
$apcontact['manually-approve'] = (int)JsonLD::fetchElement($compacted, 'as:manuallyApprovesFollowers');
DBA::update('apcontact', $apcontact, ['url' => $url], true);
// Update some data in the contact table with various ways to catch them all
- $contact_fields = ['name' => $apcontact['name'], 'about' => $apcontact['about']];
+ $contact_fields = ['name' => $apcontact['name'], 'about' => $apcontact['about'], 'alias' => $apcontact['alias']];
// Fetch the type and match it with the contact type
$contact_types = array_keys(ActivityPub::ACCOUNT_TYPES, $apcontact['type']);
if (is_int($contact_type)) {
$contact_fields['contact-type'] = $contact_type;
- if ($contact_fields['contact-type'] != Contact::ACCOUNT_TYPE_COMMUNITY) {
+ if ($contact_fields['contact-type'] != User::ACCOUNT_TYPE_COMMUNITY) {
// Resetting the 'forum' and 'prv' field when it isn't a forum
$contact_fields['forum'] = false;
$contact_fields['prv'] = false;
return $apcontact;
}
+
+ /**
+ * Unarchive inboxes
+ *
+ * @param string $url inbox url
+ */
+ private static function unarchiveInbox($url, $shared)
+ {
+ if (empty($url)) {
+ return;
+ }
+
+ $now = DateTimeFormat::utcNow();
+
+ $fields = ['archive' => false, 'success' => $now, 'shared' => $shared];
+
+ if (!DBA::exists('inbox-status', ['url' => $url])) {
+ $fields = array_merge($fields, ['url' => $url, 'created' => $now]);
+ DBA::insert('inbox-status', $fields);
+ } else {
+ DBA::update('inbox-status', $fields, ['url' => $url]);
+ }
+ }
}