Merge pull request #7726 from tobiasd/20191010-uexport

[friendica.git] / src / Network / Probe.php

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 1b1d0cee3234aaa6f80c43cda180e7cf272e8593..80fa641ed4884a276548715daa66cb32cd2ccf12 100644 (file)
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -18,11 +18,11 @@ use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Profile;
+use Friendica\Protocol\ActivityNamespace;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\Email;
 use Friendica\Protocol\Feed;
 use Friendica\Util\Crypto;
-use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
@@ -200,10 +200,10 @@ class Probe
                Logger::log('webfingerDfrn: '.$webbie.':'.print_r($links, true), Logger::DATA);
                if (!empty($links) && is_array($links)) {
                        foreach ($links as $link) {
-                               if ($link['@attributes']['rel'] === NAMESPACE_DFRN) {
+                               if ($link['@attributes']['rel'] === ActivityNamespace::DFRN) {
                                        $profile_link = $link['@attributes']['href'];
                                }
-                               if (($link['@attributes']['rel'] === NAMESPACE_OSTATUSSUB) && ($profile_link == "")) {
+                               if (($link['@attributes']['rel'] === ActivityNamespace::OSTATUSSUB) && ($profile_link == "")) {
                                        $profile_link = 'stat:'.$link['@attributes']['template'];
                                }
                                if ($link['@attributes']['rel'] === 'http://microformats.org/profile/hcard') {
@@ -348,7 +348,7 @@ class Probe
                if (!self::$istimeout) {
                        $ap_profile = ActivityPub::probeProfile($uri);
 
-                       if (empty($data) || (!empty($ap_profile) && empty($network) && (defaults($data, 'network', '') != Protocol::DFRN))) {
+                       if (empty($data) || (!empty($ap_profile) && empty($network) && (($data['network'] ?? '') != Protocol::DFRN))) {
                                $data = $ap_profile;
                        } elseif (!empty($ap_profile)) {
                                $ap_profile['batch'] = '';
@@ -363,7 +363,7 @@ class Probe
                }
 
                if (!empty($data['photo'])) {
-                       $data['baseurl'] = Network::getUrlMatch(Strings::normaliseLink(defaults($data, 'baseurl', '')), Strings::normaliseLink($data['photo']));
+                       $data['baseurl'] = Network::getUrlMatch(Strings::normaliseLink($data['baseurl'] ?? ''), Strings::normaliseLink($data['photo']));
                } else {
                        $data['photo'] = System::baseUrl() . '/images/person-300.jpg';
                }
@@ -424,7 +424,7 @@ class Probe
                }
 
                // If the file is too large then exit
-               if (defaults($curlResult->getInfo(), 'download_content_length', 0) > 1000000) {
+               if (($curlResult->getInfo()['download_content_length'] ?? 0) > 1000000) {
                        return false;
                }
 
@@ -492,7 +492,7 @@ class Probe
                $has_key = false;
 
                foreach ($webfinger['links'] as $link) {
-                       if ($link['rel'] == NAMESPACE_OSTATUSSUB) {
+                       if ($link['rel'] == ActivityNamespace::OSTATUSSUB) {
                                $is_ostatus = true;
                        }
                        if ($link['rel'] == 'magic-public-key') {
@@ -547,7 +547,7 @@ class Probe
                                return [];
                        }
 
-                       $path_parts = explode("/", trim(defaults($parts, 'path', ''), "/"));
+                       $path_parts = explode("/", trim($parts['path'] ?? '', "/"));
 
                        while (!$lrdd && (sizeof($path_parts) > 1)) {
                                $host .= "/".array_shift($path_parts);
@@ -921,19 +921,19 @@ class Probe
 
                if (empty($data["addr"]) || empty($data["nick"])) {
                        $probe_data = self::uri($profile_link);
-                       $data["addr"] = defaults($data, "addr", $probe_data["addr"]);
-                       $data["nick"] = defaults($data, "nick", $probe_data["nick"]);
+                       $data["addr"] = ($data["addr"] ?? '') ?: $probe_data["addr"];
+                       $data["nick"] = ($data["nick"] ?? '') ?: $probe_data["nick"];
                }
 
                $prof_data["addr"]         = $data["addr"];
                $prof_data["nick"]         = $data["nick"];
-               $prof_data["dfrn-request"] = defaults($data, 'request', null);
-               $prof_data["dfrn-confirm"] = defaults($data, 'confirm', null);
-               $prof_data["dfrn-notify"]  = defaults($data, 'notify' , null);
-               $prof_data["dfrn-poll"]    = defaults($data, 'poll'   , null);
-               $prof_data["photo"]        = defaults($data, 'photo'  , null);
-               $prof_data["fn"]           = defaults($data, 'name'   , null);
-               $prof_data["key"]          = defaults($data, 'pubkey' , null);
+               $prof_data["dfrn-request"] = $data['request'] ?? null;
+               $prof_data["dfrn-confirm"] = $data['confirm'] ?? null;
+               $prof_data["dfrn-notify"]  = $data['notify']  ?? null;
+               $prof_data["dfrn-poll"]    = $data['poll']    ?? null;
+               $prof_data["photo"]        = $data['photo']   ?? null;
+               $prof_data["fn"]           = $data['name']    ?? null;
+               $prof_data["key"]          = $data['pubkey']  ?? null;
 
                Logger::log("Result for profile ".$profile_link.": ".print_r($prof_data, true), Logger::DEBUG);
 
@@ -955,15 +955,15 @@ class Probe
                // The array is reversed to take into account the order of preference for same-rel links
                // See: https://tools.ietf.org/html/rfc7033#section-4.4.4
                foreach (array_reverse($webfinger["links"]) as $link) {
-                       if (($link["rel"] == NAMESPACE_DFRN) && !empty($link["href"])) {
+                       if (($link["rel"] == ActivityNamespace::DFRN) && !empty($link["href"])) {
                                $data["network"] = Protocol::DFRN;
-                       } elseif (($link["rel"] == NAMESPACE_FEED) && !empty($link["href"])) {
+                       } elseif (($link["rel"] == ActivityNamespace::FEED) && !empty($link["href"])) {
                                $data["poll"] = $link["href"];
-                       } elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") && (defaults($link, "type", "") == "text/html") && !empty($link["href"])) {
+                       } elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") && (($link["type"] ?? "") == "text/html") && !empty($link["href"])) {
                                $data["url"] = $link["href"];
                        } elseif (($link["rel"] == "http://microformats.org/profile/hcard") && !empty($link["href"])) {
                                $hcard_url = $link["href"];
-                       } elseif (($link["rel"] == NAMESPACE_POCO) && !empty($link["href"])) {
+                       } elseif (($link["rel"] == ActivityNamespace::POCO) && !empty($link["href"])) {
                                $data["poco"] = $link["href"];
                        } elseif (($link["rel"] == "http://webfinger.net/rel/avatar") && !empty($link["href"])) {
                                $data["photo"] = $link["href"];
@@ -1169,11 +1169,11 @@ class Probe
                                $data["baseurl"] = trim($link["href"], '/');
                        } elseif (($link["rel"] == "http://joindiaspora.com/guid") && !empty($link["href"])) {
                                $data["guid"] = $link["href"];
-                       } elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") && (defaults($link, "type", "") == "text/html") && !empty($link["href"])) {
+                       } elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") && (($link["type"] ?? "") == "text/html") && !empty($link["href"])) {
                                $data["url"] = $link["href"];
-                       } elseif (($link["rel"] == NAMESPACE_FEED) && !empty($link["href"])) {
+                       } elseif (($link["rel"] == ActivityNamespace::FEED) && !empty($link["href"])) {
                                $data["poll"] = $link["href"];
-                       } elseif (($link["rel"] == NAMESPACE_POCO) && !empty($link["href"])) {
+                       } elseif (($link["rel"] == ActivityNamespace::POCO) && !empty($link["href"])) {
                                $data["poco"] = $link["href"];
                        } elseif (($link["rel"] == "salmon") && !empty($link["href"])) {
                                $data["notify"] = $link["href"];
@@ -1267,13 +1267,13 @@ class Probe
                        // See: https://tools.ietf.org/html/rfc7033#section-4.4.4
                        foreach (array_reverse($webfinger["links"]) as $link) {
                                if (($link["rel"] == "http://webfinger.net/rel/profile-page")
-                                       && (defaults($link, "type", "") == "text/html")
+                                       && (($link["type"] ?? "") == "text/html")
                                        && ($link["href"] != "")
                                ) {
                                        $data["url"] = $link["href"];
                                } elseif (($link["rel"] == "salmon") && !empty($link["href"])) {
                                        $data["notify"] = $link["href"];
-                               } elseif (($link["rel"] == NAMESPACE_FEED) && !empty($link["href"])) {
+                               } elseif (($link["rel"] == ActivityNamespace::FEED) && !empty($link["href"])) {
                                        $data["poll"] = $link["href"];
                                } elseif (($link["rel"] == "magic-public-key") && !empty($link["href"])) {
                                        $pubkey = $link["href"];
@@ -1436,7 +1436,7 @@ class Probe
                // See: https://tools.ietf.org/html/rfc7033#section-4.4.4
                foreach (array_reverse($webfinger["links"]) as $link) {
                        if (($link["rel"] == "http://webfinger.net/rel/profile-page")
-                               && (defaults($link, "type", "") == "text/html")
+                               && (($link["type"] ?? "") == "text/html")
                                && ($link["href"] != "")
                        ) {
                                $data["url"] = $link["href"];
@@ -1504,10 +1504,39 @@ class Probe
                $data['baseurl'] = 'https://twitter.com';
 
                $curlResult = Network::curl($data['url'], false);
-               if ($curlResult->isSuccess()) {
-                       return $data;
+               if (!$curlResult->isSuccess()) {
+                       return [];
                }
-               return [];
+
+               $body = $curlResult->getBody();
+               $doc = new DOMDocument();
+               @$doc->loadHTML($body);
+               $xpath = new DOMXPath($doc);
+
+               $list = $xpath->query('//img[@class]');
+               foreach ($list as $node) {
+                       $img_attr = [];
+                       if ($node->attributes->length) {
+                               foreach ($node->attributes as $attribute) {
+                                       $img_attr[$attribute->name] = $attribute->value;
+                               }
+                       }
+
+                       if (empty($img_attr['class'])) {
+                               continue;
+                       }
+
+                       if (strpos($img_attr['class'], 'ProfileAvatar-image') !== false) {
+                               if (!empty($img_attr['src'])) {
+                                       $data['photo'] = $img_attr['src'];
+                               }
+                               if (!empty($img_attr['alt'])) {
+                                       $data['name'] = $img_attr['alt'];
+                               }
+                       }
+               }
+
+               return $data;
        }
 
        /**