Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #9152 from annando/fix-notifications

Browse source 
Fix notifications for wrong users
This commit is contained in:
Tobias Diekershoff 2020-09-07 07:19:10 +02:00 committed by GitHub
commit f997b36085
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/Model/UserItem.php
View file

@ -63,8 +63,15 @@ class UserItem
return;
}
// fetch all users in the thread
$uids = [];
if ($item['uid'] == 0) {
$uids = [];
} else {
// Always include the item user
$uids = [$item['uid']];
}
// Add every user who participated so far in this thread
// This can only happen with participations on global items. (means: uid = 0)
$users = DBA::p("SELECT DISTINCT(`contact`.`uid`) FROM `item`
INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` != 0
WHERE `parent` IN (SELECT `parent` FROM `item` WHERE `id`=?)", $iid);
@ -73,24 +80,6 @@ class UserItem
}
DBA::close($users);
// Add item users
$users = Item::select(['uid'], ["`parent-uri-id` = ? AND `uid` != ?", $item['parent-uri-id'], 0], ['group_by' => ['uid']]);
while ($user = DBA::fetch($users)) {
$uids[] = $user['uid'];
}
DBA::close($users);
// Check for mentions to local users
if (in_array($item['private'], [Item::PUBLIC, Item::UNLISTED])) {
$mentions = Tag::getByURIId($item['uri-id'], [Tag::MENTION, Tag::IMPLICIT_MENTION, Tag::EXCLUSIVE_MENTION]);
foreach ($mentions as $mention) {
$uid = User::getIdForURL($mention['url']);
if (!empty($uid)) {
$uids[] = $uid;
}
}
}
foreach (array_unique($uids) as $uid) {
self::setNotificationForUser($item, $uid);
}