X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FPost%2FUserNotification.php;h=dd0bbbe1ecf0249379cfe585cbe089311e7e0978;hb=5f6503a73fabbd65b9ddb1de430b73f472c53dfe;hp=d872d5c41cbf95395aeeb0eb2281d22b7d93634f;hpb=23f31883f5ad8eeb115ce4d0117fc3b9a9ae2d5a;p=friendica.git

diff --git a/src/Model/Post/UserNotification.php b/src/Model/Post/UserNotification.php
index d872d5c41c..dd0bbbe1ec 100644
--- a/src/Model/Post/UserNotification.php
+++ b/src/Model/Post/UserNotification.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -27,7 +27,6 @@ use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
-use Friendica\Database\DBStructure;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
@@ -52,6 +51,7 @@ class UserNotification
 	const TYPE_DIRECT_THREAD_COMMENT  = 64;
 	const TYPE_SHARED                 = 128;
 	const TYPE_FOLLOW                 = 256;
+	const TYPE_QUOTED                 = 512;
 
 	/**
 	 * Insert a new user notification entry
@@ -133,12 +133,18 @@ class UserNotification
 	public static function setNotification(int $uri_id, int $uid)
 	{
 		$fields = ['id', 'uri-id', 'parent-uri-id', 'uid', 'body', 'parent', 'gravity', 'vid', 'gravity',
-		           'private', 'contact-id', 'thr-parent', 'thr-parent-id', 'parent-uri-id', 'parent-uri', 'author-id', 'verb'];
+			'contact-id', 'author-id', 'owner-id', 'causer-id', 
+			'private', 'thr-parent', 'thr-parent-id', 'parent-uri-id', 'parent-uri', 'verb'];
 		$item   = Post::selectFirst($fields, ['uri-id' => $uri_id, 'uid' => $uid, 'origin' => false]);
 		if (!DBA::isResult($item)) {
 			return;
 		}
 
+		$parent = Post::selectFirstPost(['author-id', 'owner-id', 'causer-id'], ['uri-id' => $item['parent-uri-id']]);
+		if (!DBA::isResult($parent)) {
+			return;
+		}
+
 		// "Activity::FOLLOW" is an automated activity, so we ignore it here
 		if ($item['verb'] == Activity::FOLLOW) {
 			return;
@@ -161,23 +167,34 @@ class UserNotification
 		DBA::close($users);
 
 		foreach (array_unique($uids) as $uid) {
-			self::setNotificationForUser($item, $uid);
+			self::setNotificationForUser($item, $parent, $uid);
 		}
 	}
 
 	/**
 	 * Checks an item for notifications for the given user and sets the "notification-type" field
 	 *
-	 * @param array $item Item array
-	 * @param int   $uid  User ID
+	 * @param array $item   Item array
+	 * @param array $parent Parent item array
+	 * @param int   $uid    User ID
 	 * @throws HTTPException\InternalServerErrorException
 	 */
-	private static function setNotificationForUser(array $item, int $uid)
+	private static function setNotificationForUser(array $item, array $parent, int $uid)
 	{
 		if (Post\ThreadUser::getIgnored($item['parent-uri-id'], $uid)) {
 			return;
 		}
 
+		foreach (array_unique([$parent['author-id'], $parent['owner-id'], $parent['causer-id'], $item['author-id'], $item['owner-id'], $item['causer-id']]) as $author_id) {
+			if (empty($author_id)) {
+				continue;
+			}
+			if (Contact\User::isBlocked($author_id, $uid) || Contact\User::isIgnored($author_id, $uid) || Contact\User::isCollapsed($author_id, $uid)) {
+				Logger::debug('Author is blocked/ignored/collapsed by user', ['uid' => $uid, 'author' => $author_id, 'uri-id' => $item['uri-id']]);
+				return;
+			}
+		}
+
 		$user = User::getById($uid, ['account-type', 'account_removed', 'account_expired']);
 		if (in_array($user['account-type'], [User::ACCOUNT_TYPE_COMMUNITY, User::ACCOUNT_TYPE_RELAY])) {
 			return;
@@ -273,6 +290,14 @@ class UserNotification
 			}
 		}
 
+		if (($item['verb'] != Activity::ANNOUNCE) && self::checkQuoted($item, $contacts)) {
+			$notification_type = $notification_type | self::TYPE_QUOTED;
+			if (!$notified) {
+				self::insertNotificationByItem(self::TYPE_QUOTED, $uid, $item);
+				$notified = true;
+			}
+		}
+
 		if (($item['verb'] != Activity::ANNOUNCE) && self::checkFollowParticipation($item, $contacts)) {
 			$notification_type = $notification_type | self::TYPE_FOLLOW;
 			if (!$notified) {
@@ -581,4 +606,23 @@ class UserNotification
 		$condition = ['parent' => $item['parent'], 'author-id' => $contacts, 'deleted' => false, 'gravity' => Item::GRAVITY_ACTIVITY];
 		return Post::exists($condition);
 	}
+
+	/**
+	 * Check for a quoted post of a post of the given user
+	 *
+	 * @param array $item
+	 * @param array $contacts Array of contact IDs
+	 * @return bool The item is a quoted post of a user's post or comment
+	 * @throws Exception
+	 */
+	private static function checkQuoted(array $item, array $contacts): bool
+	{
+		if (empty($item['quote-uri-id'])) {
+			return false;
+		}
+		$condition = ['uri-id' => $item['quote-uri-id'], 'uid' => $item['uid'], 'author-id' => $contacts, 'deleted' => false, 'gravity' => [item::GRAVITY_PARENT, Item::GRAVITY_COMMENT]];
+		return Post::exists($condition);
+	}
+
+
 }