Merge remote-tracking branch 'upstream/develop' into logging

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

diff --git a/src/Model/FContact.php b/src/Model/FContact.php
index c4d6251c3b4d951618afa5d83594988c846eaf87..006a37a608510b3d3453a8ffb0ab4504d25ae94a 100644 (file)
--- a/src/Model/FContact.php
+++ b/src/Model/FContact.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -40,12 +40,12 @@ class FContact
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function getByURL($handle, $update = null)
+       public static function getByURL($handle, $update = null, $network = Protocol::DIASPORA)
        {
-               $person = DBA::selectFirst('fcontact', [], ['network' => Protocol::DIASPORA, 'addr' => $handle]);
+               $person = DBA::selectFirst('fcontact', [], ['network' => $network, 'addr' => $handle]);
                if (!DBA::isResult($person)) {
                        $urls = [$handle, str_replace('http://', 'https://', $handle), Strings::normaliseLink($handle)];
-                       $person = DBA::selectFirst('fcontact', [], ['network' => Protocol::DIASPORA, 'url' => $urls]);
+                       $person = DBA::selectFirst('fcontact', [], ['network' => $network, 'url' => $urls]);
                }
 
                if (DBA::isResult($person)) {
@@ -58,7 +58,7 @@ class FContact
                                        $update = true;
                                }
 
-                               if ($person["guid"] == "") {
+                               if (empty($person['guid']) || empty($person['uri-id'])) {
                                        $update = true;
                                }
                        }
@@ -70,14 +70,14 @@ class FContact
 
                if ($update) {
                        Logger::info('create or refresh', ['handle' => $handle]);
-                       $r = Probe::uri($handle, Protocol::DIASPORA);
+                       $r = Probe::uri($handle, $network);
 
                        // Note that Friendica contacts will return a "Diaspora person"
                        // if Diaspora connectivity is enabled on their server
-                       if ($r && ($r["network"] === Protocol::DIASPORA)) {
+                       if ($r && ($r["network"] === $network)) {
                                self::updateFContact($r);
 
-                               $person = self::getByURL($handle, false);
+                               $person = self::getByURL($handle, false, $network);
                        }
                }
 
@@ -98,6 +98,7 @@ class FContact
                        'batch' => $arr["batch"], 'notify' => $arr["notify"],
                        'poll' => $arr["poll"], 'confirm' => $arr["confirm"],
                        'alias' => $arr["alias"], 'pubkey' => $arr["pubkey"],
+                       'uri-id' => ItemURI::insert(['uri' => $arr['url'], 'guid' => $arr['guid']]),
                        'updated' => DateTimeFormat::utcNow()];
 
                $condition = ['url' => $arr["url"], 'network' => $arr["network"]];
@@ -118,14 +119,9 @@ class FContact
        {
                Logger::info('fcontact', ['guid' => $fcontact_guid]);
 
-               $r = q(
-                       "SELECT `url` FROM `fcontact` WHERE `url` != '' AND `network` = '%s' AND `guid` = '%s'",
-                       DBA::escape(Protocol::DIASPORA),
-                       DBA::escape($fcontact_guid)
-               );
-
-               if (DBA::isResult($r)) {
-                       return $r[0]['url'];
+               $fcontact = DBA::selectFirst('fcontact', ['url'], ["`url` != ? AND `network` = ? AND `guid` = ?", '', Protocol::DIASPORA, $fcontact_guid]);
+               if (DBA::isResult($fcontact)) {
+                       return $fcontact['url'];
                }
 
                return null;