Merge pull request #11196 from annando/issue-10966-send

[friendica.git] / mod / match.php

diff --git a/mod/match.php b/mod/match.php
index 47d98797944d9f3a566b544d47f295a3d4e13d12..02ee0c3339241bc2a5a490a5238cf3d8695da6ab 100644 (file)
--- a/mod/match.php
+++ b/mod/match.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
  *
@@ -27,8 +27,7 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
-use Friendica\Util\Network;
-use Friendica\Util\Proxy as ProxyUtils;
+use Friendica\Module\Contact as ModuleContact;
 
 /**
  * Controller for /match.
@@ -60,96 +59,74 @@ function match_content(App $a)
                return '';
        }
        if (!$profile['pub_keywords'] && (!$profile['prv_keywords'])) {
-               notice(DI::l10n()->t('No keywords to match. Please add keywords to your profile.') . EOL);
+               notice(DI::l10n()->t('No keywords to match. Please add keywords to your profile.'));
                return '';
        }
 
        $params = [];
        $tags = trim($profile['pub_keywords'] . ' ' . $profile['prv_keywords']);
 
-       $params['s'] = $tags;
-       $params['n'] = 100;
-
-       if (strlen(DI::config()->get('system', 'directory'))) {
-               $host = Search::getGlobalDirectory();
+       if (DI::mode()->isMobile()) {
+               $limit = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network',
+                       DI::config()->get('system', 'itemspage_network_mobile'));
        } else {
-               $host = DI::baseUrl();
+               $limit = DI::pConfig()->get(local_user(), 'system', 'itemspage_network',
+                       DI::config()->get('system', 'itemspage_network'));
        }
 
-       $msearch_json = Network::post($host . '/msearch', $params)->getBody();
-
-       $msearch = json_decode($msearch_json);
+       $params['s'] = $tags;
+       $params['n'] = 100;
 
-       $start = $_GET['start'] ?? 0;
        $entries = [];
-       $paginate = '';
-
-       if (!empty($msearch->results)) {
-               for ($i = $start;count($entries) < 10 && $i < $msearch->total; $i++) {
-                       $profile = $msearch->results[$i];
-
-                       // Already known contact
-                       if (!$profile || Contact::getIdForURL($profile->url, local_user(), true)) {
-                               continue;
-                       }
-
-                       // Workaround for wrong directory photo URL
-                       $profile->photo = str_replace('http:///photo/', Search::getGlobalDirectory() . '/photo/', $profile->photo);
-
-                       $connlnk = DI::baseUrl() . '/follow/?url=' . $profile->url;
-                       $photo_menu = [
-                               'profile' => [DI::l10n()->t("View Profile"), Contact::magicLink($profile->url)],
-                               'follow' => [DI::l10n()->t("Connect/Follow"), $connlnk]
-                       ];
-
-                       $contact_details = Contact::getDetailsByURL($profile->url, 0);
-
-                       $entry = [
-                               'url'          => Contact::magicLink($profile->url),
-                               'itemurl'      => $contact_details['addr'] ?? $profile->url,
-                               'name'         => $profile->name,
-                               'details'      => $contact_details['location'] ?? '',
-                               'tags'         => $contact_details['keywords'] ?? '',
-                               'about'        => $contact_details['about'] ?? '',
-                               'account_type' => Contact::getAccountType($contact_details),
-                               'thumb'        => ProxyUtils::proxifyUrl($profile->photo, false, ProxyUtils::SIZE_THUMB),
-                               'conntxt'      => DI::l10n()->t('Connect'),
-                               'connlnk'      => $connlnk,
-                               'img_hover'    => $profile->tags,
-                               'photo_menu'   => $photo_menu,
-                               'id'           => $i,
-                       ];
-                       $entries[] = $entry;
+       foreach ([Search::getGlobalDirectory(), DI::baseUrl()] as $server) {
+               if (empty($server)) {
+                       continue;
                }
 
-               $data = [
-                       'class' => 'pager',
-                       'first' => [
-                               'url'   => 'match',
-                               'text'  => DI::l10n()->t('first'),
-                               'class' => 'previous' . ($start == 0 ? 'disabled' : '')
-                       ],
-                       'next'  => [
-                               'url'   => 'match?start=' . $i,
-                               'text'  => DI::l10n()->t('next'),
-                               'class' =>  'next' . ($i >= $msearch->total ? ' disabled' : '')
-                       ]
-               ];
-
-               $tpl = Renderer::getMarkupTemplate('paginate.tpl');
-               $paginate = Renderer::replaceMacros($tpl, ['pager' => $data]);
+               $msearch = json_decode(DI::httpClient()->post($server . '/msearch', $params)->getBody());
+               if (!empty($msearch)) {
+                       $entries = match_get_contacts($msearch, $entries, $limit);
+               }
        }
 
        if (empty($entries)) {
-               info(DI::l10n()->t('No matches') . EOL);
+               info(DI::l10n()->t('No matches'));
        }
 
        $tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
        $o = Renderer::replaceMacros($tpl, [
                '$title'    => DI::l10n()->t('Profile Match'),
-               '$contacts' => $entries,
-               '$paginate' => $paginate
+               '$contacts' => array_slice($entries, 0, $limit),
        ]);
 
        return $o;
 }
+
+function match_get_contacts($msearch, $entries, $limit)
+{
+       if (empty($msearch->results)) {
+               return $entries;
+       }
+
+       foreach ($msearch->results as $profile) {
+               if (!$profile) {
+                       continue;
+               }
+
+               // Already known contact
+               $contact = Contact::getByURL($profile->url, null, ['rel'], local_user());
+               if (!empty($contact) && in_array($contact['rel'], [Contact::FRIEND, Contact::SHARING])) {
+                       continue;
+               }
+
+               $contact = Contact::getByURLForUser($profile->url, local_user());
+               if (!empty($contact)) {
+                       $entries[$contact['id']] = ModuleContact::getContactTemplateVars($contact);
+               }
+
+               if (count($entries) == $limit) {
+                       break;
+               }
+       }
+       return $entries;
+}
\ No newline at end of file