Don't show deleted contacts, changed "pending" behaviour

This commit is contained in:
Michael 2019-01-12 13:28:14 +00:00
parent cd3ab5ddc9
commit 28f14c7d60
6 changed files with 23 additions and 16 deletions

View file

@ -50,7 +50,7 @@ class Transmitter
public static function getFollowers($owner, $page = null)
{
$condition = ['rel' => [Contact::FOLLOWER, Contact::FRIEND], 'network' => Protocol::NATIVE_SUPPORT, 'uid' => $owner['uid'],
'self' => false, 'hidden' => false, 'archive' => false, 'pending' => false];
'self' => false, 'deleted' => false, 'hidden' => false, 'archive' => false, 'pending' => false];
$count = DBA::count('contact', $condition);
$data = ['@context' => ActivityPub::CONTEXT];
@ -97,7 +97,7 @@ class Transmitter
public static function getFollowing($owner, $page = null)
{
$condition = ['rel' => [Contact::SHARING, Contact::FRIEND], 'network' => Protocol::NATIVE_SUPPORT, 'uid' => $owner['uid'],
'self' => false, 'hidden' => false, 'archive' => false, 'pending' => false];
'self' => false, 'deleted' => false, 'hidden' => false, 'archive' => false, 'pending' => false];
$count = DBA::count('contact', $condition);
$data = ['@context' => ActivityPub::CONTEXT];