Merge pull request #12316 from VVelox/load_fix

[friendica.git] / src / Core / Protocol.php

diff --git a/src/Core/Protocol.php b/src/Core/Protocol.php
index 096e12c27bd19979eee61950211035bfaa732490..25955abd5090d21d3387e75cc02d98d00bc20bf5 100644 (file)
--- a/src/Core/Protocol.php
+++ b/src/Core/Protocol.php
@@ -182,7 +182,8 @@ class Protocol
        public static function unfollow(array $contact, array $user): ?bool
        {
                if (empty($contact['network'])) {
-                       throw new \InvalidArgumentException('Missing network key in contact array');
+                       Logger::notice('Contact has got no network, we quit here', ['id' => $contact['id']]);
+                       return null;
                }
 
                $protocol = $contact['network'];
@@ -205,8 +206,8 @@ class Protocol
                        $slap = OStatus::salmon($item, $user);
 
                        if (empty($contact['notify'])) {
-                               return true;
-                               throw new \InvalidArgumentException('Missing expected "notify" key in OStatus/DFRN contact');
+                               Logger::notice('OStatus/DFRN Contact is missing notify, we quit here', ['id' => $contact['id']]);
+                               return null;
                        }
 
                        return Salmon::slapper($user, $contact['notify'], $slap) === 0;