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

Adopt the relay definition according to the suggestions from @jaywink

Browse source
This commit is contained in:
Michael 2018-05-10 11:04:18 +00:00
parent 8612e44d19
commit 40d3e7982c
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mod/_well_known.php
View file

@ -73,8 +73,8 @@ function wk_social_relay()
'subscribe' => $subscribe, 'subscribe' => $subscribe,
'scope' => $scope, 'scope' => $scope,
'tags' => $taglist, 'tags' => $taglist,
'protocols' => ['diaspora' => System::baseUrl() . '/receive/public', 'protocols' => ['diaspora' => ['receive' => System::baseUrl() . '/receive/public'],
'dfrn' => System::baseUrl() . '/dfrn_notify'] 'dfrn' => ['receive' => System::baseUrl() . '/dfrn_notify']]
]; ];
header('Content-type: application/json; charset=utf-8'); header('Content-type: application/json; charset=utf-8');

12
src/Protocol/PortableContact.php
View file

@ -1436,11 +1436,19 @@ class PortableContact
if (isset($data->protocols)) { if (isset($data->protocols)) {
if (isset($data->protocols->diaspora)) { if (isset($data->protocols->diaspora)) {
$fields['network'] = NETWORK_DIASPORA; $fields['network'] = NETWORK_DIASPORA;
$fields['batch'] = $data->protocols->diaspora; if (isset($data->protocols->diaspora->receive)) {
$fields['batch'] = $data->protocols->diaspora->receive;
} elseif (is_string($data->protocols->diaspora)) {
$fields['batch'] = $data->protocols->diaspora;
}
} }
if (isset($data->protocols->dfrn)) { if (isset($data->protocols->dfrn)) {
$fields['network'] = NETWORK_DFRN; $fields['network'] = NETWORK_DFRN;
$fields['batch'] = $data->protocols->dfrn; if (isset($data->protocols->dfrn->receive)) {
$fields['batch'] = $data->protocols->dfrn->receive;
} elseif (is_string($data->protocols->dfrn)) {
$fields['batch'] = $data->protocols->dfrn;
}
} }
} }
Diaspora::setRelayContact($server_url, $fields); Diaspora::setRelayContact($server_url, $fields);