Add Dice logging for Module creation

[friendica.git] / src / Module / Contact / Hovercard.php

diff --git a/src/Module/Contact/Hovercard.php b/src/Module/Contact/Hovercard.php
index 93495fd5a4a06ef7e1ac83edc0288da9c3a7584f..adc503fa513116cf4ad51d9f4289764bae082889 100644 (file)
--- a/src/Module/Contact/Hovercard.php
+++ b/src/Module/Contact/Hovercard.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -27,17 +27,15 @@ use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
-use Friendica\Model\GContact;
 use Friendica\Network\HTTPException;
 use Friendica\Util\Strings;
-use Friendica\Util\Proxy;
 
 /**
  * Asynchronous HTML fragment provider for frio contact hovercards
  */
 class Hovercard extends BaseModule
 {
-       public static function rawContent(array $parameters = [])
+       protected function rawContent(array $request = [])
        {
                $contact_url = $_REQUEST['url'] ?? '';
 
@@ -51,6 +49,13 @@ class Hovercard extends BaseModule
                // the real url (nurl)
                if (strpos($contact_url, 'redir/') === 0) {
                        $cid = intval(substr($contact_url, 6));
+               }
+
+               if (strpos($contact_url, 'contact/') === 0) {
+                       $cid = intval(substr($contact_url, 8));
+               }
+
+               if (!empty($cid)) {                     
                        $remote_contact = Contact::selectFirst(['nurl'], ['id' => $cid]);
                        $contact_url = $remote_contact['nurl'] ?? '';
                }
@@ -58,31 +63,16 @@ class Hovercard extends BaseModule
                $contact = [];
 
                // if it's the url containing https it should be converted to http
-               $contact_nurl = Strings::normaliseLink(GContact::cleanContactUrl($contact_url));
-               if (!$contact_nurl) {
+               if (!$contact_url) {
                        throw new HTTPException\BadRequestException();
                }
 
                // Search for contact data
                // Look if the local user has got the contact
                if (Session::isAuthenticated()) {
-                       $contact = Contact::getDetailsByURL($contact_nurl, local_user());
-               }
-
-               // If not then check the global user
-               if (!count($contact)) {
-                       $contact = Contact::getDetailsByURL($contact_nurl);
-               }
-
-               // Feeds url could have been destroyed through "cleanContactUrl", so we now use the original url
-               if (!count($contact) && Session::isAuthenticated()) {
-                       $contact_nurl = Strings::normaliseLink($contact_url);
-                       $contact = Contact::getDetailsByURL($contact_nurl, local_user());
-               }
-
-               if (!count($contact)) {
-                       $contact_nurl = Strings::normaliseLink($contact_url);
-                       $contact = Contact::getDetailsByURL($contact_nurl);
+                       $contact = Contact::getByURLForUser($contact_url, local_user());
+               } else {
+                       $contact = Contact::getByURL($contact_url, false);
                }
 
                if (!count($contact)) {
@@ -103,15 +93,14 @@ class Hovercard extends BaseModule
                                'name'         => $contact['name'],
                                'nick'         => $contact['nick'],
                                'addr'         => $contact['addr'] ?: $contact['url'],
-                               'thumb'        => Proxy::proxifyUrl($contact['thumb'], false, Proxy::SIZE_THUMB),
-                               'url'          => Contact::magicLink($contact['url']),
+                               'thumb'        => Contact::getThumb($contact),
+                               'url'          => Contact::magicLinkByContact($contact),
                                'nurl'         => $contact['nurl'],
                                'location'     => $contact['location'],
-                               'gender'       => $contact['gender'],
                                'about'        => $contact['about'],
                                'network_link' => Strings::formatNetworkName($contact['network'], $contact['url']),
                                'tags'         => $contact['keywords'],
-                               'bd'           => $contact['birthday'] <= DBA::NULL_DATE ? '' : $contact['birthday'],
+                               'bd'           => $contact['bd'] <= DBA::NULL_DATE ? '' : $contact['bd'],
                                'account_type' => Contact::getAccountType($contact),
                                'actions'      => $actions,
                        ],