Changed to null-coalscing style (??) as sugguested by @MrPetovan

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

diff --git a/src/Model/Contact/User.php b/src/Model/Contact/User.php
index 52904925f80adc9ffea7997ca3a79e0336521ce9..665b95624dd477dc7c84eee76a300f341d396c87 100644 (file)
--- a/src/Model/Contact/User.php
+++ b/src/Model/Contact/User.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -23,6 +23,7 @@ namespace Friendica\Model\Contact;
 
 use Exception;
 use Friendica\Core\Logger;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
@@ -66,13 +67,7 @@ class User
                        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'];
@@ -97,30 +92,46 @@ 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)) {
-                               if (empty($row['uri-id']) || empty($contact['uid'])) {
+                       while ($contact = DBA::fetch($contacts)) {
+                               if (empty($contact['uri-id']) || empty($contact['uid'])) {
                                        continue;
                                }
-                               $ret = DBA::update('user-contact', $update_fields, ['uri-id' => $row['uri-id'], 'uid' => $row['uid']]);
-                               Logger::info('Updated user contact', ['uid' => $row['uid'], 'uri-id' => $row['uri-id'], 'ret' => $ret]);
+                               $ret = DBA::update('user-contact', $update_fields, ['uri-id' => $contact['uri-id'], 'uid' => $contact['uid']]);
+                               Logger::info('Updated user contact', ['uid' => $contact['uid'], 'uri-id' => $contact['uri-id'], 'ret' => $ret]);
                        }
 
                        DBA::close($contacts);
                }
+
                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
         *
@@ -136,6 +147,13 @@ class User
                        return;
                }
 
+               $contact = Contact::getById($cdata['public']);
+               if ($blocked) {
+                       Protocol::block($contact, $uid);
+               } else {
+                       Protocol::unblock($contact, $uid);
+               }
+
                if ($cdata['user'] != 0) {
                        DBA::update('contact', ['blocked' => $blocked], ['id' => $cdata['user'], 'pending' => false]);
                }
@@ -293,4 +311,48 @@ class User
 
                return $collapsed;
        }
+
+       /**
+        * Set/Release that the user is blocked by the contact
+        *
+        * @param int     $cid     Either public contact id or user's contact id
+        * @param int     $uid     User ID
+        * @param boolean $blocked Is the user blocked or unblocked by the contact?
+        * @throws \Exception
+        */
+       public static function setIsBlocked($cid, $uid, $blocked)
+       {
+               $cdata = Contact::getPublicAndUserContactID($cid, $uid);
+               if (empty($cdata)) {
+                       return;
+               }
+
+               DBA::update('user-contact', ['is-blocked' => $blocked], ['cid' => $cdata['public'], 'uid' => $uid], true);
+       }
+
+       /**
+        * Returns if the user is blocked by the contact
+        *
+        * @param int $cid Either public contact id or user's contact id
+        * @param int $uid User ID
+        *
+        * @return boolean Is the user blocked or unblocked by the contact?
+        * @throws \Exception
+        */
+       public static function isIsBlocked($cid, $uid)
+       {
+               $cdata = Contact::getPublicAndUserContactID($cid, $uid);
+               if (empty($cdata)) {
+                       return false;
+               }
+
+               if (!empty($cdata['public'])) {
+                       $public_contact = DBA::selectFirst('user-contact', ['is-blocked'], ['cid' => $cdata['public'], 'uid' => $uid]);
+                       if (DBA::isResult($public_contact)) {
+                               return $public_contact['is-blocked'];
+                       }
+               }
+
+               return false;
+       }
 }