tobias/friendica
1
0
Fork 0
Code Pull requests Activity

improvements

Browse source
This commit is contained in:
nupplaPhil 2020-02-01 00:27:46 +01:00
parent c5653d30f3
commit f21196df7c
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Model/FSuggest.php
View file

@ -5,7 +5,7 @@ namespace Friendica\Model;
use Friendica\BaseModel; use Friendica\BaseModel;
/** /**
* Model for interacting with a friend suggest * Model for interacting with a friend suggestion
* *
* @property int uid * @property int uid
* @property int cid * @property int cid

10
src/Module/FriendSuggest.php
View file

@ -76,7 +76,15 @@ class FriendSuggest extends BaseModule
} }
$contacts = ContactModel::selectToArray(['id', 'name'], [ $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(), local_user(),
$cid, $cid,
Protocol::DFRN, Protocol::DFRN,

3
src/Worker/Notifier.php
View file

@ -71,9 +71,6 @@ class Notifier
} }
} elseif ($cmd == Delivery::SUGGESTION) { } elseif ($cmd == Delivery::SUGGESTION) {
$suggest = DI::fsuggest()->getById($target_id); $suggest = DI::fsuggest()->getById($target_id);
if (empty($suggest)) {
return;
}
$uid = $suggest->uid; $uid = $suggest->uid;
$recipients[] = $suggest->cid; $recipients[] = $suggest->cid;
} elseif ($cmd == Delivery::REMOVAL) { } elseif ($cmd == Delivery::REMOVAL) {