strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Woraround for bad mastodon links

Browse source
This commit is contained in:
Michael 2017-12-19 11:54:02 +00:00
parent bfb15f2b33
commit b935a2b6d9
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/Protocol/PortableContact.php
View file

@ -860,6 +860,13 @@ class PortableContact
$orig_last_failure = $last_failure; $orig_last_failure = $last_failure;
$orig_last_contact = $last_contact; $orig_last_contact = $last_contact;
// Mastodon uses the "@" for user profiles.
// But this can be misunderstood.
if (parse_url($server_url, PHP_URL_USER) != '') {
dba::update('gserver', array('last_failure' => datetime_convert()), array('nurl' => normalise_link($server_url)));
return false;
}
// Check if the page is accessible via SSL. // Check if the page is accessible via SSL.
$orig_server_url = $server_url; $orig_server_url = $server_url;
$server_url = str_replace("http://", "https://", $server_url); $server_url = str_replace("http://", "https://", $server_url);
@ -914,11 +921,6 @@ class PortableContact
if (!$failure) { if (!$failure) {
// This will be too low, but better than no value at all. // This will be too low, but better than no value at all.
$registered_users = dba::count('gcontact', ['server_url' => normalise_link($server_url)]); $registered_users = dba::count('gcontact', ['server_url' => normalise_link($server_url)]);
// Every server has got an admin account at least
if ($registered_users == 0) {
$registered_users = 1;
}
} }
// Look for poco // Look for poco
@ -1213,6 +1215,11 @@ class PortableContact
} }
} }
// Every server has got at least an admin account
if (!$failure && ($registered_users == 0)) {
$registered_users = 1;
}
if ($possible_failure && !$failure) { if ($possible_failure && !$failure) {
$failure = true; $failure = true;
} }