use Friendica\Model\Subscription;
use Friendica\Model\Tag;
use Friendica\Model\User;
-use Friendica\Navigation\Notifications;
use Friendica\Network\HTTPException;
use Friendica\Protocol\Activity;
use Friendica\Util\Strings;
const TYPE_ACTIVITY_PARTICIPATION = 32;
const TYPE_DIRECT_THREAD_COMMENT = 64;
const TYPE_SHARED = 128;
+ const TYPE_FOLLOW = 256;
/**
* Insert a new user notification entry
$notification_type = $notification_type | self::TYPE_SHARED;
self::insertNotificationByItem(self::TYPE_SHARED, $uid, $item);
$notified = true;
+ } elseif ($author['contact-type'] == Contact::TYPE_COMMUNITY) {
+ return;
} else {
$notified = false;
}
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);
}
}
- 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);
}
}
- 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);
}
}
- 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);
}
}
- if (self::checkActivityParticipation($item, $contacts)) {
+ if (($item['verb'] != Activity::ANNOUNCE) && self::checkFollowParticipation($item, $contacts)) {
+ $notification_type = $notification_type | self::TYPE_FOLLOW;
+ if (!$notified) {
+ self::insertNotificationByItem(self::TYPE_FOLLOW, $uid, $item);
+ $notified = true;
+ }
+ }
+
+ 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);
return;
}
- $notification = (new Notifications\Factory\Notification(DI::logger()))->createForUser(
+ $notification = DI::notificationFactory()->createForUser(
$uid,
$item['vid'],
$type,
/**
* Add a notification entry
*
- * @param int $actor Contact ID of the actor
+ * @param int $actor Public contact ID of the actor
* @param string $verb One of the Activity verb constant values
* @param int $uid User ID
* @return boolean
*/
public static function insertNotification(int $actor, string $verb, int $uid): bool
{
- $notification = (new Notifications\Factory\Notification(DI::logger()))->createForRelationship(
+ $notification = DI::notificationFactory()->createForRelationship(
$uid,
$actor,
$verb
return Post::exists($condition);
}
+ /**
+ * Check if the user follows this thread
+ *
+ * @param array $item
+ * @param array $contacts Array of contact IDs
+ * @return bool The user follows the thread
+ * @throws Exception
+ */
+ private static function checkFollowParticipation(array $item, array $contacts): bool
+ {
+ $condition = ['parent' => $item['parent'], 'author-id' => $contacts, 'deleted' => false, 'gravity' => GRAVITY_ACTIVITY, 'verb' => Activity::FOLLOW];
+ return Post::exists($condition);
+ }
+
/**
* Check if the user had interacted in this thread (Like, Dislike, ...)
*