friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Doing some Hypolyzation

This commit is contained in:
Michael 2017-03-27 21:02:56 +00:00
parent c85331d8ac
commit 4fc1ebd4ea
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/Probe.php
View File

@ -337,9 +337,9 @@ class Probe {
/// @todo: Ports? /// @todo: Ports?
$host = $parts["host"]; $host = $parts["host"];
if ($host == 'twitter.com') if ($host == 'twitter.com') {
return array("network" => NETWORK_TWITTER); return array("network" => NETWORK_TWITTER);
}
$lrdd = self::xrd($host); $lrdd = self::xrd($host);
$path_parts = explode("/", trim($parts["path"], "/")); $path_parts = explode("/", trim($parts["path"], "/"));
@ -348,9 +348,9 @@ class Probe {
$host .= "/".array_shift($path_parts); $host .= "/".array_shift($path_parts);
$lrdd = self::xrd($host); $lrdd = self::xrd($host);
} }
if (!$lrdd) if (!$lrdd) {
return self::feed($uri); return self::feed($uri);
}
$nick = array_pop($path_parts); $nick = array_pop($path_parts);
// Mastodon uses a "@" as prefix for usernames in their url format // Mastodon uses a "@" as prefix for usernames in their url format
@ -373,14 +373,14 @@ class Probe {
$host = substr($uri,strpos($uri, '@') + 1); $host = substr($uri,strpos($uri, '@') + 1);
$nick = substr($uri,0, strpos($uri, '@')); $nick = substr($uri,0, strpos($uri, '@'));
if (strpos($uri, '@twitter.com')) if (strpos($uri, '@twitter.com')) {
return array("network" => NETWORK_TWITTER); return array("network" => NETWORK_TWITTER);
}
$lrdd = self::xrd($host); $lrdd = self::xrd($host);
if (!$lrdd) if (!$lrdd) {
return self::mail($uri, $uid); return self::mail($uri, $uid);
}
$addr = $uri; $addr = $uri;
} else { } else {
return false; return false;