Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-27 06:30:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Avoid empty notifications / fixed link to the content

Browse source
This commit is contained in:
Michael 2022-03-19 15:25:00 +00:00
parent 4329f5381b
commit fb6a435a6a
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Navigation/Notifications/Repository/Notification.php
View file

@ -27,6 +27,7 @@ use Friendica\BaseRepository;
use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
use Friendica\Database\Database;
use Friendica\Database\DBA;
use Friendica\Model\Post\UserNotification;
use Friendica\Model\Verb;
use Friendica\Navigation\Notifications\Collection;
use Friendica\Navigation\Notifications\Entity;
@ -137,7 +138,8 @@ class Notification extends BaseRepository
*/
public function selectDigestForUser(int $uid): Collection\Notifications
{
$values = [$uid];
$values = [$uid, Verb::getID(\Friendica\Protocol\Activity::ANNOUNCE),
UserNotification::TYPE_COMMENT_PARTICIPATION, UserNotification::TYPE_ACTIVITY_PARTICIPATION, UserNotification::TYPE_THREAD_COMMENT];
$like_condition = '';
if (!$this->pconfig->get($uid, 'system', 'notify_like')) {
@ -154,10 +156,10 @@ class Notification extends BaseRepository
$rows = $this->db->p("
SELECT notification.*
FROM notification
WHERE id IN (
WHERE `id` IN (
SELECT MAX(`id`)
FROM notification
WHERE uid = ?
FROM `notification`
WHERE `uid` = ? AND NOT (`vid` = ? AND `type` IN (?, ?, ?))
$like_condition
$announce_condition
GROUP BY IFNULL(`parent-uri-id`, `actor-id`)