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

Merge pull request #4788 from annando/more-relay

Browse source 
Relay: Avoid empty tags / Always use the "relay account"
This commit is contained in:
Tobias Diekershoff 2018-04-09 08:31:43 +02:00 committed by GitHub
commit 66bcbe210a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
mod/_well_known.php
View file

@ -46,8 +46,10 @@ function wk_social_relay()
$server_tags = Config::get('system', 'relay_server_tags'); $server_tags = Config::get('system', 'relay_server_tags');
$tagitems = explode(",", $server_tags); $tagitems = explode(",", $server_tags);
/// @todo Check if it was better to use "strtolower" on the tags
foreach ($tagitems AS $tag) { foreach ($tagitems AS $tag) {
$tags[trim($tag, "# ")] = trim($tag, "# "); $tag = trim($tag, "# ");
$tags[$tag] = $tag;
} }
if (Config::get('system', 'relay_user_tags')) { if (Config::get('system', 'relay_user_tags')) {
@ -62,7 +64,9 @@ function wk_social_relay()
$taglist = []; $taglist = [];
foreach ($tags AS $tag) { foreach ($tags AS $tag) {
$taglist[] = $tag; if (!empty($tag)) {
$taglist[] = $tag;
}
} }
$relay = [ $relay = [

26
src/Protocol/Diaspora.php
View file

@ -123,30 +123,30 @@ class Diaspora
{ {
$batch = $server_url . '/receive/public'; $batch = $server_url . '/receive/public';
$fields = ['batch', 'id', 'name', 'network', 'nick', $fields = ['batch', 'id', 'name', 'network', 'archive', 'blocked'];
'url', 'archive', 'blocked', 'contact-type'];
// Fetch the first unarchived, unblocked account // Fetch the relay contact
$condition = ['uid' => 0, 'network' => NETWORK_DIASPORA, 'batch' => $batch, $condition = ['uid' => 0, 'network' => NETWORK_DIASPORA, 'batch' => $batch,
'archive' => false, 'blocked' => false]; 'contact-type' => ACCOUNT_TYPE_RELAY];
$contact = dba::selectFirst('contact', $fields, $condition); $contact = dba::selectFirst('contact', $fields, $condition);
// If there is nothing found, we check if there is already a relay account // If there is nothing found, we check if there is some unmarked relay
// This code segment can be removed before the release 2018-05
if (!DBM::is_result($contact)) { if (!DBM::is_result($contact)) {
$condition = ['uid' => 0, 'network' => NETWORK_DIASPORA, 'batch' => $batch, $condition = ['uid' => 0, 'network' => NETWORK_DIASPORA, 'batch' => $batch,
'contact-type' => ACCOUNT_TYPE_RELAY]; 'name' => 'relay', 'nick' => 'relay', 'url' => $server_url];
$contact = dba::selectFirst('contact', $fields, $condition); $contact = dba::selectFirst('contact', $fields, $condition);
if (DBM::is_result($contact)) {
// Mark the relay account as a relay account
$fields = ['contact-type' => ACCOUNT_TYPE_RELAY];
dba::update('contact', $fields, ['id' => $contact['id']]);
}
} }
if (DBM::is_result($contact)) { if (DBM::is_result($contact)) {
if ($contact['archive'] || $contact['blocked']) { if ($contact['archive'] || $contact['blocked']) {
return false; return false;
} }
// Mark relay accounts as a relay, if this hadn't been the case before
if (($contact['url'] == $server_url) && ($contact['nick'] == 'relay') &&
($contact['name'] == 'relay') && ($contact['contact-type'] != ACCOUNT_TYPE_RELAY)) {
$fields = ['contact-type' => ACCOUNT_TYPE_RELAY];
dba::update('contact', $fields, ['id' => $contact['id']]);
}
return $contact; return $contact;
} else { } else {
$fields = ['uid' => 0, 'created' => DateTimeFormat::utcNow(), $fields = ['uid' => 0, 'created' => DateTimeFormat::utcNow(),