Suppress a couple MemcachedException

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

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index 13add7e658939fdd92b9d6871eaf537aebe86c4b..55dd756638eaf48262da67400d3252ebdea6adeb 100644 (file)
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.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
  *
@@ -22,7 +22,7 @@
 namespace Friendica\Model;
 
 use Friendica\Content\Text\HTML;
-use Friendica\Core\Cache\Duration;
+use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
@@ -119,7 +119,8 @@ class APContact
         */
        public static function getByURL($url, $update = null)
        {
-               if (empty($url)) {
+               if (empty($url) || Network::isUrlBlocked($url)) {
+                       Logger::info('Domain is blocked', ['url' => $url]);
                        return [];
                }
 
@@ -167,7 +168,7 @@ class APContact
 
                // Detect multiple fast repeating request to the same address
                // See https://github.com/friendica/friendica/issues/9303
-               $cachekey = 'apcontact:getByURL:' . $url;
+               $cachekey = 'apcontact:' . ItemURI::getIdByURI($url);
                $result = DI::cache()->get($cachekey);
                if (!is_null($result)) {
                        Logger::notice('Multiple requests for the address', ['url' => $url, 'update' => $update, 'callstack' => System::callstack(20), 'result' => $result]);