whops .. wrong legacy endpoint

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

diff --git a/src/Module/Contact/Hovercard.php b/src/Module/Contact/Hovercard.php
index 655fc9e2d50dd03aa89bed911b1113af61efec49..620b96095a4077d3307e6d03b6f9c6ce89080c73 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-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -23,34 +23,37 @@ namespace Friendica\Module\Contact;
 
 use Friendica\BaseModule;
 use Friendica\Core\Renderer;
-use Friendica\Core\Session;
+use Friendica\Core\System;
 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'] ?? '';
 
                // Get out if the system doesn't have public access allowed
-               if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
+               if (DI::config()->get('system', 'block_public') && !DI::userSession()->isAuthenticated()) {
                        throw new HTTPException\ForbiddenException();
                }
 
-               // If a contact is connected the url is internally changed to 'redir/CID'. We need the pure url to search for
+               // If a contact is connected the url is internally changed to 'contact/redir/CID'. We need the pure url to search for
                // the contact. So we strip out the contact id from the internal url and look in the contact table for
                // the real url (nurl)
-               if (strpos($contact_url, 'redir/') === 0) {
+               if (strpos($contact_url, 'contact/redir/') === 0) {
                        $cid = intval(substr($contact_url, 6));
+               } elseif (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'] ?? '';
                }
@@ -64,8 +67,8 @@ class Hovercard extends BaseModule
 
                // Search for contact data
                // Look if the local user has got the contact
-               if (Session::isAuthenticated()) {
-                       $contact = Contact::getByURLForUser($contact_url, local_user(), [], false);
+               if (DI::userSession()->isAuthenticated()) {
+                       $contact = Contact::getByURLForUser($contact_url, DI::userSession()->getLocalUserId());
                } else {
                        $contact = Contact::getByURL($contact_url, false);
                }
@@ -75,7 +78,7 @@ class Hovercard extends BaseModule
                }
 
                // Get the photo_menu - the menu if possible contact actions
-               if (Session::isAuthenticated()) {
+               if (DI::userSession()->isAuthenticated()) {
                        $actions = Contact::photoMenu($contact);
                } else {
                        $actions = [];
@@ -88,20 +91,20 @@ 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'],
                                'network_link' => Strings::formatNetworkName($contact['network'], $contact['url']),
                                'tags'         => $contact['keywords'],
                                'bd'           => $contact['bd'] <= DBA::NULL_DATE ? '' : $contact['bd'],
-                               'account_type' => Contact::getAccountType($contact),
+                               'account_type' => Contact::getAccountType($contact['contact-type']),
                                'actions'      => $actions,
                        ],
                ]);
 
                echo $o;
-               exit();
+               System::exit();
        }
 }