X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FUserItem.php;h=b7dfec4b1228afaa4dfe722f36b0a28ad1fe8183;hb=93380b8471164a8ed5d1d46e94d53bf37fe87cee;hp=afb13829df9bc18cd1a5ff2defe0705a93f99aec;hpb=dc42dbb68a50fb2c60f439393eb6d1fe80b327cf;p=friendica.git

diff --git a/src/Model/UserItem.php b/src/Model/UserItem.php
index afb13829df..b7dfec4b12 100644
--- a/src/Model/UserItem.php
+++ b/src/Model/UserItem.php
@@ -27,6 +27,7 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Util\Strings;
 use Friendica\Model\Tag;
+use Friendica\Protocol\Activity;
 
 class UserItem
 {
@@ -50,20 +51,38 @@ class UserItem
 	 */
 	public static function setNotification(int $iid)
 	{
-		$fields = ['id', 'uri-id', 'uid', 'body', 'parent', 'gravity', 'tag', 'contact-id', 'thr-parent', 'parent-uri', 'author-id'];
+		$fields = ['id', 'uri-id', 'parent-uri-id', 'uid', 'body', 'parent', 'gravity', 'tag',
+			'private', 'contact-id', 'thr-parent', 'parent-uri', 'author-id', 'verb'];
 		$item = Item::selectFirst($fields, ['id' => $iid, 'origin' => false]);
 		if (!DBA::isResult($item)) {
 			return;
 		}
 
-		// fetch all users in the thread
+		// "Activity::FOLLOW" is an automated activity, so we ignore it here
+		if ($item['verb'] == Activity::FOLLOW) {
+			return;
+		}
+
+		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);
 		while ($user = DBA::fetch($users)) {
-			self::setNotificationForUser($item, $user['uid']);
+			$uids[] = $user['uid'];
 		}
 		DBA::close($users);
+
+		foreach (array_unique($uids) as $uid) {
+			self::setNotificationForUser($item, $uid);
+		}
 	}
 
 	/**
@@ -100,32 +119,35 @@ class UserItem
 			return;
 		}
 
-		if (self::checkImplicitMention($item, $profiles)) {
-			$notification_type = $notification_type | self::NOTIF_IMPLICIT_TAGGED;
-		}
+		// Only create notifications for posts and comments, not for activities
+		if (in_array($item['gravity'], [GRAVITY_PARENT, GRAVITY_COMMENT])) {
+			if (self::checkImplicitMention($item, $profiles)) {
+				$notification_type = $notification_type | self::NOTIF_IMPLICIT_TAGGED;
+			}
 
-		if (self::checkExplicitMention($item, $profiles)) {
-			$notification_type = $notification_type | self::NOTIF_EXPLICIT_TAGGED;
-		}
+			if (self::checkExplicitMention($item, $profiles)) {
+				$notification_type = $notification_type | self::NOTIF_EXPLICIT_TAGGED;
+			}
 
-		if (self::checkCommentedThread($item, $contacts)) {
-			$notification_type = $notification_type | self::NOTIF_THREAD_COMMENT;
-		}
+			if (self::checkCommentedThread($item, $contacts)) {
+				$notification_type = $notification_type | self::NOTIF_THREAD_COMMENT;
+			}
 
-		if (self::checkDirectComment($item, $contacts)) {
-			$notification_type = $notification_type | self::NOTIF_DIRECT_COMMENT;
-		}
+			if (self::checkDirectComment($item, $contacts)) {
+				$notification_type = $notification_type | self::NOTIF_DIRECT_COMMENT;
+			}
 
-		if (self::checkDirectCommentedThread($item, $contacts)) {
-			$notification_type = $notification_type | self::NOTIF_DIRECT_THREAD_COMMENT;
-		}
+			if (self::checkDirectCommentedThread($item, $contacts)) {
+				$notification_type = $notification_type | self::NOTIF_DIRECT_THREAD_COMMENT;
+			}
 
-		if (self::checkCommentedParticipation($item, $contacts)) {
-			$notification_type = $notification_type | self::NOTIF_COMMENT_PARTICIPATION;
-		}
+			if (self::checkCommentedParticipation($item, $contacts)) {
+				$notification_type = $notification_type | self::NOTIF_COMMENT_PARTICIPATION;
+			}
 
-		if (self::checkActivityParticipation($item, $contacts)) {
-			$notification_type = $notification_type | self::NOTIF_ACTIVITY_PARTICIPATION;
+			if (self::checkActivityParticipation($item, $contacts)) {
+				$notification_type = $notification_type | self::NOTIF_ACTIVITY_PARTICIPATION;
+			}
 		}
 
 		if (empty($notification_type)) {
@@ -197,16 +219,22 @@ class UserItem
 	 */
 	private static function checkShared(array $item, int $uid)
 	{
-		if ($item['gravity'] != GRAVITY_PARENT) {
+		// Only check on original posts and reshare ("announce") activities, otherwise return
+		if (($item['gravity'] != GRAVITY_PARENT) && ($item['verb'] != Activity::ANNOUNCE)) {
 			return false;
 		}
 
-		// Either the contact had posted something directly
+		// Check if the contact posted or shared something directly
 		if (DBA::exists('contact', ['id' => $item['contact-id'], 'notify_new_posts' => true])) {
 			return true;
 		}
 
-		// Or the contact is a mentioned forum
+		// The following check doesn't make sense on activities, so quit here
+		if ($item['verb'] == Activity::ANNOUNCE) {
+			return false;
+		}
+
+		// Check if the contact is a mentioned forum
 		$tags = DBA::select('tag-view', ['url'], ['uri-id' => $item['uri-id'], 'type' => [Tag::MENTION, Tag::EXCLUSIVE_MENTION]]);
 		while ($tag = DBA::fetch($tags)) {
 			$condition = ['nurl' => Strings::normaliseLink($tag['url']), 'uid' => $uid, 'notify_new_posts' => true, 'contact-type' => Contact::TYPE_COMMUNITY];