X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmatch.php;h=02ee0c3339241bc2a5a490a5238cf3d8695da6ab;hb=f8b75ad1cc4fce28b1e521c016f140af7dc90540;hp=47b24e9f7e7582b60e63a029bc07d70be442e39c;hpb=407b2397cbb25a1de9252f16279dfdd786ffade1;p=friendica.git diff --git a/mod/match.php b/mod/match.php index 47b24e9f7e..02ee0c3339 100644 --- a/mod/match.php +++ b/mod/match.php @@ -1,129 +1,132 @@ . + * */ + use Friendica\App; use Friendica\Content\Widget; -use Friendica\Core\Config; -use Friendica\Core\L10n; -use Friendica\Core\System; -use Friendica\Database\DBM; +use Friendica\Core\Renderer; +use Friendica\Core\Search; +use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\Contact; use Friendica\Model\Profile; - -require_once 'include/text.php'; -require_once 'mod/proxy.php'; +use Friendica\Module\Contact as ModuleContact; /** - * @brief Controller for /match. + * Controller for /match. * * It takes keywords from your profile and queries the directory server for * matching keywords from other profiles. * * @param App $a App * - * @return void|string + * @return string + * @throws ImagickException + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws Exception */ function match_content(App $a) { - $o = ''; - if (! local_user()) { - return; + if (!local_user()) { + return ''; } - $a->page['aside'] .= Widget::findPeople(); - $a->page['aside'] .= Widget::follow(); + DI::page()['aside'] .= Widget::findPeople(); + DI::page()['aside'] .= Widget::follow(); - $_SESSION['return_url'] = System::baseUrl() . '/' . $a->cmd; + $_SESSION['return_path'] = DI::args()->getCommand(); - $r = q( - "SELECT `pub_keywords`, `prv_keywords` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1", - intval(local_user()) - ); - if (! DBM::is_result($r)) { - return; + $profile = Profile::getByUID(local_user()); + + if (!DBA::isResult($profile)) { + return ''; } - if (! $r[0]['pub_keywords'] && (! $r[0]['prv_keywords'])) { - notice(L10n::t('No keywords to match. Please add keywords to your default profile.') . EOL); - return; + if (!$profile['pub_keywords'] && (!$profile['prv_keywords'])) { + notice(DI::l10n()->t('No keywords to match. Please add keywords to your profile.')); + return ''; } $params = []; - $tags = trim($r[0]['pub_keywords'] . ' ' . $r[0]['prv_keywords']); + $tags = trim($profile['pub_keywords'] . ' ' . $profile['prv_keywords']); + + if (DI::mode()->isMobile()) { + $limit = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network', + DI::config()->get('system', 'itemspage_network_mobile')); + } else { + $limit = DI::pConfig()->get(local_user(), 'system', 'itemspage_network', + DI::config()->get('system', 'itemspage_network')); + } - if ($tags) { - $params['s'] = $tags; - if ($a->pager['page'] != 1) { - $params['p'] = $a->pager['page']; - } + $params['s'] = $tags; + $params['n'] = 100; - if (strlen(Config::get('system', 'directory'))) { - $x = post_url(get_server().'/msearch', $params); - } else { - $x = post_url(System::baseUrl() . '/msearch', $params); + $entries = []; + foreach ([Search::getGlobalDirectory(), DI::baseUrl()] as $server) { + if (empty($server)) { + continue; } - $j = json_decode($x); - - if ($j->total) { - $a->set_pager_total($j->total); - $a->set_pager_itemspage($j->items_page); + $msearch = json_decode(DI::httpClient()->post($server . '/msearch', $params)->getBody()); + if (!empty($msearch)) { + $entries = match_get_contacts($msearch, $entries, $limit); } + } - if (count($j->results)) { - $id = 0; - - foreach ($j->results as $jj) { - $match_nurl = normalise_link($jj->url); - $match = q( - "SELECT `nurl` FROM `contact` WHERE `uid` = '%d' AND nurl='%s' LIMIT 1", - intval(local_user()), - dbesc($match_nurl) - ); - - if (!count($match)) { - $jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo); - $connlnk = System::baseUrl() . '/follow/?url=' . $jj->url; - $photo_menu = [ - 'profile' => [L10n::t("View Profile"), Profile::zrl($jj->url)], - 'follow' => [L10n::t("Connect/Follow"), $connlnk] - ]; - - $contact_details = Contact::getDetailsByURL($jj->url, local_user()); - - $entry = [ - 'url' => Profile::zrl($jj->url), - 'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $jj->url), - 'name' => $jj->name, - 'details' => $contact_details['location'], - 'tags' => $contact_details['keywords'], - 'about' => $contact_details['about'], - 'account_type' => Contact::getAccountType($contact_details), - 'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB), - 'inttxt' => ' ' . L10n::t('is interested in:'), - 'conntxt' => L10n::t('Connect'), - 'connlnk' => $connlnk, - 'img_hover' => $jj->tags, - 'photo_menu' => $photo_menu, - 'id' => ++$id, - ]; - $entries[] = $entry; - } - } - - $tpl = get_markup_template('viewcontact_template.tpl'); - - $o .= replace_macros( - $tpl, - [ - '$title' => L10n::t('Profile Match'), - '$contacts' => $entries, - '$paginate' => paginate($a)] - ); - } else { - info(L10n::t('No matches') . EOL); - } + if (empty($entries)) { + info(DI::l10n()->t('No matches')); } + $tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl'); + $o = Renderer::replaceMacros($tpl, [ + '$title' => DI::l10n()->t('Profile Match'), + '$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