X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fenotify.php;h=cfc03626f585459fa4d121f4bb4a3144fe333537;hb=85e36abb5f4acf3de263db80f301c5c63e00c62a;hp=c3943e5f6dae19bb1da335e2c045c58381723c2b;hpb=f5f8ea87153dad42c36340878fa5df18f361687a;p=friendica.git

diff --git a/include/enotify.php b/include/enotify.php
index c3943e5f6d..cfc03626f5 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -20,6 +20,7 @@
  */
 
 use Friendica\Content\Text\BBCode;
+use Friendica\Content\Text\Plaintext;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
@@ -28,11 +29,9 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
-use Friendica\Model\ItemContent;
-use Friendica\Model\Notify;
+use Friendica\Model\Notification;
 use Friendica\Model\Post;
 use Friendica\Model\User;
-use Friendica\Model\UserItem;
 use Friendica\Protocol\Activity;
 
 /**
@@ -42,7 +41,7 @@ use Friendica\Protocol\Activity;
  *                      type, event, otype, activity, verb, uid, cid, origin_cid, item, link,
  *                      source_name, source_mail, source_nick, source_link, source_photo,
  *                      show_in_notification_page
- * 
+ *
  * @return bool
  * @throws \Friendica\Network\HTTPException\InternalServerErrorException
  */
@@ -132,7 +131,7 @@ function notification($params)
 	$hsitelink = '';
 	$itemlink  = '';
 
-	if ($params['type'] == Notify\Type::MAIL) {
+	if ($params['type'] == Notification\Type::MAIL) {
 		$itemlink = $params['link'];
 
 		$subject = $l10n->t('%s New mail received at %s', $subjectPrefix, $sitename);
@@ -148,17 +147,16 @@ function notification($params)
 		$show_in_notification_page = false;
 	}
 
-	if ($params['type'] == Notify\Type::COMMENT || $params['type'] == Notify\Type::TAG_SELF) {
-		$thread = Item::selectFirstThreadForUser($params['uid'], ['ignored'], ['iid' => $parent_id, 'deleted' => false]);
-		if (DBA::isResult($thread) && $thread['ignored']) {
-			Logger::log('Thread ' . $parent_id . ' will be ignored', Logger::DEBUG);
+	if ($params['type'] == Notification\Type::COMMENT || $params['type'] == Notification\Type::TAG_SELF) {
+		if (Post\ThreadUser::getIgnored($parent_uri_id, $params['uid'])) {
+			Logger::info('Thread is ignored', ['parent' => $parent_id, 'parent-uri-id' => $parent_uri_id]);
 			return false;
 		}
 
 		// Check to see if there was already a tag notify or comment notify for this post.
 		// If so don't create a second notification
 		/// @todo In the future we should store the notification with the highest "value" and replace notifications
-		$condition = ['type' => [Notify\Type::TAG_SELF, Notify\Type::COMMENT, Notify\Type::SHARE],
+		$condition = ['type' => [Notification\Type::TAG_SELF, Notification\Type::COMMENT, Notification\Type::SHARE],
 			'link' => $params['link'], 'uid' => $params['uid']];
 		if (DBA::exists('notify', $condition)) {
 			return false;
@@ -166,7 +164,7 @@ function notification($params)
 
 		// if it's a post figure out who's post it is.
 		$item = null;
-		if ($params['otype'] === Notify\ObjectType::ITEM && $parent_id) {
+		if ($params['otype'] === Notification\ObjectType::ITEM && $parent_id) {
 			$item = Post::selectFirstForUser($params['uid'], Item::ITEM_FIELDLIST, ['id' => $parent_id, 'deleted' => false]);
 		}
 
@@ -174,9 +172,9 @@ function notification($params)
 			return false;
 		}
 
-		$item_post_type = Item::postType($item);
+		$item_post_type = Item::postType($item, $l10n);
 
-		$content = ItemContent::getPlaintextPost($item, 70);
+		$content = Plaintext::getPost($item, 70);
 		if (!empty($content['text'])) {
 			$title = '"' . trim(str_replace("\n", " ", $content['text'])) . '"';
 		} else {
@@ -186,9 +184,9 @@ function notification($params)
 		// First go for the general message
 
 		// "George Bull's post"
-		if ($params['activity']['origin_comment']) {
+		if (!empty($params['activity']['origin_comment'])) {
 			$message = $l10n->t('%1$s replied to you on %2$s\'s %3$s %4$s');
-		} elseif ($params['activity']['explicit_tagged']) {
+		} elseif (!empty($params['activity']['explicit_tagged'])) {
 			$message = $l10n->t('%1$s tagged you on %2$s\'s %3$s %4$s');
 		} else {
 			$message = $l10n->t('%1$s commented on %2$s\'s %3$s %4$s');
@@ -199,10 +197,10 @@ function notification($params)
 		// Then look for the special cases
 
 		// "your post"
-		if ($params['activity']['origin_thread']) {
-			if ($params['activity']['origin_comment']) {
+		if (!empty($params['activity']['origin_thread'])) {
+			if (!empty($params['activity']['origin_comment'])) {
 				$message = $l10n->t('%1$s replied to you on your %2$s %3$s');
-			} elseif ($params['activity']['explicit_tagged']) {
+			} elseif (!empty($params['activity']['explicit_tagged'])) {
 				$message = $l10n->t('%1$s tagged you on your %2$s %3$s');
 			} else {
 				$message = $l10n->t('%1$s commented on your %2$s %3$s');
@@ -211,9 +209,9 @@ function notification($params)
 			$dest_str = sprintf($message, $params['source_name'], $item_post_type, $title);
 		// "their post"
 		} elseif ($item['author-link'] == $params['source_link']) {
-			if ($params['activity']['origin_comment']) {
+			if (!empty($params['activity']['origin_comment'])) {
 				$message = $l10n->t('%1$s replied to you on their %2$s %3$s');
-			} elseif ($params['activity']['explicit_tagged']) {
+			} elseif (!empty($params['activity']['explicit_tagged'])) {
 				$message = $l10n->t('%1$s tagged you on their %2$s %3$s');
 			} else {
 				$message = $l10n->t('%1$s commented on their %2$s %3$s');
@@ -226,7 +224,7 @@ function notification($params)
 		// So, we cannot have different subjects for notifications of the same thread.
 		// Before this we have the name of the replier on the subject rendering
 		// different subjects for messages on the same thread.
-		if ($params['activity']['explicit_tagged']) {
+		if (!empty($params['activity']['explicit_tagged'])) {
 			$subject = $l10n->t('%s %s tagged you', $subjectPrefix, $params['source_name']);
 
 			$preamble = $l10n->t('%1$s tagged you at %2$s', $params['source_name'], $sitename);
@@ -244,7 +242,7 @@ function notification($params)
 		$itemlink =  $params['link'];
 	}
 
-	if ($params['type'] == Notify\Type::WALL) {
+	if ($params['type'] == Notification\Type::WALL) {
 		$subject = $l10n->t('%s %s posted to your profile wall', $subjectPrefix, $params['source_name']);
 
 		$preamble = $l10n->t('%1$s posted to your profile wall at %2$s', $params['source_name'], $sitename);
@@ -259,7 +257,7 @@ function notification($params)
 		$itemlink =  $params['link'];
 	}
 
-	if ($params['type'] == Notify\Type::SHARE) {
+	if ($params['type'] == Notification\Type::SHARE) {
 		if ($params['origin_link'] == $params['source_link']) {
 			$subject = $l10n->t('%s %s shared a new post', $subjectPrefix, $params['source_name']);
 
@@ -275,7 +273,7 @@ function notification($params)
 			$epreamble = $l10n->t('%1$s [url=%2$s]shared a post[/url] from %3$s.',
 				'[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
 				$params['link'], '[url='.$params['origin_link'].']'.$params['origin_name'].'[/url]'
-			);			
+			);
 		}
 
 		$sitelink = $l10n->t('Please visit %s to view and/or reply to the conversation.');
@@ -284,7 +282,7 @@ function notification($params)
 		$itemlink =  $params['link'];
 	}
 
-	if ($params['type'] == Notify\Type::POKE) {
+	if ($params['type'] == Notification\Type::POKE) {
 		$subject = $l10n->t('%1$s %2$s poked you', $subjectPrefix, $params['source_name']);
 
 		$preamble = $l10n->t('%1$s poked you at %2$s', $params['source_name'], $sitename);
@@ -303,7 +301,7 @@ function notification($params)
 		$itemlink =  $params['link'];
 	}
 
-	if ($params['type'] == Notify\Type::TAG_SHARE) {
+	if ($params['type'] == Notification\Type::TAG_SHARE) {
 		$itemlink =  $params['link'];
 		$subject = $l10n->t('%s %s tagged your post', $subjectPrefix, $params['source_name']);
 
@@ -318,7 +316,7 @@ function notification($params)
 		$hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'">'.$sitename.'</a>');
 	}
 
-	if ($params['type'] == Notify\Type::INTRO) {
+	if ($params['type'] == Notification\Type::INTRO) {
 		$itemlink = $params['link'];
 		$subject = $l10n->t('%s Introduction received', $subjectPrefix);
 
@@ -361,7 +359,7 @@ function notification($params)
 		}
 	}
 
-	if ($params['type'] == Notify\Type::SUGGEST) {
+	if ($params['type'] == Notification\Type::SUGGEST) {
 		$itemlink =  $params['link'];
 		$subject = $l10n->t('%s Friend suggestion received', $subjectPrefix);
 
@@ -381,7 +379,7 @@ function notification($params)
 		$hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'">'.$sitename.'</a>');
 	}
 
-	if ($params['type'] == Notify\Type::CONFIRM) {
+	if ($params['type'] == Notification\Type::CONFIRM) {
 		if ($params['verb'] == Activity::FRIEND) { // mutual connection
 			$itemlink =  $params['link'];
 			$subject = $l10n->t('%s Connection accepted', $subjectPrefix);
@@ -417,7 +415,7 @@ function notification($params)
 		}
 	}
 
-	if ($params['type'] == Notify\Type::SYSTEM) {
+	if ($params['type'] == Notification\Type::SYSTEM) {
 		switch($params['event']) {
 			case "SYSTEM_REGISTER_REQUEST":
 				$itemlink =  $params['link'];
@@ -476,7 +474,7 @@ function notification($params)
 	if ($show_in_notification_page) {
 		$fields = [
 			'name'          => $params['source_name'] ?? '',
-			'name_cache'    => substr(strip_tags(BBCode::convert($params['source_name'])), 0, 255),
+			'name_cache'    => substr(strip_tags(BBCode::convertForUriId($uri_id, $params['source_name'])), 0, 255),
 			'url'           => $params['source_link'] ?? '',
 			'photo'         => $params['source_photo'] ?? '',
 			'link'          => $itemlink ?? '',
@@ -514,7 +512,7 @@ function notification($params)
 
 	// send email notification if notification preferences permit
 	if ((intval($params['notify_flags']) & intval($params['type']))
-		|| $params['type'] == Notify\Type::SYSTEM) {
+		|| $params['type'] == Notification\Type::SYSTEM) {
 
 		Logger::log('sending notification email');
 
@@ -523,11 +521,10 @@ function notification($params)
 			$message_id = "<" . $parent['guid'] . "@" . gethostname() . ">";
 
 			// Is this the first email notification for this parent item and user?
-			if (!DBA::exists('notify-threads', ['master-parent-item' => $params['parent'], 'receiver-uid' => $params['uid']])) {
+			if (!DBA::exists('notify-threads', ['master-parent-uri-id' => $parent_uri_id, 'receiver-uid' => $params['uid']])) {
 				Logger::log("notify_id:" . intval($notify_id) . ", parent: " . intval($params['parent']) . "uid: " . intval($params['uid']), Logger::DEBUG);
 
-				$fields = ['notify-id' => $notify_id, 'master-parent-item' => $params['parent'],
-					'master-parent-uri-id' => $parent_uri_id,
+				$fields = ['notify-id' => $notify_id, 'master-parent-uri-id' => $parent_uri_id,
 					'receiver-uid' => $params['uid'], 'parent-item' => 0];
 				DBA::insert('notify-threads', $fields);
 
@@ -593,60 +590,72 @@ function notification($params)
 /**
  * Checks for users who should be notified
  *
- * @param int $itemid ID of the item for which the check should be done
+ * @param int $uri_id URI ID of the item for which the check should be done
+ * @param int $uid    User ID of the item
  * @throws \Friendica\Network\HTTPException\InternalServerErrorException
  */
-function check_user_notification($itemid) {
-	// fetch all users with notifications
-	$useritems = DBA::select('user-item', ['uid', 'notification-type'], ['iid' => $itemid]);
-	while ($useritem = DBA::fetch($useritems)) {
-		check_item_notification($itemid, $useritem['uid'], $useritem['notification-type']);
+function check_user_notification(int $uri_id, int $uid) {
+	$condition = ['uri-id' => $uri_id];
+
+	// fetch all users with notifications on public posts
+	if ($uid != 0) {
+		$condition['uid'] = $uid;
+	}
+
+	$usernotifications = DBA::select('post-user-notification', ['uri-id', 'uid', 'notification-type'], $condition);
+	while ($usernotification = DBA::fetch($usernotifications)) {
+		check_item_notification($usernotification['uri-id'], $usernotification['uid'], $usernotification['notification-type'], $uid);
 	}
-	DBA::close($useritems);
+	DBA::close($usernotifications);
 }
 
 /**
  * Checks for item related notifications and sends them
  *
- * @param int    $itemid            ID of the item for which the check should be done
+ * @param int    $uri_id            URI ID of the item for which the check should be done
  * @param int    $uid               User ID
  * @param int    $notification_type Notification bits
  * @return bool
  * @throws \Friendica\Network\HTTPException\InternalServerErrorException
  */
-function check_item_notification($itemid, $uid, $notification_type) {
+function check_item_notification(int $uri_id, int $uid, int $notification_type, $post_uid) {
 	$fields = ['id', 'uri-id', 'mention', 'parent', 'parent-uri-id', 'thr-parent-id',
 		'title', 'body', 'author-link', 'author-name', 'author-avatar', 'author-id',
 		'gravity', 'guid', 'parent-uri', 'uri', 'contact-id', 'network'];
-	$condition = ['id' => $itemid, 'deleted' => false];
+	$condition = ['uri-id' => $uri_id, 'uid' => [$uid, $post_uid], 'deleted' => false];
 	$item = Post::selectFirstForUser($uid, $fields, $condition);
 	if (!DBA::isResult($item)) {
 		return false;
 	}
 
+	if (!DI::pConfig()->get(local_user(), 'system', 'notify_ignored', true) && Contact\User::isIgnored($item['author-id'], $uid)) {
+		Logger::info('Author is ignored, dropping notification', ['cid' => $item['author-id'], 'uid' =>  $uid]);
+		return false;
+	}
+
 	// Generate the notification array
 	$params = [];
-	$params['otype'] = Notify\ObjectType::ITEM;
+	$params['otype'] = Notification\ObjectType::ITEM;
 	$params['uid'] = $uid;
 	$params['origin_cid'] = $params['cid'] = $item['author-id'];
 	$params['item'] = $item;
 	$params['link'] = DI::baseUrl() . '/display/' . urlencode($item['guid']);
 
 	// Set the activity flags
-	$params['activity']['explicit_tagged'] = ($notification_type & UserItem::NOTIF_EXPLICIT_TAGGED);
-	$params['activity']['implicit_tagged'] = ($notification_type & UserItem::NOTIF_IMPLICIT_TAGGED);
-	$params['activity']['origin_comment'] = ($notification_type & UserItem::NOTIF_DIRECT_COMMENT);
-	$params['activity']['origin_thread'] = ($notification_type & UserItem::NOTIF_THREAD_COMMENT);
-	$params['activity']['thread_comment'] = ($notification_type & UserItem::NOTIF_COMMENT_PARTICIPATION);
-	$params['activity']['thread_activity'] = ($notification_type & UserItem::NOTIF_ACTIVITY_PARTICIPATION);
+	$params['activity']['explicit_tagged'] = ($notification_type & Post\UserNotification::NOTIF_EXPLICIT_TAGGED);
+	$params['activity']['implicit_tagged'] = ($notification_type & Post\UserNotification::NOTIF_IMPLICIT_TAGGED);
+	$params['activity']['origin_comment'] = ($notification_type & Post\UserNotification::NOTIF_DIRECT_COMMENT);
+	$params['activity']['origin_thread'] = ($notification_type & Post\UserNotification::NOTIF_THREAD_COMMENT);
+	$params['activity']['thread_comment'] = ($notification_type & Post\UserNotification::NOTIF_COMMENT_PARTICIPATION);
+	$params['activity']['thread_activity'] = ($notification_type & Post\UserNotification::NOTIF_ACTIVITY_PARTICIPATION);
 
 	// Tagging a user in a direct post (first comment level) means a direct comment
-	if ($params['activity']['explicit_tagged'] && ($notification_type & UserItem::NOTIF_DIRECT_THREAD_COMMENT)) {
+	if ($params['activity']['explicit_tagged'] && ($notification_type & Post\UserNotification::NOTIF_DIRECT_THREAD_COMMENT)) {
 		$params['activity']['origin_comment'] = true;
 	}
 
-	if ($notification_type & UserItem::NOTIF_SHARED) {
-		$params['type'] = Notify\Type::SHARE;
+	if ($notification_type & Post\UserNotification::NOTIF_SHARED) {
+		$params['type'] = Notification\Type::SHARE;
 		$params['verb'] = Activity::POST;
 
 		// Special treatment for posts that had been shared via "announce"
@@ -662,23 +671,23 @@ function check_item_notification($itemid, $uid, $notification_type) {
 				$params['item'] = $parent_item;
 			}
 		}
-	} elseif ($notification_type & UserItem::NOTIF_EXPLICIT_TAGGED) {
-		$params['type'] = Notify\Type::TAG_SELF;
+	} elseif ($notification_type & Post\UserNotification::NOTIF_EXPLICIT_TAGGED) {
+		$params['type'] = Notification\Type::TAG_SELF;
 		$params['verb'] = Activity::TAG;
-	} elseif ($notification_type & UserItem::NOTIF_IMPLICIT_TAGGED) {
-		$params['type'] = Notify\Type::COMMENT;
+	} elseif ($notification_type & Post\UserNotification::NOTIF_IMPLICIT_TAGGED) {
+		$params['type'] = Notification\Type::COMMENT;
 		$params['verb'] = Activity::POST;
-	} elseif ($notification_type & UserItem::NOTIF_THREAD_COMMENT) {
-		$params['type'] = Notify\Type::COMMENT;
+	} elseif ($notification_type & Post\UserNotification::NOTIF_THREAD_COMMENT) {
+		$params['type'] = Notification\Type::COMMENT;
 		$params['verb'] = Activity::POST;
-	} elseif ($notification_type & UserItem::NOTIF_DIRECT_COMMENT) {
-		$params['type'] = Notify\Type::COMMENT;
+	} elseif ($notification_type & Post\UserNotification::NOTIF_DIRECT_COMMENT) {
+		$params['type'] = Notification\Type::COMMENT;
 		$params['verb'] = Activity::POST;
-	} elseif ($notification_type & UserItem::NOTIF_COMMENT_PARTICIPATION) {
-		$params['type'] = Notify\Type::COMMENT;
+	} elseif ($notification_type & Post\UserNotification::NOTIF_COMMENT_PARTICIPATION) {
+		$params['type'] = Notification\Type::COMMENT;
 		$params['verb'] = Activity::POST;
-	} elseif ($notification_type & UserItem::NOTIF_ACTIVITY_PARTICIPATION) {
-		$params['type'] = Notify\Type::COMMENT;
+	} elseif ($notification_type & Post\UserNotification::NOTIF_ACTIVITY_PARTICIPATION) {
+		$params['type'] = Notification\Type::COMMENT;
 		$params['verb'] = Activity::POST;
 	} else {
 		return false;