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 750b856bc301dea0c05563a58153cc8082053b6e..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'] ?? '';
                }
@@ -88,8 +93,8 @@ 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'],
                                'about'        => $contact['about'],