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

Merge pull request #12125 from annando/pending 

Don't show following/followed_by on pending
This commit is contained in:
Tobias Diekershoff 2022-11-06 10:26:11 +01:00 committed by GitHub
parent 4b5c6994b2 e10d714ef5
commit e582cd4543
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Object/Api/Mastodon/Relationship.php
View File

@ -94,9 +94,9 @@ class Relationship extends BaseDataTransferObject
$this->note = ''; $this->note = '';
if ($contactRecord['uid'] != 0) { if ($contactRecord['uid'] != 0) {
$this->following = in_array($contactRecord['rel'] ?? 0, [Contact::SHARING, Contact::FRIEND]); $this->following = !$contactRecord['pending'] && in_array($contactRecord['rel'] ?? 0, [Contact::SHARING, Contact::FRIEND]);
$this->requested = (bool)($contactRecord['pending'] ?? false); $this->requested = (bool)($contactRecord['pending'] ?? false);
$this->followed_by = in_array($contactRecord['rel'] ?? 0, [Contact::FOLLOWER, Contact::FRIEND]); $this->followed_by = !$contactRecord['pending'] && in_array($contactRecord['rel'] ?? 0, [Contact::FOLLOWER, Contact::FRIEND]);
$this->muting = (bool)($contactRecord['readonly'] ?? false) || $muted; $this->muting = (bool)($contactRecord['readonly'] ?? false) || $muted;
$this->notifying = (bool)$contactRecord['notify_new_posts'] ?? false; $this->notifying = (bool)$contactRecord['notify_new_posts'] ?? false;
$this->blocking = (bool)($contactRecord['blocked'] ?? false) || $blocked; $this->blocking = (bool)($contactRecord['blocked'] ?? false) || $blocked;