clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Issue 12358: Allow blocking of every contact

This commit is contained in:
Michael 2023-01-23 21:44:30 +00:00
parent d0373ab414
commit c471a78b05
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Module/Api/Mastodon/Accounts/Block.php
View File

@ -41,25 +41,16 @@ class Block extends BaseApi
DI::mstdnError()->UnprocessableEntity(); DI::mstdnError()->UnprocessableEntity();
} }
$owner = User::getOwnerDataById($uid); Contact\User::setBlocked($this->parameters['id'], $uid, true);
if (empty($owner)) {
DI::mstdnError()->Forbidden();
}
$cdata = Contact::getPublicAndUserContactID($this->parameters['id'], $uid); $cdata = Contact::getPublicAndUserContactID($this->parameters['id'], $uid);
if (empty($cdata['user'])) { if (!empty($cdata['user'])) {
DI::mstdnError()->RecordNotFound();
}
$contact = Contact::getById($cdata['user']); $contact = Contact::getById($cdata['user']);
if (empty($contact)) { if (!empty($contact)) {
DI::mstdnError()->RecordNotFound();
}
Contact\User::setBlocked($cdata['user'], $uid, true);
// Mastodon-expected behavior: relationship is severed on block // Mastodon-expected behavior: relationship is severed on block
Contact::terminateFriendship($contact); Contact::terminateFriendship($contact);
}
}
System::jsonExit(DI::mstdnRelationship()->createFromContactId($this->parameters['id'], $uid)->toArray()); System::jsonExit(DI::mstdnRelationship()->createFromContactId($this->parameters['id'], $uid)->toArray());
} }