X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FAPContact.php;h=c306b3e007af9758bbe1b4198ecd4cbf69492550;hb=b6e1571b1edf14f8080800cdd219194e443acbd1;hp=72c644ab9ac0d15302d321f4ca0489f4c19c50a0;hpb=9c9ebfc7c97016881d9ad2bb3c3b54a5640d2f08;p=friendica.git diff --git a/src/Model/APContact.php b/src/Model/APContact.php index 72c644ab9a..c306b3e007 100644 --- a/src/Model/APContact.php +++ b/src/Model/APContact.php @@ -7,12 +7,14 @@ namespace Friendica\Model; use Friendica\BaseObject; +use Friendica\Content\Text\HTML; +use Friendica\Core\Logger; use Friendica\Database\DBA; use Friendica\Protocol\ActivityPub; use Friendica\Util\Network; use Friendica\Util\JsonLD; use Friendica\Util\DateTimeFormat; -use Friendica\Content\Text\HTML; +use Friendica\Util\Strings; require_once 'boot.php'; @@ -105,6 +107,10 @@ class APContact extends BaseObject $compacted = JsonLD::compact($data); + if (empty($compacted['@id'])) { + return false; + } + $apcontact = []; $apcontact['url'] = $compacted['@id']; $apcontact['uuid'] = JsonLD::fetchElement($compacted, 'diaspora:guid'); @@ -181,18 +187,18 @@ class APContact extends BaseObject // Update some data in the contact table with various ways to catch them all $contact_fields = ['name' => $apcontact['name'], 'about' => $apcontact['about']]; - DBA::update('contact', $contact_fields, ['nurl' => normalise_link($url)]); + DBA::update('contact', $contact_fields, ['nurl' => Strings::normaliseLink($url)]); - $contacts = DBA::select('contact', ['uid', 'id'], ['nurl' => normalise_link($url)]); + $contacts = DBA::select('contact', ['uid', 'id'], ['nurl' => Strings::normaliseLink($url)]); while ($contact = DBA::fetch($contacts)) { Contact::updateAvatar($apcontact['photo'], $contact['uid'], $contact['id']); } DBA::close($contacts); // Update the gcontact table - DBA::update('gcontact', $contact_fields, ['nurl' => normalise_link($url)]); + DBA::update('gcontact', $contact_fields, ['nurl' => Strings::normaliseLink($url)]); - logger('Updated profile for ' . $url, LOGGER_DEBUG); + Logger::log('Updated profile for ' . $url, Logger::DEBUG); return $apcontact; }