X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FContact%2FUser.php;h=52904925f80adc9ffea7997ca3a79e0336521ce9;hb=eeec6aaeb9b9e18b28c61eba62ce10f83ac78f93;hp=a23cd3a55ad5eae8d788868a37a52af4f83d1043;hpb=5113987031065c97634eb7375e8f0cbb0b63a94b;p=friendica.git

diff --git a/src/Model/Contact/User.php b/src/Model/Contact/User.php
index a23cd3a55a..52904925f8 100644
--- a/src/Model/Contact/User.php
+++ b/src/Model/Contact/User.php
@@ -22,7 +22,6 @@
 namespace Friendica\Model\Contact;
 
 use Exception;
-use Friendica\Collection\Api\Mastodon\Fields;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Database\Database;
@@ -45,7 +44,12 @@ class User
 	 */
 	public static function insertForContactArray(array $contact)
 	{
-		if (!isset($contact['uid']) || (empty($contact['uri-id']) && empty($contact['url']))) {
+		if (empty($contact['uid'])) {
+			// We don't create entries for the public user - by now
+			return false;
+		}
+
+		if (empty($contact['uri-id']) && empty($contact['url'])) {
 			Logger::info('Missing contact details', ['contact' => $contact, 'callstack' => System::callstack(20)]);
 			return false;
 		}
@@ -55,7 +59,9 @@ class User
 		}
 
 		$pcontact = Contact::selectFirst(['id'], ['uri-id' => $contact['uri-id'], 'uid' => 0]);
-		if (!DBA::isResult($pcontact)) {
+		if (!empty($contact['uri-id']) && DBA::isResult($pcontact)) {
+			$pcid = $pcontact['id'];
+		} 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;
 		}
@@ -67,13 +73,13 @@ class User
 		}
 
 		$fields = DBStructure::getFieldsForTable('user-contact', $fields);
-		$fields['cid'] = $pcontact['id'];
+		$fields['cid'] = $pcid;
 		$fields['uid'] = $contact['uid'];
 		$fields['uri-id'] = $contact['uri-id'];
 
-		$ret = DBA::insert('user-contact', $fields, Database::INSERT_IGNORE);
+		$ret = DBA::insert('user-contact', $fields, Database::INSERT_UPDATE);
 
-		Logger::info('Inserted user contact', ['uid' => $contact['uid'], 'cid' => $pcontact['id'], 'uri-id' => $contact['uri-id'], 'ret' => $ret]);
+		Logger::info('Inserted user contact', ['uid' => $contact['uid'], 'cid' => $pcid, 'uri-id' => $contact['uri-id'], 'ret' => $ret]);
 
 		return $ret;
 	}
@@ -103,7 +109,7 @@ class User
 		if (!empty($update_fields)) {
 			$contacts = DBA::select('contact', ['uri-id', 'uid'], $condition);
 			while ($row = DBA::fetch($contacts)) {
-				if (empty($row['uri-id'])) {
+				if (empty($row['uri-id']) || empty($contact['uid'])) {
 					continue;
 				}
 				$ret = DBA::update('user-contact', $update_fields, ['uri-id' => $row['uri-id'], 'uid' => $row['uid']]);