clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't create empty announce notifications

This commit is contained in:
Michael 2022-03-19 17:53:41 +00:00
parent fb6a435a6a
commit 91905bea89
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Model/Post/UserNotification.php
View File

@ -220,7 +220,7 @@ class UserNotification
return; return;
} }
if (self::checkExplicitMention($item, $profiles)) { if (($item['verb'] != Activity::ANNOUNCE) && self::checkExplicitMention($item, $profiles)) {
$notification_type = $notification_type | self::TYPE_EXPLICIT_TAGGED; $notification_type = $notification_type | self::TYPE_EXPLICIT_TAGGED;
if (!$notified) { if (!$notified) {
self::insertNotificationByItem(self::TYPE_EXPLICIT_TAGGED, $uid, $item); self::insertNotificationByItem(self::TYPE_EXPLICIT_TAGGED, $uid, $item);
@ -228,7 +228,7 @@ class UserNotification
} }
} }
if (self::checkImplicitMention($item, $profiles)) { if (($item['verb'] != Activity::ANNOUNCE) && self::checkImplicitMention($item, $profiles)) {
$notification_type = $notification_type | self::TYPE_IMPLICIT_TAGGED; $notification_type = $notification_type | self::TYPE_IMPLICIT_TAGGED;
if (!$notified) { if (!$notified) {
self::insertNotificationByItem(self::TYPE_IMPLICIT_TAGGED, $uid, $item); self::insertNotificationByItem(self::TYPE_IMPLICIT_TAGGED, $uid, $item);
@ -252,7 +252,7 @@ class UserNotification
} }
} }
if (self::checkCommentedThread($item, $contacts)) { if (($item['verb'] != Activity::ANNOUNCE) && self::checkCommentedThread($item, $contacts)) {
$notification_type = $notification_type | self::TYPE_THREAD_COMMENT; $notification_type = $notification_type | self::TYPE_THREAD_COMMENT;
if (!$notified) { if (!$notified) {
self::insertNotificationByItem(self::TYPE_THREAD_COMMENT, $uid, $item); self::insertNotificationByItem(self::TYPE_THREAD_COMMENT, $uid, $item);
@ -260,7 +260,7 @@ class UserNotification
} }
} }
if (self::checkCommentedParticipation($item, $contacts)) { if (($item['verb'] != Activity::ANNOUNCE) && self::checkCommentedParticipation($item, $contacts)) {
$notification_type = $notification_type | self::TYPE_COMMENT_PARTICIPATION; $notification_type = $notification_type | self::TYPE_COMMENT_PARTICIPATION;
if (!$notified) { if (!$notified) {
self::insertNotificationByItem(self::TYPE_COMMENT_PARTICIPATION, $uid, $item); self::insertNotificationByItem(self::TYPE_COMMENT_PARTICIPATION, $uid, $item);
@ -268,7 +268,7 @@ class UserNotification
} }
} }
if (self::checkActivityParticipation($item, $contacts)) { if (($item['verb'] != Activity::ANNOUNCE) && self::checkActivityParticipation($item, $contacts)) {
$notification_type = $notification_type | self::TYPE_ACTIVITY_PARTICIPATION; $notification_type = $notification_type | self::TYPE_ACTIVITY_PARTICIPATION;
if (!$notified) { if (!$notified) {
self::insertNotificationByItem(self::TYPE_ACTIVITY_PARTICIPATION, $uid, $item); self::insertNotificationByItem(self::TYPE_ACTIVITY_PARTICIPATION, $uid, $item);

5
src/Navigation/Notifications/Repository/Notification.php
View File

@ -138,8 +138,7 @@ class Notification extends BaseRepository
*/ */
public function selectDigestForUser(int $uid): Collection\Notifications public function selectDigestForUser(int $uid): Collection\Notifications
{ {
$values = [$uid, Verb::getID(\Friendica\Protocol\Activity::ANNOUNCE), $values = [$uid];
UserNotification::TYPE_COMMENT_PARTICIPATION, UserNotification::TYPE_ACTIVITY_PARTICIPATION, UserNotification::TYPE_THREAD_COMMENT];
$like_condition = ''; $like_condition = '';
if (!$this->pconfig->get($uid, 'system', 'notify_like')) { if (!$this->pconfig->get($uid, 'system', 'notify_like')) {
@ -159,7 +158,7 @@ class Notification extends BaseRepository
WHERE `id` IN ( WHERE `id` IN (
SELECT MAX(`id`) SELECT MAX(`id`)
FROM `notification` FROM `notification`
WHERE `uid` = ? AND NOT (`vid` = ? AND `type` IN (?, ?, ?)) WHERE `uid` = ?
$like_condition $like_condition
$announce_condition $announce_condition
GROUP BY IFNULL(`parent-uri-id`, `actor-id`) GROUP BY IFNULL(`parent-uri-id`, `actor-id`)