bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Check if the Diaspora endpoint is archived

Browse source
This commit is contained in:
Michael Vogel 2019-08-28 16:02:19 +02:00
parent cf170c9c02
commit 3c9834922c
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Model/Contact.php
View file

@ -1564,13 +1564,13 @@ class Contact extends BaseObject
* @return boolean Is the contact archived?
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
public static function isArchived($cid)
public static function isArchived(int $cid)
{
if ($cid == 0) {
return false;
}
$archived = DBA::selectFirst('contact', ['archive', 'url'], ['id' => $cid]);
$archived = DBA::selectFirst('contact', ['archive', 'url', 'batch'], ['id' => $cid]);
if (!DBA::isResult($archived)) {
return false;
}
@ -1592,7 +1592,10 @@ class Contact extends BaseObject
return true;
}
/// @todo Add tests for Diaspora endpoints as well
if (!empty($archived['batch'])) {
return DBA::exists('contact', ['archive' => true, 'batch' => $archived['batch'], 'contact-type' => self::TYPE_RELAY]);
}
return false;
}