Merge pull request #12951 from jsoref/spelling

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

diff --git a/src/Worker/AddContact.php b/src/Worker/AddContact.php
index 47d9d01375aba5181870df91fc4230fb36316259..b27c54ed76f885d889f61cc5d3687aecc1ad210a 100644 (file)
--- a/src/Worker/AddContact.php
+++ b/src/Worker/AddContact.php
@@ -1,13 +1,30 @@
 <?php
-
 /**
- * @file src/Worker/AddContact.php
+ * @copyright Copyright (C) 2010-2023, the Friendica project
+ *
+ * @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\Core\Logger;
+use Friendica\DI;
 use Friendica\Model\Contact;
+use Friendica\Network\HTTPException\InternalServerErrorException;
+use Friendica\Network\HTTPException\NotFoundException;
 
 class AddContact
 {
@@ -18,7 +35,22 @@ class AddContact
         */
        public static function execute(int $uid, string $url)
        {
-               $result = Contact::createFromProbe($uid, $url, '', false);
-               Logger::info('Added contact', ['uid' => $uid, 'url' => $url, 'result' => $result]);
+               try {
+                       if ($uid == 0) {
+                               // Adding public contact
+                               $result = Contact::getIdForURL($url);
+                               DI::logger()->info('Added public contact', ['url' => $url, 'result' => $result]);
+                               return;
+                       }
+
+                       $result = Contact::createFromProbeForUser($uid, $url);
+                       DI::logger()->info('Added contact for user', ['uid' => $uid, 'url' => $url, 'result' => $result]);
+               } catch (InternalServerErrorException $e) {
+                       DI::logger()->warning('Internal server error.', ['exception' => $e, 'uid' => $uid, 'url' => $url]);
+               } catch (NotFoundException $e) {
+                       DI::logger()->notice('uid not found.', ['exception' => $e, 'uid' => $uid, 'url' => $url]);
+               } catch (\ImagickException $e) {
+                       DI::logger()->notice('Imagick not found.', ['exception' => $e, 'uid' => $uid, 'url' => $url]);
+               }
        }
 }