From: Michael Date: Tue, 13 Nov 2018 05:52:21 +0000 (+0000) Subject: Don't suggest hidden contacts / Added AP to the suggestions X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b5fa5189989dace50ac819cb169344d1134e1fdf;p=friendica.git Don't suggest hidden contacts / Added AP to the suggestions --- diff --git a/mod/dirfind.php b/mod/dirfind.php index d3298b64db..2609760e91 100644 --- a/mod/dirfind.php +++ b/mod/dirfind.php @@ -121,23 +121,23 @@ function dirfind_content(App $a, $prefix = "") { /// @TODO These 2 SELECTs are not checked on validity with DBA::isResult() $count = q("SELECT count(*) AS `total` FROM `gcontact` - WHERE NOT `hide` AND `network` IN ('%s', '%s', '%s') AND + WHERE NOT `hide` AND `network` IN ('%s', '%s', '%s', '%s') AND ((`last_contact` >= `last_failure`) OR (`updated` >= `last_failure`)) AND (`url` LIKE '%s' OR `name` LIKE '%s' OR `location` LIKE '%s' OR `addr` LIKE '%s' OR `about` LIKE '%s' OR `keywords` LIKE '%s') $extra_sql", - DBA::escape(Protocol::DFRN), DBA::escape($ostatus), DBA::escape($diaspora), + DBA::escape(Protocol::ACTIVITYPUB), DBA::escape(Protocol::DFRN), DBA::escape($ostatus), DBA::escape($diaspora), DBA::escape(Strings::escapeHtml($search2)), DBA::escape(Strings::escapeHtml($search2)), DBA::escape(Strings::escapeHtml($search2)), DBA::escape(Strings::escapeHtml($search2)), DBA::escape(Strings::escapeHtml($search2)), DBA::escape(Strings::escapeHtml($search2))); $results = q("SELECT `nurl` FROM `gcontact` - WHERE NOT `hide` AND `network` IN ('%s', '%s', '%s') AND + WHERE NOT `hide` AND `network` IN ('%s', '%s', '%s', '%s') AND ((`last_contact` >= `last_failure`) OR (`updated` >= `last_failure`)) AND (`url` LIKE '%s' OR `name` LIKE '%s' OR `location` LIKE '%s' OR `addr` LIKE '%s' OR `about` LIKE '%s' OR `keywords` LIKE '%s') $extra_sql GROUP BY `nurl` ORDER BY `updated` DESC LIMIT %d, %d", - DBA::escape(Protocol::DFRN), DBA::escape($ostatus), DBA::escape($diaspora), + DBA::escape(Protocol::ACTIVITYPUB), DBA::escape(Protocol::DFRN), DBA::escape($ostatus), DBA::escape($diaspora), DBA::escape(Strings::escapeHtml($search2)), DBA::escape(Strings::escapeHtml($search2)), DBA::escape(Strings::escapeHtml($search2)), DBA::escape(Strings::escapeHtml($search2)), DBA::escape(Strings::escapeHtml($search2)), DBA::escape(Strings::escapeHtml($search2)), $pager->getStart(), $pager->getItemsPerPage()); diff --git a/src/Model/GContact.php b/src/Model/GContact.php index 6e2e520c89..1fed1fc3ef 100644 --- a/src/Model/GContact.php +++ b/src/Model/GContact.php @@ -430,7 +430,7 @@ class GContact // return $list; //} - $network = [Protocol::DFRN]; + $network = [Protocol::DFRN, Protocol::ACTIVITYPUB]; if (Config::get('system', 'diaspora_enabled')) { $network[] = Protocol::DIASPORA; @@ -451,7 +451,7 @@ class GContact where uid = %d and not gcontact.nurl in ( select nurl from contact where uid = %d ) AND NOT `gcontact`.`name` IN (SELECT `name` FROM `contact` WHERE `uid` = %d) AND NOT `gcontact`.`id` IN (SELECT `gcid` FROM `gcign` WHERE `uid` = %d) - AND `gcontact`.`updated` >= '%s' + AND `gcontact`.`updated` >= '%s' AND NOT `gcontact`.`hide` AND `gcontact`.`last_contact` >= `gcontact`.`last_failure` AND `gcontact`.`network` IN (%s) GROUP BY `glink`.`gcid` ORDER BY `gcontact`.`updated` DESC,`total` DESC LIMIT %d, %d",