X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fenotify.php;h=6b3171dda6d6cd2102ae9035cbd746201602a79a;hb=98eb53c20f6e42d095c4991ead1099d4c317782a;hp=f51c88eae88a9be63bfdf53afffe05799d7fef1c;hpb=6e45514e2c03646143ac1776a13d4958125a1776;p=friendica.git
diff --git a/include/enotify.php b/include/enotify.php
index f51c88eae8..6b3171dda6 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -1,6 +1,22 @@
.
+ *
*/
use Friendica\Content\Text\BBCode;
@@ -30,6 +46,9 @@ use Friendica\Protocol\Activity;
*/
function notification($params)
{
+ /** @var string the common prefix of a notification subject */
+ $subjectPrefix = DI::l10n()->t('[Friendica:Notify]');
+
// Temporary logging for finding the origin
if (!isset($params['uid'])) {
Logger::notice('Missing parameters "uid".', ['params' => $params, 'callstack' => System::callstack()]);
@@ -88,12 +107,24 @@ function notification($params)
$item_id = 0;
}
+ if (isset($params['item']['uri-id'])) {
+ $uri_id = $params['item']['uri-id'];
+ } else {
+ $uri_id = 0;
+ }
+
if (isset($params['parent'])) {
$parent_id = $params['parent'];
} else {
$parent_id = 0;
}
+ if (isset($params['item']['parent-uri-id'])) {
+ $parent_uri_id = $params['item']['parent-uri-id'];
+ } else {
+ $parent_uri_id = 0;
+ }
+
$epreamble = '';
$preamble = '';
$subject = '';
@@ -102,11 +133,11 @@ function notification($params)
$hsitelink = '';
$itemlink = '';
- if ($params['type'] == NOTIFY_MAIL) {
+ if ($params['type'] == Notify\Type::MAIL) {
$itemlink = $siteurl.'/message/'.$params['item']['id'];
$params["link"] = $itemlink;
- $subject = $l10n->t('[Friendica:Notify] New mail received at %s', $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]');
@@ -116,7 +147,7 @@ function notification($params)
$hsitelink = sprintf($sitelink, ''.$sitename.'');
}
- if ($params['type'] == NOTIFY_COMMENT || $params['type'] == NOTIFY_TAGSELF) {
+ 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);
@@ -126,7 +157,7 @@ function notification($params)
// 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_TAGSELF, NOTIFY_COMMENT, NOTIFY_SHARE],
+ $condition = ['type' => [Notify\Type::TAG_SELF, Notify\Type::COMMENT, Notify\Type::SHARE],
'link' => $params['link'], 'uid' => $params['uid']];
if (DBA::exists('notify', $condition)) {
return false;
@@ -155,39 +186,39 @@ function notification($params)
// "George Bull's post"
if ($params['activity']['origin_comment']) {
- $message = '%1$s replied to you on %2$s\'s %3$s %4$s';
+ $message = $l10n->t('%1$s replied to you on %2$s\'s %3$s %4$s');
} elseif ($params['activity']['explicit_tagged']) {
- $message = '%1$s tagged you on %2$s\'s %3$s %4$s';
+ $message = $l10n->t('%1$s tagged you on %2$s\'s %3$s %4$s');
} else {
- $message = '%1$s commented on %2$s\'s %3$s %4$s';
+ $message = $l10n->t('%1$s commented on %2$s\'s %3$s %4$s');
}
- $dest_str = $l10n->t($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 ($params['activity']['origin_thread']) {
if ($params['activity']['origin_comment']) {
- $message = '%1$s replied to you on your %2$s %3$s';
+ $message = $l10n->t('%1$s replied to you on your %2$s %3$s');
} elseif ($params['activity']['explicit_tagged']) {
- $message = '%1$s tagged you on your %2$s %3$s';
+ $message = $l10n->t('%1$s tagged you on your %2$s %3$s');
} else {
- $message = '%1$s commented on your %2$s %3$s';
+ $message = $l10n->t('%1$s commented on your %2$s %3$s');
}
- $dest_str = $l10n->t($message, $params['source_name'], $item_post_type, $title);
+ $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']) {
- $message = '%1$s replied to you on their %2$s %3$s';
+ $message = $l10n->t('%1$s replied to you on their %2$s %3$s');
} elseif ($params['activity']['explicit_tagged']) {
- $message = '%1$s tagged you on their %2$s %3$s';
+ $message = $l10n->t('%1$s tagged you on their %2$s %3$s');
} else {
- $message = '%1$s commented on their %2$s %3$s';
+ $message = $l10n->t('%1$s commented on their %2$s %3$s');
}
- $dest_str = $l10n->t($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.
@@ -195,11 +226,11 @@ function notification($params)
// 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']) {
- $subject = $l10n->t('[Friendica:Notify] %s tagged you', $params['source_name']);
+ $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('[Friendica:Notify] Comment to conversation #%1$d by %2$s', $parent_id, $params['source_name']);
+ $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']);
}
@@ -212,8 +243,8 @@ function notification($params)
$itemlink = $params['link'];
}
- if ($params['type'] == NOTIFY_WALL) {
- $subject = $l10n->t('[Friendica:Notify] %s posted to your profile wall', $params['source_name']);
+ if ($params['type'] == Notify\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]',
@@ -227,8 +258,8 @@ function notification($params)
$itemlink = $params['link'];
}
- if ($params['type'] == NOTIFY_SHARE) {
- $subject = $l10n->t('[Friendica:Notify] %s shared a new post', $params['source_name']);
+ if ($params['type'] == Notify\Type::SHARE) {
+ $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].',
@@ -242,8 +273,8 @@ function notification($params)
$itemlink = $params['link'];
}
- if ($params['type'] == NOTIFY_POKE) {
- $subject = $l10n->t('[Friendica:Notify] %1$s poked you', $params['source_name']);
+ if ($params['type'] == Notify\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].',
@@ -261,9 +292,9 @@ function notification($params)
$itemlink = $params['link'];
}
- if ($params['type'] == NOTIFY_TAGSHARE) {
+ if ($params['type'] == Notify\Type::TAG_SHARE) {
$itemlink = $params['link'];
- $subject = $l10n->t('[Friendica:Notify] %s tagged your post', $params['source_name']);
+ $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]',
@@ -278,7 +309,7 @@ function notification($params)
if ($params['type'] == Notify\Type::INTRO) {
$itemlink = $params['link'];
- $subject = $l10n->t('[Friendica:Notify] Introduction received');
+ $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.',
@@ -295,7 +326,7 @@ function notification($params)
switch ($params['verb']) {
case Activity::FRIEND:
// someone started to share with user (mostly OStatus)
- $subject = $l10n->t('[Friendica:Notify] A new person is sharing with you');
+ $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',
@@ -305,7 +336,7 @@ function notification($params)
break;
case Activity::FOLLOW:
// someone started to follow the user (mostly OStatus)
- $subject = $l10n->t('[Friendica:Notify] You have a new follower');
+ $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',
@@ -319,9 +350,9 @@ function notification($params)
}
}
- if ($params['type'] == NOTIFY_SUGGEST) {
+ if ($params['type'] == Notify\Type::SUGGEST) {
$itemlink = $params['link'];
- $subject = $l10n->t('[Friendica:Notify] Friend suggestion received');
+ $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.',
@@ -342,7 +373,7 @@ function notification($params)
if ($params['type'] == Notify\Type::CONFIRM) {
if ($params['verb'] == Activity::FRIEND) { // mutual connection
$itemlink = $params['link'];
- $subject = $l10n->t('[Friendica:Notify] Connection accepted');
+ $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].',
@@ -357,7 +388,7 @@ function notification($params)
$hsitelink = sprintf($sitelink, ''.$sitename.'');
} else { // ACTIVITY_FOLLOW
$itemlink = $params['link'];
- $subject = $l10n->t('[Friendica:Notify] Connection accepted');
+ $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].',
@@ -375,7 +406,7 @@ function notification($params)
}
}
- if ($params['type'] == NOTIFY_SYSTEM) {
+ if ($params['type'] == Notify\Type::SYSTEM) {
switch($params['event']) {
case "SYSTEM_REGISTER_REQUEST":
$itemlink = $params['link'];
@@ -433,19 +464,26 @@ function notification($params)
if ($show_in_notification_page) {
$notification = DI::notify()->insert([
- 'name' => $params['source_name'] ?? '',
- 'name_cache' => strip_tags(BBCode::convert($params['source_name'] ?? '')),
- 'url' => $params['source_link'] ?? '',
- 'photo' => $params['source_photo'] ?? '',
- 'link' => $itemlink ?? '',
- 'uid' => $params['uid'] ?? 0,
- 'iid' => $item_id ?? 0,
- 'parent' => $parent_id ?? 0,
- 'type' => $params['type'] ?? '',
- 'verb' => $params['verb'] ?? '',
- 'otype' => $params['otype'] ?? '',
+ 'name' => $params['source_name'] ?? '',
+ 'name_cache' => substr(strip_tags(BBCode::convert($params['source_name'])), 0, 255),
+ 'url' => $params['source_link'] ?? '',
+ 'photo' => $params['source_photo'] ?? '',
+ 'link' => $itemlink ?? '',
+ 'uid' => $params['uid'] ?? 0,
+ 'iid' => $item_id,
+ 'uri-id' => $uri_id,
+ 'parent' => $parent_id,
+ 'parent-uri-id' => $parent_uri_id,
+ 'type' => $params['type'] ?? '',
+ 'verb' => $params['verb'] ?? '',
+ 'otype' => $params['otype'] ?? '',
]);
+ // Notification insertion can be intercepted by an addon registering the 'enotify_store' hook
+ if (!$notification) {
+ return false;
+ }
+
$notification->msg = Renderer::replaceMacros($epreamble, ['$itemlink' => $notification->link]);
DI::notify()->update($notification);
@@ -456,7 +494,7 @@ function notification($params)
// send email notification if notification preferences permit
if ((intval($params['notify_flags']) & intval($params['type']))
- || $params['type'] == NOTIFY_SYSTEM) {
+ || $params['type'] == Notify\Type::SYSTEM) {
Logger::log('sending notification email');
@@ -467,8 +505,9 @@ function notification($params)
if (!DBA::exists('notify-threads', ['master-parent-item' => $params['parent'], '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'],
- 'receiver-uid' => $params['uid'], 'parent-item' => 0];
+ $fields = ['notify-id' => $notify_id, 'master-parent-item' => $params['parent'],
+ 'master-parent-uri-id' => $parent_uri_id,
+ 'receiver-uid' => $params['uid'], 'parent-item' => 0];
DBA::insert('notify-threads', $fields);
$additional_mail_header .= "Message-ID: <${id_for_parent}>\n";
@@ -555,7 +594,7 @@ function check_user_notification($itemid) {
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
function check_item_notification($itemid, $uid, $notification_type) {
- $fields = ['id', 'mention', 'tag', 'parent', 'title', 'body',
+ $fields = ['id', 'uri-id', 'mention', 'parent', 'parent-uri-id', 'title', 'body',
'author-link', 'author-name', 'author-avatar', 'author-id',
'guid', 'parent-uri', 'uri', 'contact-id', 'network'];
$condition = ['id' => $itemid, 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT], 'deleted' => false];
@@ -589,25 +628,25 @@ function check_item_notification($itemid, $uid, $notification_type) {
}
if ($notification_type & UserItem::NOTIF_SHARED) {
- $params['type'] = NOTIFY_SHARE;
+ $params['type'] = Notify\Type::SHARE;
$params['verb'] = Activity::POST;
} elseif ($notification_type & UserItem::NOTIF_EXPLICIT_TAGGED) {
- $params['type'] = NOTIFY_TAGSELF;
+ $params['type'] = Notify\Type::TAG_SELF;
$params['verb'] = Activity::TAG;
} elseif ($notification_type & UserItem::NOTIF_IMPLICIT_TAGGED) {
- $params['type'] = NOTIFY_COMMENT;
+ $params['type'] = Notify\Type::COMMENT;
$params['verb'] = Activity::POST;
} elseif ($notification_type & UserItem::NOTIF_THREAD_COMMENT) {
- $params['type'] = NOTIFY_COMMENT;
+ $params['type'] = Notify\Type::COMMENT;
$params['verb'] = Activity::POST;
} elseif ($notification_type & UserItem::NOTIF_DIRECT_COMMENT) {
- $params['type'] = NOTIFY_COMMENT;
+ $params['type'] = Notify\Type::COMMENT;
$params['verb'] = Activity::POST;
} elseif ($notification_type & UserItem::NOTIF_COMMENT_PARTICIPATION) {
- $params['type'] = NOTIFY_COMMENT;
+ $params['type'] = Notify\Type::COMMENT;
$params['verb'] = Activity::POST;
} elseif ($notification_type & UserItem::NOTIF_ACTIVITY_PARTICIPATION) {
- $params['type'] = NOTIFY_COMMENT;
+ $params['type'] = Notify\Type::COMMENT;
$params['verb'] = Activity::POST;
} else {
return false;