improvements
This commit is contained in:
parent
c5653d30f3
commit
f21196df7c
3 changed files with 10 additions and 5 deletions
|
@ -5,7 +5,7 @@ namespace Friendica\Model;
|
|||
use Friendica\BaseModel;
|
||||
|
||||
/**
|
||||
* Model for interacting with a friend suggest
|
||||
* Model for interacting with a friend suggestion
|
||||
*
|
||||
* @property int uid
|
||||
* @property int cid
|
||||
|
|
|
@ -76,7 +76,15 @@ class FriendSuggest extends BaseModule
|
|||
}
|
||||
|
||||
$contacts = ContactModel::selectToArray(['id', 'name'], [
|
||||
'`uid` = ? AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND NOT `deleted` AND `notify` != "" AND `id` != ? AND `network` = ?',
|
||||
'`uid` = ?
|
||||
AND `id` != ?
|
||||
AND `network` = ?
|
||||
AND NOT `self`
|
||||
AND NOT `blocked`
|
||||
AND NOT `pending`
|
||||
AND NOT `archive`
|
||||
AND NOT `deleted`
|
||||
AND `notify` != ""',
|
||||
local_user(),
|
||||
$cid,
|
||||
Protocol::DFRN,
|
||||
|
|
|
@ -71,9 +71,6 @@ class Notifier
|
|||
}
|
||||
} elseif ($cmd == Delivery::SUGGESTION) {
|
||||
$suggest = DI::fsuggest()->getById($target_id);
|
||||
if (empty($suggest)) {
|
||||
return;
|
||||
}
|
||||
$uid = $suggest->uid;
|
||||
$recipients[] = $suggest->cid;
|
||||
} elseif ($cmd == Delivery::REMOVAL) {
|
||||
|
|
Loading…
Reference in a new issue