Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-22 22:00:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Breakup public/user ID query results so can always query blocked status by CID

Browse source
This commit is contained in:
Hank Grabowski 2023-02-22 12:07:57 -05:00
parent b3226e11ac
commit 4a00731aa4
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 public function createFromContactId(int $contactId, int $uid): RelationshipEntity
{ {
$cdata = Contact::getPublicAndUserContactID($contactId, $uid); $cdata = Contact::getPublicAndUserContactID($contactId, $uid);
if (!empty($cdata)) { $pcid = !empty($cdata['public']) ? $cdata['public'] : $contactId;
$cid = $cdata['user']; $cid = !empty($cdata['user']) ? $cdata['user'] : $contactId;
$pcid = $cdata['public'];
} else {
$pcid = $cid = $contactId;
}
return new RelationshipEntity($pcid, Contact::getById($cid), return new RelationshipEntity(
Contact\User::isBlocked($cid, $uid), Contact\User::isIgnored($cid, $uid)); $pcid,
Contact::getById($cid),
Contact\User::isBlocked($cid, $uid),
Contact\User::isIgnored($cid, $uid)
);
} }
} }