Fix several warnings and errors

diff --git a/src/Model/GContact.php b/src/Model/GContact.php
index 2402d6b519d122e1a09e37dc1bbd7e5ca76dd3b4..19d27109ea856c779a83904c2af0667342d01b4a 100644 (file)
--- a/src/Model/GContact.php
+++ b/src/Model/GContact.php
@@ -841,7 +841,7 @@ class GContact
 
                if ($curlResult->isSuccess() && !empty($curlResult->getBody())) {
                        $noscrape = json_decode($curlResult->getBody(), true);
-                       if (!empty($noscrape)) {
+                       if (!empty($noscrape) && !empty($noscrape['updated'])) {
                                $noscrape['updated'] = DateTimeFormat::utc($noscrape['updated'], DateTimeFormat::MYSQL);
                                $fields = ['last_contact' => DateTimeFormat::utcNow(), 'updated' => $noscrape['updated']];
                                DBA::update('gcontact', $fields, ['nurl' => Strings::normaliseLink($data['url'])]);
@@ -1130,8 +1130,8 @@ class GContact
                                'birthday' => $userdata['dob'], 'photo' => $userdata['photo'],
                                "notify" => $userdata['notify'], 'url' => $userdata['url'],
                                "hide" => ($userdata['hidewall'] || !$userdata['net-publish']),
-                               'nick' => $userdata['nickname'], 'addr' => $addr,
-                               "connect" => $addr, "server_url" => System::baseUrl(),
+                               'nick' => $userdata['nickname'], 'addr' => $userdata['addr'],
+                               "connect" => $userdata['addr'], "server_url" => System::baseUrl(),
                                "generation" => 1, 'network' => Protocol::DFRN];
 
                self::update($gcontact);

diff --git a/src/Model/User.php b/src/Model/User.php
index b4da6d25685c8d608923e55d59f3f832615e3fac..83375115ecef6a61a3847454dc4840cbcae93614 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -190,7 +190,8 @@ class User
                        `user`.`page-flags`,
                        `user`.`account-type`,
                        `user`.`prvnets`,
-                       `user`.`account_removed`
+                       `user`.`account_removed`,
+                       `user`.`hidewall`
                        FROM `contact`
                        INNER JOIN `user`
                                ON `user`.`uid` = `contact`.`uid`

diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index 2b802c9e3caad5e9a4ae6c3a80d97a2754e22170..4562d89f34ee328396add0d94c43338c56cbaeb6 100644 (file)
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -152,6 +152,9 @@ class Notifier
                        $fields = ['network', 'author-id', 'author-link', 'owner-id'];
                        $condition = ['uri' => $target_item["thr-parent"], 'uid' => $target_item["uid"]];
                        $thr_parent = Item::selectFirst($fields, $condition);
+                       if (empty($thr_parent)) {
+                               $thr_parent = $parent;
+                       }
 
                        Logger::log('GUID: ' . $target_item["guid"] . ': Parent is ' . $parent['network'] . '. Thread parent is ' . $thr_parent['network'], Logger::DEBUG);