Fix various notices

[friendica.git] / src / Model / APContact.php

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index 72c644ab9ac0d15302d321f4ca0489f4c19c50a0..c306b3e007af9758bbe1b4198ecd4cbf69492550 100644 (file)
--- 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;
        }