Don't show deleted contacts, set new AP contacts as "pending" until they are accepted

This commit is contained in:
Michael 2019-01-09 13:23:11 +00:00
parent 3b80f335fa
commit 6ae6a8a983
3 changed files with 18 additions and 14 deletions

View file

@ -1739,6 +1739,8 @@ class Contact extends BaseObject
$hidden = (($ret['network'] === Protocol::MAIL) ? 1 : 0);
$pending = in_array($ret['network'], [Protocol::ACTIVITYPUB]);
if (in_array($ret['network'], [Protocol::MAIL, Protocol::DIASPORA, Protocol::ACTIVITYPUB])) {
$writeable = 1;
}
@ -1774,7 +1776,7 @@ class Contact extends BaseObject
'hidden' => $hidden,
'blocked' => 0,
'readonly'=> 0,
'pending' => 0,
'pending' => $pending,
'subhub' => $subhub
]);
}