X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsuggest.php;h=03d0e77fc7f85225f79f3dde3921e7488b41a003;hb=893f6bd692efa94202dd472ea160eef68a420cf9;hp=d592537f483aec45b05c6e2886061128644d50c5;hpb=71b6226909aaef47ae4cfa7ba3d880cb0a73e2ef;p=friendica.git

diff --git a/mod/suggest.php b/mod/suggest.php
index d592537f48..03d0e77fc7 100644
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -20,13 +20,12 @@
  */
 
 use Friendica\App;
-use Friendica\Content\ContactSelector;
 use Friendica\Content\Widget;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
-use Friendica\Model\GContact;
+use Friendica\Module\Contact as ModuleContact;
 
 function suggest_init(App $a)
 {
@@ -60,9 +59,8 @@ function suggest_content(App $a)
 	DI::page()['aside'] .= Widget::follow();
 
 
-	$r = GContact::suggestionQuery(local_user());
-
-	if (! DBA::isResult($r)) {
+	$contacts = Contact::getSuggestions(local_user());
+	if (!DBA::isResult($contacts)) {
 		$o .= DI::l10n()->t('No suggestions available. If this is a new site, please try again in 24 hours.');
 		return $o;
 	}
@@ -94,37 +92,8 @@ function suggest_content(App $a)
 	$id = 0;
 	$entries = [];
 
-	foreach ($r as $rr) {
-		$connlnk = DI::baseUrl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);
-		$ignlnk = DI::baseUrl() . '/suggest?ignore=' . $rr['id'];
-		$photo_menu = [
-			'profile' => [DI::l10n()->t("View Profile"), Contact::magicLink($rr["url"])],
-			'follow' => [DI::l10n()->t("Connect/Follow"), $connlnk],
-			'hide' => [DI::l10n()->t('Ignore/Hide'), $ignlnk]
-		];
-
-		$contact_details = Contact::getByURLForUser($rr["url"], local_user()) ?: $rr;
-
-		$entry = [
-			'url' => Contact::magicLink($rr['url']),
-			'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
-			'img_hover' => $rr['url'],
-			'name' => $contact_details['name'],
-			'thumb' => Contact::getThumb($contact_details),
-			'details'       => $contact_details['location'],
-			'tags'          => $contact_details['keywords'],
-			'about'         => $contact_details['about'],
-			'account_type'  => Contact::getAccountType($contact_details),
-			'ignlnk' => $ignlnk,
-			'ignid' => $rr['id'],
-			'conntxt' => DI::l10n()->t('Connect'),
-			'connlnk' => $connlnk,
-			'photo_menu' => $photo_menu,
-			'ignore' => DI::l10n()->t('Ignore/Hide'),
-			'network' => ContactSelector::networkToName($rr['network'], $rr['url']),
-			'id' => ++$id,
-		];
-		$entries[] = $entry;
+	foreach ($contacts as $contact) {
+		$entries[] = ModuleContact::getContactTemplateVars($contact, ++$id);
 	}
 
 	$tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');