Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 17:50:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/2019.09-rc' into performance

Browse source
This commit is contained in:
Michael 2019-09-03 15:02:16 +00:00
commit 33006d8455
9 changed files with 3716 additions and 3554 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Protocol/Diaspora.php
View file

@ -55,7 +55,7 @@ class Diaspora
*
* @param array $contact of the relay contact
*/
public static function markRelayForArchival($contact)
public static function markRelayForArchival(array $contact)
{
if (!empty($contact['contact-type']) && ($contact['contact-type'] == Contact::TYPE_RELAY)) {
// This is already the relay contact, we don't need to fetch it
@ -175,7 +175,7 @@ class Diaspora
* @return array with the contact
* @throws \Exception
*/
private static function getRelayContact($server_url, $fields = ['batch', 'id', 'name', 'network', 'protocol', 'archive', 'blocked'])
private static function getRelayContact(string $server_url, array $fields = ['batch', 'id', 'name', 'network', 'protocol', 'archive', 'blocked'])
{
// Fetch the relay contact
$condition = ['uid' => 0, 'nurl' => Strings::normaliseLink($server_url),