keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5603 from annando/fix-notification

Browse source 
Fix: We now are notified again when a new post had been created
This commit is contained in:
Tobias Diekershoff 2018-08-12 07:55:35 +02:00 committed by GitHub
commit f6e58656ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
include/enotify.php
View file

@ -745,8 +745,6 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
$contacts[] = $contact['id']; $contacts[] = $contact['id'];
} }
$contact_list = implode(',', $contacts);
DBA::close($ret); DBA::close($ret);
// Only act if it is a "real" post // Only act if it is a "real" post
@ -813,17 +811,26 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
$params["verb"] = ACTIVITY_TAG; $params["verb"] = ACTIVITY_TAG;
} }
// Is it a post that the user had started or where he interacted? // Is it a post that the user had started?
$fields = ['ignored', 'mention', 'author-id']; $fields = ['ignored', 'mention'];
$thread = Item::selectFirstThreadForUser($params['uid'], $fields, ['iid' => $item["parent"]]); $thread = Item::selectFirstThreadForUser($params['uid'], $fields, ['iid' => $item["parent"]]);
if (($thread['mention'] || in_array($thread['author-id'], $contacts)) && !$thread['ignored'] && !isset($params["type"])) { if ($thread['mention'] && !$thread['ignored'] && !isset($params["type"])) {
$params["type"] = NOTIFY_COMMENT; $params["type"] = NOTIFY_COMMENT;
$params["verb"] = ACTIVITY_POST; $params["verb"] = ACTIVITY_POST;
} }
if (isset($params["type"])) // And now we check for participation of one of our contacts in the thread
$condition = ['parent' => $item["parent"], 'author-id' => $contacts];
if (!$thread['ignored'] && !isset($params["type"]) && Item::exists($condition)) {
$params["type"] = NOTIFY_COMMENT;
$params["verb"] = ACTIVITY_POST;
}
if (isset($params["type"])) {
notification($params); notification($params);
}
} }
/** /**