Merge remote-tracking branch 'upstream/develop' into more-q

[friendica.git] / src / Model / Contact / User.php

diff --git a/src/Model/Contact/User.php b/src/Model/Contact/User.php
index 7542130d91f8c4ee26d853dca19a67c686af27af..7d6ce17dac82b2fcd3539dce7c6f21b96a506131 100644 (file)
--- a/src/Model/Contact/User.php
+++ b/src/Model/Contact/User.php
@@ -22,8 +22,8 @@
 namespace Friendica\Model\Contact;
 
 use Exception;
-use Friendica\Collection\Api\Mastodon\Fields;
 use Friendica\Core\Logger;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
@@ -62,18 +62,12 @@ class User
                $pcontact = Contact::selectFirst(['id'], ['uri-id' => $contact['uri-id'], 'uid' => 0]);
                if (!empty($contact['uri-id']) && DBA::isResult($pcontact)) {
                        $pcid = $pcontact['id'];
-               } elseif (empty($contact['url']) || !($pcid = Contact::getIdForURL($contact['url']))) {
+               } elseif (empty($contact['url']) || !($pcid = Contact::getIdForURL($contact['url'], 0, false))) {
                        Logger::info('Public contact for user not found', ['uri-id' => $contact['uri-id'], 'uid' => $contact['uid']]);
                        return false;
                }
 
-               $fields = $contact;
-
-               if (isset($fields['readonly'])) {
-                       $fields['ignored'] = $fields['readonly'];
-               }
-
-               $fields = DBStructure::getFieldsForTable('user-contact', $fields);
+               $fields = self::preparedFields($contact);
                $fields['cid'] = $pcid;
                $fields['uid'] = $contact['uid'];
                $fields['uri-id'] = $contact['uri-id'];
@@ -98,15 +92,7 @@ class User
        {
                DBA::transaction();
 
-               unset($fields['uid']);
-               unset($fields['cid']);
-               unset($fields['uri-id']);
-
-               if (isset($fields['readonly'])) {
-                       $fields['ignored'] = $fields['readonly'];
-               }
-
-               $update_fields = DBStructure::getFieldsForTable('user-contact', $fields);
+               $update_fields = self::preparedFields($fields);
                if (!empty($update_fields)) {
                        $contacts = DBA::select('contact', ['uri-id', 'uid'], $condition);
                        while ($row = DBA::fetch($contacts)) {
@@ -122,6 +108,29 @@ class User
                DBA::commit();  
        }
 
+       /**
+        * Prepare field data for update/insert
+        *
+        * @param array $fields
+        * @return array prepared fields
+        */
+       private static function preparedFields(array $fields): array
+       {
+               unset($fields['uid']);
+               unset($fields['cid']);
+               unset($fields['uri-id']);
+
+               if (isset($fields['readonly'])) {
+                       $fields['ignored'] = $fields['readonly'];
+               }
+
+               if (!empty($fields['self'])) {
+                       $fields['rel'] = Contact::SELF;
+               }
+
+               return DBStructure::getFieldsForTable('user-contact', $fields);
+       }
+
        /**
         * Block contact id for user id
         *
@@ -137,6 +146,13 @@ class User
                        return;
                }
 
+               $contact = Contact::getById($cdata['public']);
+               if ($blocked) {
+                       Protocol::block($contact);
+               } else {
+                       Protocol::unblock($contact);
+               }
+
                if ($cdata['user'] != 0) {
                        DBA::update('contact', ['blocked' => $blocked], ['id' => $cdata['user'], 'pending' => false]);
                }