diff --git a/include/enotify.php b/include/enotify.php
index 7eae51a0b5..84b46edc02 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -39,7 +39,7 @@ use Friendica\Protocol\Activity;
* Creates a notification entry and possibly sends a mail
*
* @param array $params Array with the elements:
- * type, event, otype, activity, verb, uid, cid, origin_cid, item, link,
+ * type, event, otype, activity, verb, uid, cid, item, link,
* source_name, source_mail, source_nick, source_link, source_photo,
* show_in_notification_page
*
@@ -87,15 +87,6 @@ function notification($params)
}
}
- if (!empty($params['origin_cid'])) {
- $contact = Contact::getById($params['origin_cid'], ['url', 'name', 'photo']);
- if (DBA::isResult($contact)) {
- $params['origin_link'] = $contact['url'];
- $params['origin_name'] = $contact['name'];
- $params['origin_photo'] = $contact['photo'];
- }
- }
-
$siteurl = DI::baseUrl()->get(true);
$sitename = DI::config()->get('config', 'sitename');
@@ -118,316 +109,234 @@ function notification($params)
$hsitelink = '';
$itemlink = '';
- if ($params['type'] == Notification\Type::MAIL) {
- $itemlink = $params['link'];
+ switch ($params['type']) {
+ case Notification\Type::MAIL:
+ $itemlink = $params['link'];
- $subject = $l10n->t('%s New mail received at %s', $subjectPrefix, $sitename);
+ $subject = $l10n->t('%s New mail received at %s', $subjectPrefix, $sitename);
- $preamble = $l10n->t('%1$s sent you a new private message at %2$s.', $params['source_name'], $sitename);
- $epreamble = $l10n->t('%1$s sent you %2$s.', '[url='.$params['source_link'].']'.$params['source_name'].'[/url]', '[url=' . $itemlink . ']' . $l10n->t('a private message').'[/url]');
+ $preamble = $l10n->t('%1$s sent you a new private message at %2$s.', $params['source_name'], $sitename);
+ $epreamble = $l10n->t('%1$s sent you %2$s.', '[url='.$params['source_link'].']'.$params['source_name'].'[/url]', '[url=' . $itemlink . ']' . $l10n->t('a private message').'[/url]');
- $sitelink = $l10n->t('Please visit %s to view and/or reply to your private messages.');
- $tsitelink = sprintf($sitelink, $itemlink);
- $hsitelink = sprintf($sitelink, '' . $sitename . '');
+ $sitelink = $l10n->t('Please visit %s to view and/or reply to your private messages.');
+ $tsitelink = sprintf($sitelink, $itemlink);
+ $hsitelink = sprintf($sitelink, '' . $sitename . '');
- // Mail notifications aren't using the "notify" table entry
- $show_in_notification_page = false;
- }
+ // Mail notifications aren't using the "notify" table entry
+ $show_in_notification_page = false;
+ break;
- // Check to see if there was already a tag notify or comment notify for this post.
- // If so don't create a second notification
- if (in_array($params['type'], [Notification\Type::TAG_SELF, Notification\Type::COMMENT, Notification\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;
- }
- }
+ case Notification\Type::COMMENT:
+ 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;
+ }
- 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;
- }
-
- // if it's a post figure out who's post it is.
- $item = null;
- if ($params['otype'] === Notification\ObjectType::ITEM && $parent_id) {
$item = Post::selectFirstForUser($params['uid'], Item::ITEM_FIELDLIST, ['id' => $parent_id, 'deleted' => false]);
- }
+ if (empty($item)) {
+ return false;
+ }
- if (empty($item)) {
- return false;
- }
+ $item_post_type = Item::postType($item, $l10n);
- $item_post_type = Item::postType($item, $l10n);
+ $content = Plaintext::getPost($item, 70);
+ if (!empty($content['text'])) {
+ $title = '"' . trim(str_replace("\n", " ", $content['text'])) . '"';
+ } else {
+ $title = '';
+ }
- $content = Plaintext::getPost($item, 70);
- if (!empty($content['text'])) {
- $title = '"' . trim(str_replace("\n", " ", $content['text'])) . '"';
- } else {
- $title = '';
- }
+ // First go for the general message
- // First go for the general message
-
- // "George Bull's post"
- if (!empty($params['activity']['origin_comment'])) {
- $message = $l10n->t('%1$s replied to you on %2$s\'s %3$s %4$s');
- } elseif (!empty($params['activity']['explicit_tagged'])) {
- $message = $l10n->t('%1$s tagged you on %2$s\'s %3$s %4$s');
- } else {
+ // "George Bull's post"
$message = $l10n->t('%1$s commented on %2$s\'s %3$s %4$s');
- }
+ $dest_str = sprintf($message, $params['source_name'], $item['author-name'], $item_post_type, $title);
- $dest_str = sprintf($message, $params['source_name'], $item['author-name'], $item_post_type, $title);
-
- // Then look for the special cases
-
- // "your post"
- 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 (!empty($params['activity']['explicit_tagged'])) {
- $message = $l10n->t('%1$s tagged you on your %2$s %3$s');
- } else {
+ // "your post"
+ if ($item['wall']) {
$message = $l10n->t('%1$s commented on your %2$s %3$s');
- }
-
- $dest_str = sprintf($message, $params['source_name'], $item_post_type, $title);
- // "their post"
- } elseif ($item['author-link'] == $params['source_link']) {
- if (!empty($params['activity']['origin_comment'])) {
- $message = $l10n->t('%1$s replied to you on their %2$s %3$s');
- } elseif (!empty($params['activity']['explicit_tagged'])) {
- $message = $l10n->t('%1$s tagged you on their %2$s %3$s');
- } else {
+ $dest_str = sprintf($message, $params['source_name'], $item_post_type, $title);
+ // "their post"
+ } elseif ($item['author-link'] == $params['source_link']) {
$message = $l10n->t('%1$s commented on their %2$s %3$s');
+ $dest_str = sprintf($message, $params['source_name'], $item_post_type, $title);
}
- $dest_str = sprintf($message, $params['source_name'], $item_post_type, $title);
- }
-
- // Some mail software relies on subject field for threading.
- // 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 (!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);
- } else {
$subject = $l10n->t('%1$s Comment to conversation #%2$d by %3$s', $subjectPrefix, $parent_id, $params['source_name']);
$preamble = $l10n->t('%s commented on an item/conversation you have been following.', $params['source_name']);
- }
- $epreamble = $dest_str;
+ $epreamble = $dest_str;
- $sitelink = $l10n->t('Please visit %s to view and/or reply to the conversation.');
- $tsitelink = sprintf($sitelink, $siteurl);
- $hsitelink = sprintf($sitelink, '' . $sitename . '');
- $itemlink = $params['link'];
- }
+ $sitelink = $l10n->t('Please visit %s to view and/or reply to the conversation.');
+ $tsitelink = sprintf($sitelink, $siteurl);
+ $hsitelink = sprintf($sitelink, '' . $sitename . '');
+ $itemlink = $params['link'];
+ break;
- if ($params['type'] == Notification\Type::WALL) {
- $subject = $l10n->t('%s %s posted to your profile wall', $subjectPrefix, $params['source_name']);
+ case 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);
- $epreamble = $l10n->t('%1$s posted to [url=%2$s]your wall[/url]',
- '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
- $params['link']
- );
-
- $sitelink = $l10n->t('Please visit %s to view and/or reply to the conversation.');
- $tsitelink = sprintf($sitelink, $siteurl);
- $hsitelink = sprintf($sitelink, ''.$sitename.'');
- $itemlink = $params['link'];
- }
-
- 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']);
-
- $preamble = $l10n->t('%1$s shared a new post at %2$s', $params['source_name'], $sitename);
- $epreamble = $l10n->t('%1$s [url=%2$s]shared a post[/url].',
+ $preamble = $l10n->t('%1$s posted to your profile wall at %2$s', $params['source_name'], $sitename);
+ $epreamble = $l10n->t('%1$s posted to [url=%2$s]your wall[/url]',
'[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
$params['link']
);
- } else {
- $subject = $l10n->t('%s %s shared a post from %s', $subjectPrefix, $params['source_name'], $params['origin_name']);
- $preamble = $l10n->t('%1$s shared a post from %2$s at %3$s', $params['source_name'], $params['origin_name'], $sitename);
- $epreamble = $l10n->t('%1$s [url=%2$s]shared a post[/url] from %3$s.',
+ $sitelink = $l10n->t('Please visit %s to view and/or reply to the conversation.');
+ $tsitelink = sprintf($sitelink, $siteurl);
+ $hsitelink = sprintf($sitelink, ''.$sitename.'');
+ $itemlink = $params['link'];
+ break;
+
+ case 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);
+ $epreamble = $l10n->t('%1$s [url=%2$s]poked you[/url].',
'[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
- $params['link'], '[url='.$params['origin_link'].']'.$params['origin_name'].'[/url]'
+ $params['link']
);
- }
- $sitelink = $l10n->t('Please visit %s to view and/or reply to the conversation.');
- $tsitelink = sprintf($sitelink, $siteurl);
- $hsitelink = sprintf($sitelink, ''.$sitename.'');
- $itemlink = $params['link'];
- }
+ $subject = str_replace('poked', $l10n->t($params['activity']), $subject);
+ $preamble = str_replace('poked', $l10n->t($params['activity']), $preamble);
+ $epreamble = str_replace('poked', $l10n->t($params['activity']), $epreamble);
- 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);
- $epreamble = $l10n->t('%1$s [url=%2$s]poked you[/url].',
- '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
- $params['link']
- );
-
- $subject = str_replace('poked', $l10n->t($params['activity']), $subject);
- $preamble = str_replace('poked', $l10n->t($params['activity']), $preamble);
- $epreamble = str_replace('poked', $l10n->t($params['activity']), $epreamble);
-
- $sitelink = $l10n->t('Please visit %s to view and/or reply to the conversation.');
- $tsitelink = sprintf($sitelink, $siteurl);
- $hsitelink = sprintf($sitelink, ''.$sitename.'');
- $itemlink = $params['link'];
- }
-
- if ($params['type'] == Notification\Type::TAG_SHARE) {
- $itemlink = $params['link'];
- $subject = $l10n->t('%s %s tagged your post', $subjectPrefix, $params['source_name']);
-
- $preamble = $l10n->t('%1$s tagged your post at %2$s', $params['source_name'], $sitename);
- $epreamble = $l10n->t('%1$s tagged [url=%2$s]your post[/url]',
- '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
- $itemlink
- );
-
- $sitelink = $l10n->t('Please visit %s to view and/or reply to the conversation.');
- $tsitelink = sprintf($sitelink, $siteurl);
- $hsitelink = sprintf($sitelink, ''.$sitename.'');
- }
-
- if ($params['type'] == Notification\Type::INTRO) {
- $itemlink = $params['link'];
- $subject = $l10n->t('%s Introduction received', $subjectPrefix);
-
- $preamble = $l10n->t('You\'ve received an introduction from \'%1$s\' at %2$s', $params['source_name'], $sitename);
- $epreamble = $l10n->t('You\'ve received [url=%1$s]an introduction[/url] from %2$s.',
- $itemlink,
- '[url='.$params['source_link'].']'.$params['source_name'].'[/url]'
- );
-
- $body = $l10n->t('You may visit their profile at %s', $params['source_link']);
-
- $sitelink = $l10n->t('Please visit %s to approve or reject the introduction.');
- $tsitelink = sprintf($sitelink, $siteurl);
- $hsitelink = sprintf($sitelink, ''.$sitename.'');
-
- switch ($params['verb']) {
- case Activity::FRIEND:
- // someone started to share with user (mostly OStatus)
- $subject = $l10n->t('%s A new person is sharing with you', $subjectPrefix);
-
- $preamble = $l10n->t('%1$s is sharing with you at %2$s', $params['source_name'], $sitename);
- $epreamble = $l10n->t('%1$s is sharing with you at %2$s',
- '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
- $sitename
- );
- break;
- case Activity::FOLLOW:
- // someone started to follow the user (mostly OStatus)
- $subject = $l10n->t('%s You have a new follower', $subjectPrefix);
-
- $preamble = $l10n->t('You have a new follower at %2$s : %1$s', $params['source_name'], $sitename);
- $epreamble = $l10n->t('You have a new follower at %2$s : %1$s',
- '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
- $sitename
- );
- break;
- default:
- // ACTIVITY_REQ_FRIEND is default activity for notifications
- break;
- }
- }
-
- if ($params['type'] == Notification\Type::SUGGEST) {
- $itemlink = $params['link'];
- $subject = $l10n->t('%s Friend suggestion received', $subjectPrefix);
-
- $preamble = $l10n->t('You\'ve received a friend suggestion from \'%1$s\' at %2$s', $params['source_name'], $sitename);
- $epreamble = $l10n->t('You\'ve received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s.',
- $itemlink,
- '[url='.$params['item']['url'].']'.$params['item']['name'].'[/url]',
- '[url='.$params['source_link'].']'.$params['source_name'].'[/url]'
- );
-
- $body = $l10n->t('Name:').' '.$params['item']['name']."\n";
- $body .= $l10n->t('Photo:').' '.$params['item']['photo']."\n";
- $body .= $l10n->t('You may visit their profile at %s', $params['item']['url']);
-
- $sitelink = $l10n->t('Please visit %s to approve or reject the suggestion.');
- $tsitelink = sprintf($sitelink, $siteurl);
- $hsitelink = sprintf($sitelink, ''.$sitename.'');
- }
-
- if ($params['type'] == Notification\Type::CONFIRM) {
- if ($params['verb'] == Activity::FRIEND) { // mutual connection
+ $sitelink = $l10n->t('Please visit %s to view and/or reply to the conversation.');
+ $tsitelink = sprintf($sitelink, $siteurl);
+ $hsitelink = sprintf($sitelink, ''.$sitename.'');
$itemlink = $params['link'];
- $subject = $l10n->t('%s Connection accepted', $subjectPrefix);
+ break;
- $preamble = $l10n->t('\'%1$s\' has accepted your connection request at %2$s', $params['source_name'], $sitename);
- $epreamble = $l10n->t('%2$s has accepted your [url=%1$s]connection request[/url].',
+ case Notification\Type::INTRO:
+ $itemlink = $params['link'];
+ $subject = $l10n->t('%s Introduction received', $subjectPrefix);
+
+ $preamble = $l10n->t('You\'ve received an introduction from \'%1$s\' at %2$s', $params['source_name'], $sitename);
+ $epreamble = $l10n->t('You\'ve received [url=%1$s]an introduction[/url] from %2$s.',
$itemlink,
'[url='.$params['source_link'].']'.$params['source_name'].'[/url]'
);
- $body = $l10n->t('You are now mutual friends and may exchange status updates, photos, and email without restriction.');
+ $body = $l10n->t('You may visit their profile at %s', $params['source_link']);
- $sitelink = $l10n->t('Please visit %s if you wish to make any changes to this relationship.');
+ $sitelink = $l10n->t('Please visit %s to approve or reject the introduction.');
$tsitelink = sprintf($sitelink, $siteurl);
$hsitelink = sprintf($sitelink, ''.$sitename.'');
- } else { // ACTIVITY_FOLLOW
- $itemlink = $params['link'];
- $subject = $l10n->t('%s Connection accepted', $subjectPrefix);
- $preamble = $l10n->t('\'%1$s\' has accepted your connection request at %2$s', $params['source_name'], $sitename);
- $epreamble = $l10n->t('%2$s has accepted your [url=%1$s]connection request[/url].',
+ switch ($params['verb']) {
+ case Activity::FRIEND:
+ // someone started to share with user (mostly OStatus)
+ $subject = $l10n->t('%s A new person is sharing with you', $subjectPrefix);
+
+ $preamble = $l10n->t('%1$s is sharing with you at %2$s', $params['source_name'], $sitename);
+ $epreamble = $l10n->t('%1$s is sharing with you at %2$s',
+ '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
+ $sitename
+ );
+ break;
+ case Activity::FOLLOW:
+ // someone started to follow the user (mostly OStatus)
+ $subject = $l10n->t('%s You have a new follower', $subjectPrefix);
+
+ $preamble = $l10n->t('You have a new follower at %2$s : %1$s', $params['source_name'], $sitename);
+ $epreamble = $l10n->t('You have a new follower at %2$s : %1$s',
+ '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
+ $sitename
+ );
+ break;
+ default:
+ // ACTIVITY_REQ_FRIEND is default activity for notifications
+ break;
+ }
+ break;
+
+ case Notification\Type::SUGGEST:
+ $itemlink = $params['link'];
+ $subject = $l10n->t('%s Friend suggestion received', $subjectPrefix);
+
+ $preamble = $l10n->t('You\'ve received a friend suggestion from \'%1$s\' at %2$s', $params['source_name'], $sitename);
+ $epreamble = $l10n->t('You\'ve received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s.',
$itemlink,
+ '[url='.$params['item']['url'].']'.$params['item']['name'].'[/url]',
'[url='.$params['source_link'].']'.$params['source_name'].'[/url]'
);
- $body = $l10n->t('\'%1$s\' has chosen to accept you a fan, which restricts some forms of communication - such as private messaging and some profile interactions. If this is a celebrity or community page, these settings were applied automatically.', $params['source_name']);
- $body .= "\n\n";
- $body .= $l10n->t('\'%1$s\' may choose to extend this into a two-way or more permissive relationship in the future.', $params['source_name']);
+ $body = $l10n->t('Name:').' '.$params['item']['name']."\n";
+ $body .= $l10n->t('Photo:').' '.$params['item']['photo']."\n";
+ $body .= $l10n->t('You may visit their profile at %s', $params['item']['url']);
- $sitelink = $l10n->t('Please visit %s if you wish to make any changes to this relationship.');
+ $sitelink = $l10n->t('Please visit %s to approve or reject the suggestion.');
$tsitelink = sprintf($sitelink, $siteurl);
$hsitelink = sprintf($sitelink, ''.$sitename.'');
- }
- }
+ break;
- if ($params['type'] == Notification\Type::SYSTEM) {
- switch($params['event']) {
- case "SYSTEM_REGISTER_REQUEST":
+ case Notification\Type::CONFIRM:
+ if ($params['verb'] == Activity::FRIEND) { // mutual connection
$itemlink = $params['link'];
- $subject = $l10n->t('[Friendica System Notify]') . ' ' . $l10n->t('registration request');
+ $subject = $l10n->t('%s Connection accepted', $subjectPrefix);
- $preamble = $l10n->t('You\'ve received a registration request from \'%1$s\' at %2$s', $params['source_name'], $sitename);
- $epreamble = $l10n->t('You\'ve received a [url=%1$s]registration request[/url] from %2$s.',
+ $preamble = $l10n->t('\'%1$s\' has accepted your connection request at %2$s', $params['source_name'], $sitename);
+ $epreamble = $l10n->t('%2$s has accepted your [url=%1$s]connection request[/url].',
$itemlink,
'[url='.$params['source_link'].']'.$params['source_name'].'[/url]'
);
- $body = $l10n->t("Full Name: %s\nSite Location: %s\nLogin Name: %s (%s)",
- $params['source_name'],
- $siteurl, $params['source_mail'],
- $params['source_nick']
+ $body = $l10n->t('You are now mutual friends and may exchange status updates, photos, and email without restriction.');
+
+ $sitelink = $l10n->t('Please visit %s if you wish to make any changes to this relationship.');
+ $tsitelink = sprintf($sitelink, $siteurl);
+ $hsitelink = sprintf($sitelink, ''.$sitename.'');
+ } else { // ACTIVITY_FOLLOW
+ $itemlink = $params['link'];
+ $subject = $l10n->t('%s Connection accepted', $subjectPrefix);
+
+ $preamble = $l10n->t('\'%1$s\' has accepted your connection request at %2$s', $params['source_name'], $sitename);
+ $epreamble = $l10n->t('%2$s has accepted your [url=%1$s]connection request[/url].',
+ $itemlink,
+ '[url='.$params['source_link'].']'.$params['source_name'].'[/url]'
);
- $sitelink = $l10n->t('Please visit %s to approve or reject the request.');
- $tsitelink = sprintf($sitelink, $params['link']);
- $hsitelink = sprintf($sitelink, ''.$sitename.'
');
- break;
- case "SYSTEM_DB_UPDATE_FAIL":
- break;
- }
+ $body = $l10n->t('\'%1$s\' has chosen to accept you a fan, which restricts some forms of communication - such as private messaging and some profile interactions. If this is a celebrity or community page, these settings were applied automatically.', $params['source_name']);
+ $body .= "\n\n";
+ $body .= $l10n->t('\'%1$s\' may choose to extend this into a two-way or more permissive relationship in the future.', $params['source_name']);
+
+ $sitelink = $l10n->t('Please visit %s if you wish to make any changes to this relationship.');
+ $tsitelink = sprintf($sitelink, $siteurl);
+ $hsitelink = sprintf($sitelink, ''.$sitename.'');
+ }
+ break;
+
+ case Notification\Type::SYSTEM:
+ switch($params['event']) {
+ case "SYSTEM_REGISTER_REQUEST":
+ $itemlink = $params['link'];
+ $subject = $l10n->t('[Friendica System Notify]') . ' ' . $l10n->t('registration request');
+
+ $preamble = $l10n->t('You\'ve received a registration request from \'%1$s\' at %2$s', $params['source_name'], $sitename);
+ $epreamble = $l10n->t('You\'ve received a [url=%1$s]registration request[/url] from %2$s.',
+ $itemlink,
+ '[url='.$params['source_link'].']'.$params['source_name'].'[/url]'
+ );
+
+ $body = $l10n->t("Full Name: %s\nSite Location: %s\nLogin Name: %s (%s)",
+ $params['source_name'],
+ $siteurl, $params['source_mail'],
+ $params['source_nick']
+ );
+
+ $sitelink = $l10n->t('Please visit %s to approve or reject the request.');
+ $tsitelink = sprintf($sitelink, $params['link']);
+ $hsitelink = sprintf($sitelink, ''.$sitename.'
');
+ break;
+ case "SYSTEM_DB_UPDATE_FAIL":
+ break;
+ }
+ break;
+
+ default:
+ Logger::notice('Unhandled type', ['type' => $params['type']]);
+ return false;
}
return notification_store_and_send($params, $sitelink, $tsitelink, $hsitelink, $title, $subject, $preamble, $epreamble, $body, $itemlink, $show_in_notification_page);
@@ -630,9 +539,9 @@ function notification_from_array(array $notification)
$contact = Contact::getById($notification['actor-id'], ['url', 'name', 'photo']);
if (DBA::isResult($contact)) {
- $params['source_link'] = $params['origin_link'] = $contact['url'];
- $params['source_name'] = $params['origin_name'] = $contact['name'];
- $params['source_photo'] = $params['origin_photo'] = $contact['photo'];
+ $params['source_link'] = $contact['url'];
+ $params['source_name'] = $contact['name'];
+ $params['source_photo'] = $contact['photo'];
}
$item = Post::selectFirstForUser($notification['uid'], Item::ITEM_FIELDLIST,
@@ -706,112 +615,3 @@ function notification_from_array(array $notification)
return notification_store_and_send($params, $sitelink, $tsitelink, $hsitelink, $title, $subject, $preamble, $epreamble, $item['body'], $itemlink, true);
}
-
-/**
- * Checks for users who should be notified
- *
- * @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(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($usernotifications);
-}
-
-/**
- * Checks for item related notifications and sends them
- *
- * @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(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 = ['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'] = 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 & 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 & Post\UserNotification::NOTIF_DIRECT_THREAD_COMMENT)) {
- $params['activity']['origin_comment'] = true;
- }
-
- 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"
- if ($item['gravity'] == GRAVITY_ACTIVITY) {
- $parent_item = Post::selectFirst($fields, ['uri-id' => $item['thr-parent-id'], 'uid' => [$uid, 0]]);
- if (DBA::isResult($parent_item)) {
- // Don't notify on own entries
- if (User::getIdForURL($parent_item['author-link']) == $uid) {
- return false;
- }
-
- $params['origin_cid'] = $parent_item['author-id'];
- $params['item'] = $parent_item;
- }
- }
- } elseif ($notification_type & Post\UserNotification::NOTIF_EXPLICIT_TAGGED) {
- $params['type'] = Notification\Type::TAG_SELF;
- $params['verb'] = Activity::TAG;
- } elseif ($notification_type & Post\UserNotification::NOTIF_IMPLICIT_TAGGED) {
- $params['type'] = Notification\Type::COMMENT;
- $params['verb'] = Activity::POST;
- } elseif ($notification_type & Post\UserNotification::NOTIF_THREAD_COMMENT) {
- $params['type'] = Notification\Type::COMMENT;
- $params['verb'] = Activity::POST;
- } elseif ($notification_type & Post\UserNotification::NOTIF_DIRECT_COMMENT) {
- $params['type'] = Notification\Type::COMMENT;
- $params['verb'] = Activity::POST;
- } elseif ($notification_type & Post\UserNotification::NOTIF_COMMENT_PARTICIPATION) {
- $params['type'] = Notification\Type::COMMENT;
- $params['verb'] = Activity::POST;
- } elseif ($notification_type & Post\UserNotification::NOTIF_ACTIVITY_PARTICIPATION) {
- $params['type'] = Notification\Type::COMMENT;
- $params['verb'] = Activity::POST;
- } else {
- return false;
- }
-
- notification($params);
-}
diff --git a/src/Model/Item.php b/src/Model/Item.php
index c683e10e78..5cc72b0580 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -1160,8 +1160,6 @@ class Item
Post\UserNotification::setNotification($posted_item['uri-id'], $posted_item['uid']);
- check_user_notification($posted_item['uri-id'], $posted_item['uid']);
-
// Distribute items to users who subscribed to their tags
self::distributeByTags($posted_item);
diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po
index a5fe06bb5e..402eff94d8 100644
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2021.09-dev\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-22 08:26+0000\n"
+"POT-Creation-Date: 2021-08-24 08:57+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -54,7 +54,7 @@ msgstr ""
msgid "%1$s poked %2$s"
msgstr ""
-#: include/conversation.php:142 src/Model/Item.php:2611
+#: include/conversation.php:142 src/Model/Item.php:2609
msgid "event"
msgstr ""
@@ -62,7 +62,7 @@ msgstr ""
msgid "status"
msgstr ""
-#: include/conversation.php:150 mod/tagger.php:90 src/Model/Item.php:2613
+#: include/conversation.php:150 mod/tagger.php:90 src/Model/Item.php:2611
msgid "photo"
msgstr ""
@@ -501,280 +501,195 @@ msgstr ""
msgid "Open Compose page"
msgstr ""
-#: include/enotify.php:52 include/enotify.php:646
+#: include/enotify.php:52 include/enotify.php:559
msgid "[Friendica:Notify]"
msgstr ""
-#: include/enotify.php:124
+#: include/enotify.php:116
#, php-format
msgid "%s New mail received at %s"
msgstr ""
-#: include/enotify.php:126
+#: include/enotify.php:118
#, php-format
msgid "%1$s sent you a new private message at %2$s."
msgstr ""
-#: include/enotify.php:127
+#: include/enotify.php:119
msgid "a private message"
msgstr ""
-#: include/enotify.php:127
+#: include/enotify.php:119
#, php-format
msgid "%1$s sent you %2$s."
msgstr ""
-#: include/enotify.php:129
+#: include/enotify.php:121
#, php-format
msgid "Please visit %s to view and/or reply to your private messages."
msgstr ""
-#: include/enotify.php:176
-#, php-format
-msgid "%1$s replied to you on %2$s's %3$s %4$s"
-msgstr ""
-
-#: include/enotify.php:178
-#, php-format
-msgid "%1$s tagged you on %2$s's %3$s %4$s"
-msgstr ""
-
-#: include/enotify.php:180
+#: include/enotify.php:152
#, php-format
msgid "%1$s commented on %2$s's %3$s %4$s"
msgstr ""
-#: include/enotify.php:190
-#, php-format
-msgid "%1$s replied to you on your %2$s %3$s"
-msgstr ""
-
-#: include/enotify.php:192
-#, php-format
-msgid "%1$s tagged you on your %2$s %3$s"
-msgstr ""
-
-#: include/enotify.php:194
+#: include/enotify.php:157
#, php-format
msgid "%1$s commented on your %2$s %3$s"
msgstr ""
-#: include/enotify.php:201
-#, php-format
-msgid "%1$s replied to you on their %2$s %3$s"
-msgstr ""
-
-#: include/enotify.php:203
-#, php-format
-msgid "%1$s tagged you on their %2$s %3$s"
-msgstr ""
-
-#: include/enotify.php:205
+#: include/enotify.php:161
#, php-format
msgid "%1$s commented on their %2$s %3$s"
msgstr ""
-#: include/enotify.php:216 include/enotify.php:674
-#, php-format
-msgid "%s %s tagged you"
-msgstr ""
-
-#: include/enotify.php:218
-#, php-format
-msgid "%1$s tagged you at %2$s"
-msgstr ""
-
-#: include/enotify.php:220 include/enotify.php:680
+#: include/enotify.php:165 include/enotify.php:594
#, php-format
msgid "%1$s Comment to conversation #%2$d by %3$s"
msgstr ""
-#: include/enotify.php:222
+#: include/enotify.php:167
#, php-format
msgid "%s commented on an item/conversation you have been following."
msgstr ""
-#: include/enotify.php:227 include/enotify.php:242 include/enotify.php:267
-#: include/enotify.php:286 include/enotify.php:302 include/enotify.php:694
+#: include/enotify.php:171 include/enotify.php:186 include/enotify.php:205
+#: include/enotify.php:609
#, php-format
msgid "Please visit %s to view and/or reply to the conversation."
msgstr ""
-#: include/enotify.php:234
+#: include/enotify.php:178
#, php-format
msgid "%s %s posted to your profile wall"
msgstr ""
-#: include/enotify.php:236
+#: include/enotify.php:180
#, php-format
msgid "%1$s posted to your profile wall at %2$s"
msgstr ""
-#: include/enotify.php:237
+#: include/enotify.php:181
#, php-format
msgid "%1$s posted to [url=%2$s]your wall[/url]"
msgstr ""
-#: include/enotify.php:250 include/enotify.php:677
-#, php-format
-msgid "%s %s shared a new post"
-msgstr ""
-
-#: include/enotify.php:252
-#, php-format
-msgid "%1$s shared a new post at %2$s"
-msgstr ""
-
-#: include/enotify.php:253
-#, php-format
-msgid "%1$s [url=%2$s]shared a post[/url]."
-msgstr ""
-
-#: include/enotify.php:258
-#, php-format
-msgid "%s %s shared a post from %s"
-msgstr ""
-
-#: include/enotify.php:260
-#, php-format
-msgid "%1$s shared a post from %2$s at %3$s"
-msgstr ""
-
-#: include/enotify.php:261
-#, php-format
-msgid "%1$s [url=%2$s]shared a post[/url] from %3$s."
-msgstr ""
-
-#: include/enotify.php:274
+#: include/enotify.php:193
#, php-format
msgid "%1$s %2$s poked you"
msgstr ""
-#: include/enotify.php:276
+#: include/enotify.php:195
#, php-format
msgid "%1$s poked you at %2$s"
msgstr ""
-#: include/enotify.php:277
+#: include/enotify.php:196
#, php-format
msgid "%1$s [url=%2$s]poked you[/url]."
msgstr ""
-#: include/enotify.php:294
-#, php-format
-msgid "%s %s tagged your post"
-msgstr ""
-
-#: include/enotify.php:296
-#, php-format
-msgid "%1$s tagged your post at %2$s"
-msgstr ""
-
-#: include/enotify.php:297
-#, php-format
-msgid "%1$s tagged [url=%2$s]your post[/url]"
-msgstr ""
-
-#: include/enotify.php:309
+#: include/enotify.php:213
#, php-format
msgid "%s Introduction received"
msgstr ""
-#: include/enotify.php:311
+#: include/enotify.php:215
#, php-format
msgid "You've received an introduction from '%1$s' at %2$s"
msgstr ""
-#: include/enotify.php:312
+#: include/enotify.php:216
#, php-format
msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
msgstr ""
-#: include/enotify.php:317 include/enotify.php:363
+#: include/enotify.php:221 include/enotify.php:267
#, php-format
msgid "You may visit their profile at %s"
msgstr ""
-#: include/enotify.php:319
+#: include/enotify.php:223
#, php-format
msgid "Please visit %s to approve or reject the introduction."
msgstr ""
-#: include/enotify.php:326
+#: include/enotify.php:230
#, php-format
msgid "%s A new person is sharing with you"
msgstr ""
-#: include/enotify.php:328 include/enotify.php:329
+#: include/enotify.php:232 include/enotify.php:233
#, php-format
msgid "%1$s is sharing with you at %2$s"
msgstr ""
-#: include/enotify.php:336
+#: include/enotify.php:240
#, php-format
msgid "%s You have a new follower"
msgstr ""
-#: include/enotify.php:338 include/enotify.php:339
+#: include/enotify.php:242 include/enotify.php:243
#, php-format
msgid "You have a new follower at %2$s : %1$s"
msgstr ""
-#: include/enotify.php:352
+#: include/enotify.php:256
#, php-format
msgid "%s Friend suggestion received"
msgstr ""
-#: include/enotify.php:354
+#: include/enotify.php:258
#, php-format
msgid "You've received a friend suggestion from '%1$s' at %2$s"
msgstr ""
-#: include/enotify.php:355
+#: include/enotify.php:259
#, php-format
msgid "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
msgstr ""
-#: include/enotify.php:361
+#: include/enotify.php:265
msgid "Name:"
msgstr ""
-#: include/enotify.php:362
+#: include/enotify.php:266
msgid "Photo:"
msgstr ""
-#: include/enotify.php:365
+#: include/enotify.php:269
#, php-format
msgid "Please visit %s to approve or reject the suggestion."
msgstr ""
-#: include/enotify.php:373 include/enotify.php:388
+#: include/enotify.php:277 include/enotify.php:292
#, php-format
msgid "%s Connection accepted"
msgstr ""
-#: include/enotify.php:375 include/enotify.php:390
+#: include/enotify.php:279 include/enotify.php:294
#, php-format
msgid "'%1$s' has accepted your connection request at %2$s"
msgstr ""
-#: include/enotify.php:376 include/enotify.php:391
+#: include/enotify.php:280 include/enotify.php:295
#, php-format
msgid "%2$s has accepted your [url=%1$s]connection request[/url]."
msgstr ""
-#: include/enotify.php:381
+#: include/enotify.php:285
msgid ""
"You are now mutual friends and may exchange status updates, photos, and "
"email without restriction."
msgstr ""
-#: include/enotify.php:383
+#: include/enotify.php:287
#, php-format
msgid "Please visit %s if you wish to make any changes to this relationship."
msgstr ""
-#: include/enotify.php:396
+#: include/enotify.php:300
#, php-format
msgid ""
"'%1$s' has chosen to accept you a fan, which restricts some forms of "
@@ -783,37 +698,37 @@ msgid ""
"automatically."
msgstr ""
-#: include/enotify.php:398
+#: include/enotify.php:302
#, php-format
msgid ""
"'%1$s' may choose to extend this into a two-way or more permissive "
"relationship in the future."
msgstr ""
-#: include/enotify.php:400
+#: include/enotify.php:304
#, php-format
msgid "Please visit %s if you wish to make any changes to this relationship."
msgstr ""
-#: include/enotify.php:410 mod/removeme.php:63
+#: include/enotify.php:314 mod/removeme.php:63
msgid "[Friendica System Notify]"
msgstr ""
-#: include/enotify.php:410
+#: include/enotify.php:314
msgid "registration request"
msgstr ""
-#: include/enotify.php:412
+#: include/enotify.php:316
#, php-format
msgid "You've received a registration request from '%1$s' at %2$s"
msgstr ""
-#: include/enotify.php:413
+#: include/enotify.php:317
#, php-format
msgid "You've received a [url=%1$s]registration request[/url] from %2$s."
msgstr ""
-#: include/enotify.php:418
+#: include/enotify.php:322
#, php-format
msgid ""
"Full Name:\t%s\n"
@@ -821,11 +736,21 @@ msgid ""
"Login Name:\t%s (%s)"
msgstr ""
-#: include/enotify.php:424
+#: include/enotify.php:328
#, php-format
msgid "Please visit %s to approve or reject the request."
msgstr ""
+#: include/enotify.php:588
+#, php-format
+msgid "%s %s tagged you"
+msgstr ""
+
+#: include/enotify.php:591
+#, php-format
+msgid "%s %s shared a new post"
+msgstr ""
+
#: mod/api.php:30 mod/editpost.php:38 mod/events.php:236 mod/follow.php:56
#: mod/follow.php:131 mod/item.php:184 mod/item.php:189 mod/item.php:934
#: mod/message.php:69 mod/message.php:111 mod/notes.php:44
@@ -1774,15 +1699,15 @@ msgstr ""
msgid "View Album"
msgstr ""
-#: mod/ping.php:287
+#: mod/ping.php:286
msgid "{0} wants to be your friend"
msgstr ""
-#: mod/ping.php:304
+#: mod/ping.php:303
msgid "{0} requested registration"
msgstr ""
-#: mod/ping.php:317
+#: mod/ping.php:316
#, php-format
msgid "{0} and %d others requested registration"
msgstr ""
@@ -3416,8 +3341,8 @@ msgid ""
"%2$s %3$s"
msgstr ""
-#: src/Content/Text/BBCode.php:1177 src/Model/Item.php:3141
-#: src/Model/Item.php:3147 src/Model/Item.php:3148
+#: src/Content/Text/BBCode.php:1177 src/Model/Item.php:3139
+#: src/Model/Item.php:3145 src/Model/Item.php:3146
msgid "Link to source"
msgstr ""
@@ -4631,33 +4556,33 @@ msgstr ""
msgid "Edit groups"
msgstr ""
-#: src/Model/Item.php:1665
+#: src/Model/Item.php:1663
#, php-format
msgid "Detected languages in this post:\\n%s"
msgstr ""
-#: src/Model/Item.php:2615
+#: src/Model/Item.php:2613
msgid "activity"
msgstr ""
-#: src/Model/Item.php:2617
+#: src/Model/Item.php:2615
msgid "comment"
msgstr ""
-#: src/Model/Item.php:2620
+#: src/Model/Item.php:2618
msgid "post"
msgstr ""
-#: src/Model/Item.php:2757
+#: src/Model/Item.php:2755
#, php-format
msgid "Content warning: %s"
msgstr ""
-#: src/Model/Item.php:3106
+#: src/Model/Item.php:3104
msgid "bytes"
msgstr ""
-#: src/Model/Item.php:3135 src/Model/Item.php:3136
+#: src/Model/Item.php:3133 src/Model/Item.php:3134
msgid "View on separate page"
msgstr ""
@@ -4675,97 +4600,97 @@ msgstr ""
msgid "%1$s had started following you"
msgstr ""
-#: src/Model/Notification.php:252
+#: src/Model/Notification.php:259
#, php-format
msgid "%1$s liked your comment %2$s"
msgstr ""
-#: src/Model/Notification.php:255
+#: src/Model/Notification.php:262
#, php-format
msgid "%1$s liked your post %2$s"
msgstr ""
-#: src/Model/Notification.php:262
+#: src/Model/Notification.php:269
#, php-format
msgid "%1$s disliked your comment %2$s"
msgstr ""
-#: src/Model/Notification.php:265
+#: src/Model/Notification.php:272
#, php-format
msgid "%1$s disliked your post %2$s"
msgstr ""
-#: src/Model/Notification.php:272
+#: src/Model/Notification.php:279
#, php-format
msgid "%1$s shared your comment %2$s"
msgstr ""
-#: src/Model/Notification.php:275
+#: src/Model/Notification.php:282
#, php-format
msgid "%1$s shared your post %2$s"
msgstr ""
-#: src/Model/Notification.php:282
+#: src/Model/Notification.php:289
#, php-format
msgid "%1$s tagged you on %2$s"
msgstr ""
-#: src/Model/Notification.php:286
+#: src/Model/Notification.php:293
#, php-format
msgid "%1$s replied to you on %2$s"
msgstr ""
-#: src/Model/Notification.php:290
+#: src/Model/Notification.php:297
#, php-format
msgid "%1$s commented in your thread %2$s"
msgstr ""
-#: src/Model/Notification.php:294
+#: src/Model/Notification.php:301
#, php-format
msgid "%1$s commented on your comment %2$s"
msgstr ""
-#: src/Model/Notification.php:300
+#: src/Model/Notification.php:307
#, php-format
msgid "%1$s commented in their thread %2$s"
msgstr ""
-#: src/Model/Notification.php:302
+#: src/Model/Notification.php:309
#, php-format
msgid "%1$s commented in their thread"
msgstr ""
-#: src/Model/Notification.php:304
+#: src/Model/Notification.php:311
#, php-format
msgid "%1$s commented in the thread %2$s from %3$s"
msgstr ""
-#: src/Model/Notification.php:306
+#: src/Model/Notification.php:313
#, php-format
msgid "%1$s commented in the thread from %3$s"
msgstr ""
-#: src/Model/Notification.php:311
+#: src/Model/Notification.php:318
#, php-format
msgid "%1$s commented on your thread %2$s"
msgstr ""
-#: src/Model/Notification.php:316
+#: src/Model/Notification.php:323
#, php-format
msgid "%1$s shared the post %2$s from %3$s"
msgstr ""
-#: src/Model/Notification.php:318
+#: src/Model/Notification.php:325
#, php-format
msgid "%1$s shared a post from %3$s"
msgstr ""
-#: src/Model/Notification.php:320
+#: src/Model/Notification.php:327
#, php-format
msgid "%1$s shared the post %2$s"
msgstr ""
-#: src/Model/Notification.php:322
+#: src/Model/Notification.php:329
#, php-format
msgid "%1$s shared a post"
msgstr ""