Ensure contact tabs will use the correct id

[friendica.git] / src / Module / AllFriends.php

diff --git a/src/Module/AllFriends.php b/src/Module/AllFriends.php
index 47d8c3e2644dc2cc4e88fed74d0a361330f041e8..00614a1330a3d2c3a1ede367e061fc1a00dfea95 100644 (file)
--- a/src/Module/AllFriends.php
+++ b/src/Module/AllFriends.php
@@ -1,16 +1,32 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
-use Friendica\Content\ContactSelector;
 use Friendica\Content\Pager;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model;
 use Friendica\Network\HTTPException;
-use Friendica\Util\Proxy as ProxyUtils;
 
 /**
  * This module shows all public friends of the selected contact
@@ -33,71 +49,36 @@ class AllFriends extends BaseModule
                }
 
                if (!$cid) {
-                       throw new HTTPException\BadRequestException(L10n::t('Invalid contact.'));
+                       throw new HTTPException\BadRequestException(DI::l10n()->t('Invalid contact.'));
                }
 
                $uid = $app->user['uid'];
 
-               $contact = Model\Contact::getContactForUser($cid, local_user(), ['name', 'url', 'photo', 'uid', 'id']);
+               $contact = Model\Contact::getById($cid, ['name', 'url', 'photo', 'uid', 'id']);
 
                if (empty($contact)) {
-                       throw new HTTPException\BadRequestException(L10n::t('Invalid contact.'));
+                       throw new HTTPException\BadRequestException(DI::l10n()->t('Invalid contact.'));
                }
 
-               $app->page['aside'] = "";
-               Model\Profile::load($app, "", 0, Model\Contact::getDetailsByURL($contact["url"]));
+               DI::page()['aside'] = "";
+               Model\Profile::load($app, "", Model\Contact::getByURL($contact["url"], false));
 
-               $total = Model\GContact::countAllFriends(local_user(), $cid);
+               $total = Model\Contact::countContactsOfContact($cid);
 
-               $pager = new Pager(DI::args()->getQueryString());
+               $pager = new Pager(DI::l10n(), DI::args()->getQueryString());
 
-               $friends = Model\GContact::allFriends(local_user(), $cid, $pager->getStart(), $pager->getItemsPerPage());
+               $friends = Model\Contact::getContactsOfContact($cid, $pager->getStart(), $pager->getItemsPerPage());
                if (empty($friends)) {
-                       return L10n::t('No friends to display.');
+                       return DI::l10n()->t('No friends to display.');
                }
 
-               $id = 0;
+               $tab_str = Contact::getTabsHTML($app, $contact, 4);
 
                $entries = [];
                foreach ($friends as $friend) {
-                       //get further details of the contact
-                       $contactDetails = Model\Contact::getDetailsByURL($friend['url'], $uid, $friend);
-
-                       $connlnk = '';
-                       // $friend[cid] is only available for common contacts. So if the contact is a common one, use contact_photo_menu to generate the photoMenu
-                       // If the contact is not common to the user, Connect/Follow' will be added to the photo menu
-                       if ($friend['cid']) {
-                               $friend['id'] = $friend['cid'];
-                               $photoMenu = Model\Contact::photoMenu($friend);
-                       } else {
-                               $connlnk = DI::baseUrl()->get() . '/follow/?url=' . $friend['url'];
-                               $photoMenu = [
-                                       'profile' => [L10n::t('View Profile'), Model\Contact::magicLinkbyId($friend['id'], $friend['url'])],
-                                       'follow'  => [L10n::t('Connect/Follow'), $connlnk]
-                               ];
-                       }
-
-                       $entry = [
-                               'url'          => Model\Contact::magicLinkbyId($friend['id'], $friend['url']),
-                               'itemurl'      => ($contactDetails['addr'] ?? '') ?: $friend['url'],
-                               'name'         => $contactDetails['name'],
-                               'thumb'        => ProxyUtils::proxifyUrl($contactDetails['thumb'], false, ProxyUtils::SIZE_THUMB),
-                               'img_hover'    => $contactDetails['name'],
-                               'details'      => $contactDetails['location'],
-                               'tags'         => $contactDetails['keywords'],
-                               'about'        => $contactDetails['about'],
-                               'account_type' => Model\Contact::getAccountType($contactDetails),
-                               'network'      => ContactSelector::networkToName($contactDetails['network'], $contactDetails['url']),
-                               'photoMenu'    => $photoMenu,
-                               'conntxt'      => L10n::t('Connect'),
-                               'connlnk'      => $connlnk,
-                               'id'           => ++$id,
-                       ];
-                       $entries[] = $entry;
+                       $entries[] = Contact::getContactTemplateVars($friend);
                }
 
-               $tab_str = Contact::getTabsHTML($app, $contact, 4);
-
                $tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
                return Renderer::replaceMacros($tpl, [
                        '$tab_str'  => $tab_str,