Unused parts of the old notification system are removed
This commit is contained in:
parent
c78b7f45c5
commit
429a724bc1
|
|
@ -39,7 +39,7 @@ use Friendica\Protocol\Activity;
|
||||||
* Creates a notification entry and possibly sends a mail
|
* Creates a notification entry and possibly sends a mail
|
||||||
*
|
*
|
||||||
* @param array $params Array with the elements:
|
* @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,
|
* source_name, source_mail, source_nick, source_link, source_photo,
|
||||||
* show_in_notification_page
|
* 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);
|
$siteurl = DI::baseUrl()->get(true);
|
||||||
$sitename = DI::config()->get('config', 'sitename');
|
$sitename = DI::config()->get('config', 'sitename');
|
||||||
|
|
||||||
|
|
@ -118,316 +109,234 @@ function notification($params)
|
||||||
$hsitelink = '';
|
$hsitelink = '';
|
||||||
$itemlink = '';
|
$itemlink = '';
|
||||||
|
|
||||||
if ($params['type'] == Notification\Type::MAIL) {
|
switch ($params['type']) {
|
||||||
$itemlink = $params['link'];
|
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);
|
$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]');
|
$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.');
|
$sitelink = $l10n->t('Please visit %s to view and/or reply to your private messages.');
|
||||||
$tsitelink = sprintf($sitelink, $itemlink);
|
$tsitelink = sprintf($sitelink, $itemlink);
|
||||||
$hsitelink = sprintf($sitelink, '<a href="' . $itemlink . '">' . $sitename . '</a>');
|
$hsitelink = sprintf($sitelink, '<a href="' . $itemlink . '">' . $sitename . '</a>');
|
||||||
|
|
||||||
// Mail notifications aren't using the "notify" table entry
|
// Mail notifications aren't using the "notify" table entry
|
||||||
$show_in_notification_page = false;
|
$show_in_notification_page = false;
|
||||||
}
|
break;
|
||||||
|
|
||||||
// Check to see if there was already a tag notify or comment notify for this post.
|
case Notification\Type::COMMENT:
|
||||||
// If so don't create a second notification
|
if (Post\ThreadUser::getIgnored($parent_uri_id, $params['uid'])) {
|
||||||
if (in_array($params['type'], [Notification\Type::TAG_SELF, Notification\Type::COMMENT, Notification\Type::SHARE])) {
|
Logger::info('Thread is ignored', ['parent' => $parent_id, 'parent-uri-id' => $parent_uri_id]);
|
||||||
$condition = ['type' => [Notification\Type::TAG_SELF, Notification\Type::COMMENT, Notification\Type::SHARE],
|
return false;
|
||||||
'link' => $params['link'], 'uid' => $params['uid']];
|
}
|
||||||
if (DBA::exists('notify', $condition)) {
|
|
||||||
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]);
|
$item = Post::selectFirstForUser($params['uid'], Item::ITEM_FIELDLIST, ['id' => $parent_id, 'deleted' => false]);
|
||||||
}
|
if (empty($item)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
if (empty($item)) {
|
$item_post_type = Item::postType($item, $l10n);
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
$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);
|
// First go for the general message
|
||||||
if (!empty($content['text'])) {
|
|
||||||
$title = '"' . trim(str_replace("\n", " ", $content['text'])) . '"';
|
|
||||||
} else {
|
|
||||||
$title = '';
|
|
||||||
}
|
|
||||||
|
|
||||||
// First go for the general message
|
// "George Bull's post"
|
||||||
|
|
||||||
// "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 {
|
|
||||||
$message = $l10n->t('%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 = 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);
|
// "your post"
|
||||||
|
if ($item['wall']) {
|
||||||
// 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 {
|
|
||||||
$message = $l10n->t('%1$s commented on your %2$s %3$s');
|
$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"
|
||||||
$dest_str = sprintf($message, $params['source_name'], $item_post_type, $title);
|
} elseif ($item['author-link'] == $params['source_link']) {
|
||||||
// "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 {
|
|
||||||
$message = $l10n->t('%1$s commented on their %2$s %3$s');
|
$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']);
|
$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']);
|
$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.');
|
$sitelink = $l10n->t('Please visit %s to view and/or reply to the conversation.');
|
||||||
$tsitelink = sprintf($sitelink, $siteurl);
|
$tsitelink = sprintf($sitelink, $siteurl);
|
||||||
$hsitelink = sprintf($sitelink, '<a href="' . $siteurl . '">' . $sitename . '</a>');
|
$hsitelink = sprintf($sitelink, '<a href="' . $siteurl . '">' . $sitename . '</a>');
|
||||||
$itemlink = $params['link'];
|
$itemlink = $params['link'];
|
||||||
}
|
break;
|
||||||
|
|
||||||
if ($params['type'] == Notification\Type::WALL) {
|
case Notification\Type::WALL:
|
||||||
$subject = $l10n->t('%s %s posted to your profile wall', $subjectPrefix, $params['source_name']);
|
$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);
|
$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]',
|
$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, '<a href="'.$siteurl.'">'.$sitename.'</a>');
|
|
||||||
$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].',
|
|
||||||
'[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
|
'[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
|
||||||
$params['link']
|
$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);
|
$sitelink = $l10n->t('Please visit %s to view and/or reply to the conversation.');
|
||||||
$epreamble = $l10n->t('%1$s [url=%2$s]shared a post[/url] from %3$s.',
|
$tsitelink = sprintf($sitelink, $siteurl);
|
||||||
|
$hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'">'.$sitename.'</a>');
|
||||||
|
$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]',
|
'[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.');
|
$subject = str_replace('poked', $l10n->t($params['activity']), $subject);
|
||||||
$tsitelink = sprintf($sitelink, $siteurl);
|
$preamble = str_replace('poked', $l10n->t($params['activity']), $preamble);
|
||||||
$hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'">'.$sitename.'</a>');
|
$epreamble = str_replace('poked', $l10n->t($params['activity']), $epreamble);
|
||||||
$itemlink = $params['link'];
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($params['type'] == Notification\Type::POKE) {
|
$sitelink = $l10n->t('Please visit %s to view and/or reply to the conversation.');
|
||||||
$subject = $l10n->t('%1$s %2$s poked you', $subjectPrefix, $params['source_name']);
|
$tsitelink = sprintf($sitelink, $siteurl);
|
||||||
|
$hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'">'.$sitename.'</a>');
|
||||||
$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, '<a href="'.$siteurl.'">'.$sitename.'</a>');
|
|
||||||
$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, '<a href="'.$siteurl.'">'.$sitename.'</a>');
|
|
||||||
}
|
|
||||||
|
|
||||||
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, '<a href="'.$siteurl.'">'.$sitename.'</a>');
|
|
||||||
|
|
||||||
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, '<a href="'.$siteurl.'">'.$sitename.'</a>');
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($params['type'] == Notification\Type::CONFIRM) {
|
|
||||||
if ($params['verb'] == Activity::FRIEND) { // mutual connection
|
|
||||||
$itemlink = $params['link'];
|
$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);
|
case Notification\Type::INTRO:
|
||||||
$epreamble = $l10n->t('%2$s has accepted your [url=%1$s]connection request[/url].',
|
$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,
|
$itemlink,
|
||||||
'[url='.$params['source_link'].']'.$params['source_name'].'[/url]'
|
'[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);
|
$tsitelink = sprintf($sitelink, $siteurl);
|
||||||
$hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'">'.$sitename.'</a>');
|
$hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'">'.$sitename.'</a>');
|
||||||
} 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);
|
switch ($params['verb']) {
|
||||||
$epreamble = $l10n->t('%2$s has accepted your [url=%1$s]connection request[/url].',
|
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,
|
$itemlink,
|
||||||
|
'[url='.$params['item']['url'].']'.$params['item']['name'].'[/url]',
|
||||||
'[url='.$params['source_link'].']'.$params['source_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 = $l10n->t('Name:').' '.$params['item']['name']."\n";
|
||||||
$body .= "\n\n";
|
$body .= $l10n->t('Photo:').' '.$params['item']['photo']."\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('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);
|
$tsitelink = sprintf($sitelink, $siteurl);
|
||||||
$hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'">'.$sitename.'</a>');
|
$hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'">'.$sitename.'</a>');
|
||||||
}
|
break;
|
||||||
}
|
|
||||||
|
|
||||||
if ($params['type'] == Notification\Type::SYSTEM) {
|
case Notification\Type::CONFIRM:
|
||||||
switch($params['event']) {
|
if ($params['verb'] == Activity::FRIEND) { // mutual connection
|
||||||
case "SYSTEM_REGISTER_REQUEST":
|
|
||||||
$itemlink = $params['link'];
|
$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);
|
$preamble = $l10n->t('\'%1$s\' has accepted your connection request at %2$s', $params['source_name'], $sitename);
|
||||||
$epreamble = $l10n->t('You\'ve received a [url=%1$s]registration request[/url] from %2$s.',
|
$epreamble = $l10n->t('%2$s has accepted your [url=%1$s]connection request[/url].',
|
||||||
$itemlink,
|
$itemlink,
|
||||||
'[url='.$params['source_link'].']'.$params['source_name'].'[/url]'
|
'[url='.$params['source_link'].']'.$params['source_name'].'[/url]'
|
||||||
);
|
);
|
||||||
|
|
||||||
$body = $l10n->t("Full Name: %s\nSite Location: %s\nLogin Name: %s (%s)",
|
$body = $l10n->t('You are now mutual friends and may exchange status updates, photos, and email without restriction.');
|
||||||
$params['source_name'],
|
|
||||||
$siteurl, $params['source_mail'],
|
$sitelink = $l10n->t('Please visit %s if you wish to make any changes to this relationship.');
|
||||||
$params['source_nick']
|
$tsitelink = sprintf($sitelink, $siteurl);
|
||||||
|
$hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'">'.$sitename.'</a>');
|
||||||
|
} 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.');
|
$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']);
|
||||||
$tsitelink = sprintf($sitelink, $params['link']);
|
$body .= "\n\n";
|
||||||
$hsitelink = sprintf($sitelink, '<a href="'.$params['link'].'">'.$sitename.'</a><br><br>');
|
$body .= $l10n->t('\'%1$s\' may choose to extend this into a two-way or more permissive relationship in the future.', $params['source_name']);
|
||||||
break;
|
|
||||||
case "SYSTEM_DB_UPDATE_FAIL":
|
$sitelink = $l10n->t('Please visit %s if you wish to make any changes to this relationship.');
|
||||||
break;
|
$tsitelink = sprintf($sitelink, $siteurl);
|
||||||
}
|
$hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'">'.$sitename.'</a>');
|
||||||
|
}
|
||||||
|
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, '<a href="'.$params['link'].'">'.$sitename.'</a><br><br>');
|
||||||
|
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);
|
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']);
|
$contact = Contact::getById($notification['actor-id'], ['url', 'name', 'photo']);
|
||||||
if (DBA::isResult($contact)) {
|
if (DBA::isResult($contact)) {
|
||||||
$params['source_link'] = $params['origin_link'] = $contact['url'];
|
$params['source_link'] = $contact['url'];
|
||||||
$params['source_name'] = $params['origin_name'] = $contact['name'];
|
$params['source_name'] = $contact['name'];
|
||||||
$params['source_photo'] = $params['origin_photo'] = $contact['photo'];
|
$params['source_photo'] = $contact['photo'];
|
||||||
}
|
}
|
||||||
|
|
||||||
$item = Post::selectFirstForUser($notification['uid'], Item::ITEM_FIELDLIST,
|
$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);
|
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);
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -1160,8 +1160,6 @@ class Item
|
||||||
|
|
||||||
Post\UserNotification::setNotification($posted_item['uri-id'], $posted_item['uid']);
|
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
|
// Distribute items to users who subscribed to their tags
|
||||||
self::distributeByTags($posted_item);
|
self::distributeByTags($posted_item);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue