mirror of
https://github.com/friendica/friendica
synced 2024-12-31 16:42:19 +00:00
The desktop notifications have been reworked
This commit is contained in:
Michael
parent
632d1024f7
commit
42de5c77d0
7 changed files with 476 additions and 290 deletions
|
|
@ -32,6 +32,7 @@ use Friendica\Model\Item;
|
|||
use Friendica\Model\Notification;
|
||||
use Friendica\Model\Post;
|
||||
use Friendica\Model\User;
|
||||
use Friendica\Model\Verb;
|
||||
use Friendica\Protocol\Activity;
|
||||
|
||||
/**
|
||||
|
|
@ -69,8 +70,6 @@ function notification($params)
|
|||
return false;
|
||||
}
|
||||
|
||||
$nickname = $user['nickname'];
|
||||
|
||||
$params['notify_flags'] = $user['notify-flags'];
|
||||
$params['language'] = $user['language'];
|
||||
$params['to_name'] = $user['username'];
|
||||
|
|
@ -100,26 +99,14 @@ function notification($params)
|
|||
$siteurl = DI::baseUrl()->get(true);
|
||||
$sitename = DI::config()->get('config', 'sitename');
|
||||
|
||||
$hostname = DI::baseUrl()->getHostname();
|
||||
if (strpos($hostname, ':')) {
|
||||
$hostname = substr($hostname, 0, strpos($hostname, ':'));
|
||||
}
|
||||
|
||||
// Creates a new email builder for the notification email
|
||||
$emailBuilder = DI::emailer()->newNotifyMail();
|
||||
|
||||
// with $params['show_in_notification_page'] == false, the notification isn't inserted into
|
||||
// the database, and an email is sent if applicable.
|
||||
// default, if not specified: true
|
||||
$show_in_notification_page = isset($params['show_in_notification_page']) ? $params['show_in_notification_page'] : true;
|
||||
|
||||
$emailBuilder->setHeader('X-Friendica-Account', '<' . $nickname . '@' . $hostname . '>');
|
||||
|
||||
$title = $params['item']['title'] ?? '';
|
||||
$body = $params['item']['body'] ?? '';
|
||||
|
||||
$item_id = $params['item']['id'] ?? 0;
|
||||
$uri_id = $params['item']['uri-id'] ?? 0;
|
||||
$parent_id = $params['item']['parent'] ?? 0;
|
||||
$parent_uri_id = $params['item']['parent-uri-id'] ?? 0;
|
||||
|
||||
|
|
@ -147,20 +134,21 @@ function notification($params)
|
|||
$show_in_notification_page = 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;
|
||||
}
|
||||
|
||||
// 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
|
||||
// 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;
|
||||
}
|
||||
}
|
||||
|
||||
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;
|
||||
|
|
@ -442,6 +430,34 @@ function notification($params)
|
|||
}
|
||||
}
|
||||
|
||||
return notification_store_and_send($params, $sitelink, $tsitelink, $hsitelink, $title, $subject, $preamble, $epreamble, $body, $itemlink, $show_in_notification_page);
|
||||
}
|
||||
|
||||
function notification_store_and_send($params, $sitelink, $tsitelink, $hsitelink, $title, $subject, $preamble, $epreamble, $body, $itemlink, $show_in_notification_page)
|
||||
{
|
||||
$item_id = $params['item']['id'] ?? 0;
|
||||
$uri_id = $params['item']['uri-id'] ?? 0;
|
||||
$parent_id = $params['item']['parent'] ?? 0;
|
||||
$parent_uri_id = $params['item']['parent-uri-id'] ?? 0;
|
||||
|
||||
// Ensure that the important fields are set at any time
|
||||
$fields = ['nickname'];
|
||||
$user = User::getById($params['uid'], $fields);
|
||||
|
||||
$sitename = DI::config()->get('config', 'sitename');
|
||||
|
||||
$nickname = $user['nickname'];
|
||||
|
||||
$hostname = DI::baseUrl()->getHostname();
|
||||
if (strpos($hostname, ':')) {
|
||||
$hostname = substr($hostname, 0, strpos($hostname, ':'));
|
||||
}
|
||||
|
||||
// Creates a new email builder for the notification email
|
||||
$emailBuilder = DI::emailer()->newNotifyMail();
|
||||
|
||||
$emailBuilder->setHeader('X-Friendica-Account', '<' . $nickname . '@' . $hostname . '>');
|
||||
|
||||
$subject .= " (".$nickname."@".$hostname.")";
|
||||
|
||||
$h = [
|
||||
|
|
@ -529,8 +545,8 @@ function notification($params)
|
|||
DBA::insert('notify-threads', $fields);
|
||||
|
||||
$emailBuilder->setHeader('Message-ID', $message_id);
|
||||
$log_msg = "include/enotify: No previous notification found for this parent:\n" .
|
||||
" parent: ${params['parent']}\n" . " uid : ${params['uid']}\n";
|
||||
$log_msg = "include/enotify: No previous notification found for this parent:\n" .
|
||||
" parent: ${params['parent']}\n" . " uid : ${params['uid']}\n";
|
||||
Logger::log($log_msg, Logger::DEBUG);
|
||||
} else {
|
||||
// If not, just "follow" the thread.
|
||||
|
|
@ -587,6 +603,102 @@ function notification($params)
|
|||
return false;
|
||||
}
|
||||
|
||||
function notification_from_array(array $notification)
|
||||
{
|
||||
if ($notification['type'] == Post\UserNotification::NOTIF_NONE) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$params = [];
|
||||
$params['verb'] = Verb::getByID($notification['vid']);
|
||||
|
||||
$params['uid'] = $notification['uid'];
|
||||
$params['otype'] = Notification\ObjectType::ITEM;
|
||||
|
||||
$user = User::getById($notification['uid']);
|
||||
|
||||
$params['notify_flags'] = $user['notify-flags'];
|
||||
$params['language'] = $user['language'];
|
||||
$params['to_name'] = $user['username'];
|
||||
$params['to_email'] = $user['email'];
|
||||
|
||||
// from here on everything is in the recipients language
|
||||
$l10n = DI::l10n()->withLang($user['language']);
|
||||
|
||||
$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'];
|
||||
}
|
||||
|
||||
$item = Post::selectFirstForUser($notification['uid'], Item::ITEM_FIELDLIST,
|
||||
['uid' => [0, $notification['uid']], 'uri-id' => $notification['target-uri-id'], 'deleted' => false],
|
||||
['order' => ['uid' => true]]);
|
||||
if (empty($item)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$params['item'] = $item;
|
||||
$params['parent'] = $item['parent'];
|
||||
$params['link'] = DI::baseUrl() . '/display/' . urlencode($item['guid']);
|
||||
|
||||
$subjectPrefix = $l10n->t('[Friendica:Notify]');
|
||||
|
||||
if (Post\ThreadUser::getIgnored($notification['parent-uri-id'], $notification['uid'])) {
|
||||
Logger::info('Thread is ignored', ['parent-uri-id' => $notification['parent-uri-id']]);
|
||||
return false;
|
||||
}
|
||||
|
||||
// Check to see if there was already a tag notify or comment notify for this post.
|
||||
// If so don't create a second notification
|
||||
$condition = ['type' => [Notification\Type::TAG_SELF, Notification\Type::COMMENT, Notification\Type::SHARE],
|
||||
'link' => $params['link'], 'uid' => $notification['uid']];
|
||||
if (DBA::exists('notify', $condition)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$content = Plaintext::getPost($item, 70);
|
||||
if (!empty($content['text'])) {
|
||||
$title = '"' . trim(str_replace("\n", " ", $content['text'])) . '"';
|
||||
} else {
|
||||
$title = $item['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 ($notification['type'] == Post\UserNotification::NOTIF_EXPLICIT_TAGGED) {
|
||||
$params['type'] = Notification\Type::TAG_SELF;
|
||||
$subject = $l10n->t('%s %s tagged you', $subjectPrefix, $contact['name']);
|
||||
} elseif ($notification['type'] == Post\UserNotification::NOTIF_SHARED) {
|
||||
$params['type'] = Notification\Type::SHARE;
|
||||
$subject = $l10n->t('%s %s shared a new post', $subjectPrefix, $contact['name']);
|
||||
} else {
|
||||
$params['type'] = Notification\Type::COMMENT;
|
||||
$subject = $l10n->t('%1$s Comment to conversation #%2$d by %3$s', $subjectPrefix, $item['parent'], $contact['name']);
|
||||
}
|
||||
|
||||
$msg = Notification::getMessage($notification);
|
||||
if (empty($msg)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$preamble = $msg['plain'];
|
||||
$epreamble = $msg['rich'];
|
||||
|
||||
$sitename = DI::config()->get('config', 'sitename');
|
||||
$siteurl = DI::baseUrl()->get(true);
|
||||
|
||||
$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'];
|
||||
|
||||
return notification_store_and_send($params, $sitelink, $tsitelink, $hsitelink, $title, $subject, $preamble, $epreamble, $item['body'], $itemlink, true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks for users who should be notified
|
||||
*
|
||||
|
|
|
|||
|
|
@ -262,6 +262,9 @@ function settings_post(App $a)
|
|||
$unlisted = (($_POST['unlisted'] == 1) ? 1: 0);
|
||||
$accessiblephotos = (($_POST['accessible-photos'] == 1) ? 1: 0);
|
||||
|
||||
$notify_like = (($_POST['notify_like'] == 1) ? 1 : 0);
|
||||
$notify_announce = (($_POST['notify_announce'] == 1) ? 1 : 0);
|
||||
|
||||
$email_textonly = (($_POST['email_textonly'] == 1) ? 1 : 0);
|
||||
$detailed_notif = (($_POST['detailed_notif'] == 1) ? 1 : 0);
|
||||
|
||||
|
|
@ -358,6 +361,9 @@ function settings_post(App $a)
|
|||
DI::pConfig()->set(local_user(), 'expire', 'photos', $expire_photos);
|
||||
DI::pConfig()->set(local_user(), 'expire', 'network_only', $expire_network_only);
|
||||
|
||||
DI::pConfig()->set(local_user(), 'system', 'notify_like', $notify_like);
|
||||
DI::pConfig()->set(local_user(), 'system', 'notify_announce', $notify_announce);
|
||||
|
||||
DI::pConfig()->set(local_user(), 'system', 'email_textonly', $email_textonly);
|
||||
DI::pConfig()->set(local_user(), 'system', 'detailed_notif', $detailed_notif);
|
||||
DI::pConfig()->set(local_user(), 'system', 'notify_ignored', $notify_ignored);
|
||||
|
|
@ -771,6 +777,10 @@ function settings_content(App $a)
|
|||
'$notify7' => ['notify7', DI::l10n()->t('You are tagged in a post'), ($notify & Notification\Type::TAG_SELF), Notification\Type::TAG_SELF, ''],
|
||||
'$notify8' => ['notify8', DI::l10n()->t('You are poked/prodded/etc. in a post'), ($notify & Notification\Type::POKE), Notification\Type::POKE, ''],
|
||||
|
||||
'$lbl_notify' => DI::l10n()->t('Create a desktop notification when:'),
|
||||
'$notify_like' => ['notify_like', DI::l10n()->t('Someone liked your content'), DI::pConfig()->get(local_user(), 'system', 'notify_like'), ''],
|
||||
'$notify_announce' => ['notify_announce', DI::l10n()->t('Someone shared your content'), DI::pConfig()->get(local_user(), 'system', 'notify_announce'), ''],
|
||||
|
||||
'$desktop_notifications' => ['desktop_notifications', DI::l10n()->t('Activate desktop notifications') , false, DI::l10n()->t('Show desktop popup on new notifications')],
|
||||
|
||||
'$email_textonly' => ['email_textonly', DI::l10n()->t('Text-only notification emails'),
|
||||
|
|
|
|||
|
|
@ -182,7 +182,7 @@ class Notification extends BaseModel
|
|||
return $message;
|
||||
}
|
||||
|
||||
$contact = Contact::getById($notification['actor-id']);
|
||||
$causer = $contact = Contact::getById($notification['actor-id'], ['id', 'name', 'url']);
|
||||
if (empty($contact)) {
|
||||
Logger::info('Contact not found', ['contact' => $notification['actor-id']]);
|
||||
return $message;
|
||||
|
|
@ -193,7 +193,7 @@ class Notification extends BaseModel
|
|||
$announce = Verb::getID(Activity::ANNOUNCE);
|
||||
$post = Verb::getID(Activity::POST);
|
||||
|
||||
if (in_array($notification['type'], [Post\UserNotification::NOTIF_THREAD_COMMENT, Post\UserNotification::NOTIF_COMMENT_PARTICIPATION])) {
|
||||
if (in_array($notification['type'], [Post\UserNotification::NOTIF_THREAD_COMMENT, Post\UserNotification::NOTIF_COMMENT_PARTICIPATION, Post\UserNotification::NOTIF_EXPLICIT_TAGGED])) {
|
||||
$item = Post::selectFirst([], ['uri-id' => $notification['parent-uri-id'], 'uid' => [0, $notification['uid']]]);
|
||||
if (empty($item)) {
|
||||
Logger::info('Parent post not found', ['uri-id' => $notification['parent-uri-id']]);
|
||||
|
|
@ -215,6 +215,14 @@ class Notification extends BaseModel
|
|||
}
|
||||
}
|
||||
|
||||
if (($notification['type'] == Post\UserNotification::NOTIF_SHARED) && !empty($item['causer-id'])) {
|
||||
$causer = Contact::getById($item['causer-id'], ['id', 'name', 'url']);
|
||||
if (empty($contact)) {
|
||||
Logger::info('Causer not found', ['causer' => $item['causer-id']]);
|
||||
return $message;
|
||||
}
|
||||
}
|
||||
|
||||
$link = DI::baseUrl() . '/display/' . urlencode($item['guid']);
|
||||
|
||||
$content = Plaintext::getPost($item, 70);
|
||||
|
|
@ -288,7 +296,11 @@ class Notification extends BaseModel
|
|||
break;
|
||||
|
||||
case Post\UserNotification::NOTIF_SHARED:
|
||||
if ($title != '') {
|
||||
if (($causer['id'] != $contact['id']) && ($title != '')) {
|
||||
$msg = $l10n->t('%1$s shared the post %2$s from %3$s');
|
||||
} elseif ($causer['id'] != $contact['id']) {
|
||||
$msg = $l10n->t('%1$s shared a post from %3$s');
|
||||
} elseif ($title != '') {
|
||||
$msg = $l10n->t('%1$s shared the post %2$s');
|
||||
} else {
|
||||
$msg = $l10n->t('%1$s shared a post');
|
||||
|
|
@ -300,15 +312,16 @@ class Notification extends BaseModel
|
|||
|
||||
if (!empty($msg)) {
|
||||
// Name of the notification's causer
|
||||
$message['causer'] = $contact['name'];
|
||||
$message['causer'] = $causer['name'];
|
||||
// Format for the "ping" mechanism
|
||||
$message['notification'] = sprintf($msg, '{0}', $title);
|
||||
$message['notification'] = sprintf($msg, '{0}', $title, $contact['name']);
|
||||
// Plain text for the web push api
|
||||
$message['plain'] = sprintf($msg, $contact['name'], $title);
|
||||
$message['plain'] = sprintf($msg, $causer['name'], $title, $contact['name']);
|
||||
// Rich text for other purposes
|
||||
$message['rich'] = sprintf($msg,
|
||||
'[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]',
|
||||
'[url=' . $link . ']' . $title . '[/url]');
|
||||
'[url=' . $causer['url'] . ']' . $causer['name'] . '[/url]',
|
||||
'[url=' . $link . ']' . $title . '[/url]',
|
||||
'[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]');
|
||||
}
|
||||
|
||||
return $message;
|
||||
|
|
|
|||
|
|
@ -142,6 +142,21 @@ class Subscription
|
|||
$notification = DBA::selectFirst('notification', [], ['id' => $nid]);
|
||||
|
||||
$type = Notification::getType($notification);
|
||||
|
||||
$desktop_notification = !in_array($type, ['reblog', 'favourite']);
|
||||
|
||||
if (DI::pConfig()->get($notification['uid'], 'system', 'notify_like') && ($type == 'favourite')) {
|
||||
$desktop_notification = true;
|
||||
}
|
||||
|
||||
if (DI::pConfig()->get($notification['uid'], 'system', 'notify_announce') && ($type == 'reblog')) {
|
||||
$desktop_notification = true;
|
||||
}
|
||||
|
||||
if ($desktop_notification) {
|
||||
notification_from_array($notification);
|
||||
}
|
||||
|
||||
if (empty($type)) {
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -98,6 +98,13 @@
|
|||
{{include file="field_intcheckbox.tpl" field=$notify8}}
|
||||
</div>
|
||||
|
||||
<div id="settings-notify-desc">{{$lbl_notify}}</div>
|
||||
|
||||
<div class="group">
|
||||
{{include file="field_checkbox.tpl" field=$notify_like}}
|
||||
{{include file="field_checkbox.tpl" field=$notify_announce}}
|
||||
</div>
|
||||
|
||||
{{include file="field_checkbox.tpl" field=$email_textonly}}
|
||||
{{include file="field_checkbox.tpl" field=$detailed_notif}}
|
||||
|
||||
|
|
|
|||
|
|
@ -147,6 +147,13 @@
|
|||
{{include file="field_intcheckbox.tpl" field=$notify8}}
|
||||
</div>
|
||||
|
||||
<div id="settings-notify-desc">{{$lbl_notify}}</div>
|
||||
|
||||
<div class="group">
|
||||
{{include file="field_checkbox.tpl" field=$notify_like}}
|
||||
{{include file="field_checkbox.tpl" field=$notify_announce}}
|
||||
</div>
|
||||
|
||||
{{include file="field_checkbox.tpl" field=$email_textonly}}
|
||||
{{include file="field_checkbox.tpl" field=$detailed_notif}}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue