Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-22 07:10:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't display ignored pending contacts, link to contact request page

Browse source
This commit is contained in:
Michael 2019-09-09 05:29:33 +00:00
parent 591ba9c68e
commit 2dbd843ed2
4 changed files with 29 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/Module/Contact.php
View file

@ -642,7 +642,8 @@ class Contact extends BaseModule
$sql_extra = " AND `archive` AND NOT `blocked`";
break;
case 'pending':
$sql_extra = " AND `pending` AND NOT `archive`";
$sql_extra = " AND `pending` AND NOT `archive`
AND NOT EXISTS (SELECT `id` FROM `intro` WHERE `contact-id` = `contact`.`id` AND `ignore`)";
break;
default:
$sql_extra = " AND NOT `archive` AND NOT `blocked` AND NOT `pending`";
@ -993,14 +994,6 @@ class Contact extends BaseModule
$alt_text = L10n::t('Pending outgoing contact request');
} else {
$alt_text = L10n::t('Pending incoming contact request');
$intro = DBA::selectFirst('intro', ['blocked', 'ignore'], ['contact-id' => $rr['id']]);
if (DBA::isResult($intro)) {
if ($intro['blocked']) {
$alt_text = L10n::t('Blocked incoming contact request');
} elseif ($intro['ignore']) {
$alt_text = L10n::t('Ignored incoming contact request');
}
}
}
}