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

Don't create empty announce notifications

Browse source
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
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;
}
if (self::checkExplicitMention($item, $profiles)) {
if (($item['verb'] != Activity::ANNOUNCE) && self::checkExplicitMention($item, $profiles)) {
$notification_type = $notification_type | self::TYPE_EXPLICIT_TAGGED;
if (!$notified) {
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;
if (!$notified) {
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;
if (!$notified) {
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;
if (!$notified) {
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;
if (!$notified) {
self::insertNotificationByItem(self::TYPE_ACTIVITY_PARTICIPATION, $uid, $item);