Issue 12358: Allow blocking of every contact

diff --git a/src/Module/Api/Mastodon/Accounts/Block.php b/src/Module/Api/Mastodon/Accounts/Block.php
index 43d56a3b686f7bc62dadd3e0e12dc6d46816e92d..e13a8b2ff427cdf50c4688c7cc104d0449f10641 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Block.php
+++ b/src/Module/Api/Mastodon/Accounts/Block.php
@@ -41,26 +41,17 @@ class Block extends BaseApi
                        DI::mstdnError()->UnprocessableEntity();
                }
 
-               $owner = User::getOwnerDataById($uid);
-               if (empty($owner)) {
-                       DI::mstdnError()->Forbidden();
-               }
+               Contact\User::setBlocked($this->parameters['id'], $uid, true);
 
                $cdata = Contact::getPublicAndUserContactID($this->parameters['id'], $uid);
-               if (empty($cdata['user'])) {
-                       DI::mstdnError()->RecordNotFound();
-               }
-
-               $contact = Contact::getById($cdata['user']);
-               if (empty($contact)) {
-                       DI::mstdnError()->RecordNotFound();
+               if (!empty($cdata['user'])) {
+                       $contact = Contact::getById($cdata['user']);
+                       if (!empty($contact)) {
+                               // Mastodon-expected behavior: relationship is severed on block
+                               Contact::terminateFriendship($contact);
+                       }
                }
 
-               Contact\User::setBlocked($cdata['user'], $uid, true);
-
-               // Mastodon-expected behavior: relationship is severed on block
-               Contact::terminateFriendship($contact);
-
                System::jsonExit(DI::mstdnRelationship()->createFromContactId($this->parameters['id'], $uid)->toArray());
        }
 }