X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FUserItem.php;h=38e9adc6ea26d451375347d144525b46ebfeebd1;hb=bd9f36622e056c83e8bfef2920640285ce9672b0;hp=3efab41fdaa0116dbcf01383c2c7218eb1885ef7;hpb=8ca92d2022454d128ab374914bf60217f98c681b;p=friendica.git

diff --git a/src/Model/UserItem.php b/src/Model/UserItem.php
index 3efab41fda..38e9adc6ea 100644
--- a/src/Model/UserItem.php
+++ b/src/Model/UserItem.php
@@ -51,8 +51,8 @@ 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', 'verb'];
+		$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;
@@ -63,14 +63,26 @@ class UserItem
 			return;
 		}
 
-		// fetch all users in the thread
+		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);
+		}
 	}
 
 	/**
@@ -144,7 +156,9 @@ class UserItem
 
 		Logger::info('Set notification', ['iid' => $item['id'], 'uid' => $uid, 'notification-type' => $notification_type]);
 
-		DBA::update('user-item', ['notification-type' => $notification_type], ['iid' => $item['id'], 'uid' => $uid], true);
+		$fields = ['notification-type' => $notification_type];
+		Post\User::update($item['uri-id'], $uid, $fields);
+		DBA::update('user-item', $fields, ['iid' => $item['id'], 'uid' => $uid], true);
 	}
 
 	/**