Merge pull request #8820 from annando/fix-author-network

[friendica.git] / src / Worker / UpdateGContact.php

diff --git a/src/Worker/UpdateGContact.php b/src/Worker/UpdateGContact.php
index 55c91a12718a8a17fca8d748c008064a7e43615e..94e4d07d7b7c91370b8842f1217a407bc0188151 100644 (file)
--- a/src/Worker/UpdateGContact.php
+++ b/src/Worker/UpdateGContact.php
@@ -1,88 +1,48 @@
 <?php
-
 /**
- * @file src/Worker/UpdateGcontact.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 namespace Friendica\Worker;
 
-use Friendica\Database\DBA;
-use Friendica\Network\Probe;
-use Friendica\Protocol\PortableContact;
-use Friendica\Util\DateTimeFormat;
+use Friendica\Core\Logger;
+use Friendica\DI;
+use Friendica\Model\GContact;
 
 class UpdateGContact
 {
-       public static function execute($contact_id)
+       /**
+        * Update global contact via probe
+        * @param string  $url     Global contact url
+        * @param string  $command
+        */
+       public static function execute(string $url, string $command = '')
        {
-               logger('update_gcontact: start');
-
-               if (empty($contact_id)) {
-                       logger('update_gcontact: no contact');
-                       return;
-               }
-
-               $r = q("SELECT * FROM `gcontact` WHERE `id` = %d", intval($contact_id));
-
-               if (!DBA::isResult($r)) {
-                       return;
-               }
-
-               if (!in_array($r[0]["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS])) {
-                       return;
-               }
-
-               $data = Probe::uri($r[0]["url"]);
-
-               if (!in_array($data["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS])) {
-                       if ($r[0]["server_url"] != "") {
-                               PortableContact::checkServer($r[0]["server_url"], $r[0]["network"]);
-                       }
+               $force = ($command == "force");
+               $nodiscover = ($command == "nodiscover");
 
-                       q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `id` = %d",
-                               DBA::escape(DateTimeFormat::utcNow()), intval($contact_id));
-                       return;
-               }
-
-               if (($data["name"] == "") && ($r[0]['name'] != "")) {
-                       $data["name"] = $r[0]['name'];
-               }
-
-               if (($data["nick"] == "") && ($r[0]['nick'] != "")) {
-                       $data["nick"] = $r[0]['nick'];
-               }
+               $success = GContact::updateFromProbe($url, $force);
 
-               if (($data["addr"] == "") && ($r[0]['addr'] != "")) {
-                       $data["addr"] = $r[0]['addr'];
-               }
+               Logger::info('Updated from probe', ['url' => $url, 'force' => $force, 'success' => $success]);
 
-               if (($data["photo"] == "") && ($r[0]['photo'] != "")) {
-                       $data["photo"] = $r[0]['photo'];
+               if ($success && !$nodiscover && (DI::config()->get('system', 'gcontact_discovery') == GContact::DISCOVERY_RECURSIVE)) {
+                       GContact::discoverFollowers($url);
                }
-
-
-               q("UPDATE `gcontact` SET `name` = '%s', `nick` = '%s', `addr` = '%s', `photo` = '%s'
-                                       WHERE `id` = %d",
-                                       DBA::escape($data["name"]),
-                                       DBA::escape($data["nick"]),
-                                       DBA::escape($data["addr"]),
-                                       DBA::escape($data["photo"]),
-                       intval($contact_id)
-               );
-
-               q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `addr` = '%s', `photo` = '%s'
-                                       WHERE `uid` = 0 AND `addr` = '' AND `nurl` = '%s'",
-                                       DBA::escape($data["name"]),
-                                       DBA::escape($data["nick"]),
-                                       DBA::escape($data["addr"]),
-                                       DBA::escape($data["photo"]),
-                                       DBA::escape(normalise_link($data["url"]))
-               );
-
-               q("UPDATE `contact` SET `addr` = '%s'
-                                       WHERE `uid` != 0 AND `addr` = '' AND `nurl` = '%s'",
-                                       DBA::escape($data["addr"]),
-                                       DBA::escape(normalise_link($data["url"]))
-               );
        }
 }