bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #12838 from HankG/blocks-status-fix

Browse source 
Correctly reflect blocked status in Mastodon Relationship Object
This commit is contained in:
Hypolite Petovan 2023-02-22 16:49:55 -05:00 committed by GitHub
commit 1cff849a94
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Factory/Api/Mastodon/Relationship.php
View file

@ -38,14 +38,14 @@ class Relationship extends BaseFactory
public function createFromContactId(int $contactId, int $uid): RelationshipEntity
{
$cdata = Contact::getPublicAndUserContactID($contactId, $uid);
if (!empty($cdata)) {
$cid = $cdata['user'];
$pcid = $cdata['public'];
} else {
$pcid = $cid = $contactId;
}
$pcid = !empty($cdata['public']) ? $cdata['public'] : $contactId;
$cid = !empty($cdata['user']) ? $cdata['user'] : $contactId;
return new RelationshipEntity($pcid, Contact::getById($cid),
Contact\User::isBlocked($cid, $uid), Contact\User::isIgnored($cid, $uid));
return new RelationshipEntity(
$pcid,
Contact::getById($cid),
Contact\User::isBlocked($cid, $uid),
Contact\User::isIgnored($cid, $uid)
);
}
}