]> git.mxchange.org Git - friendica.git/blobdiff - include/enotify.php
Merge pull request #10599 from annando/subscription
[friendica.git] / include / enotify.php
index 54bf48234169948a00242dcbfc47b51056abb589..cfc03626f585459fa4d121f4bb4a3144fe333537 100644 (file)
@@ -1,37 +1,54 @@
 <?php
 /**
- * @file include/enotify.php
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 use Friendica\Content\Text\BBCode;
+use Friendica\Content\Text\Plaintext;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Model\Contact;
 use Friendica\Model\Item;
-use Friendica\Model\ItemContent;
-use Friendica\Model\Notify;
+use Friendica\Model\Notification;
+use Friendica\Model\Post;
 use Friendica\Model\User;
-use Friendica\Model\UserItem;
-use Friendica\Object\Email;
 use Friendica\Protocol\Activity;
 
 /**
  * Creates a notification entry and possibly sends a mail
  *
  * @param array $params Array with the elements:
- *                      uid, item, parent, type, otype, verb, event,
- *                      link, subject, body, to_name, to_email, source_name,
- *                      source_link, activity, preamble, notify_flags,
- *                      language, show_in_notification_page
+ *                      type, event, otype, activity, verb, uid, cid, origin_cid, item, link,
+ *                      source_name, source_mail, source_nick, source_link, source_photo,
+ *                      show_in_notification_page
+ *
  * @return bool
  * @throws \Friendica\Network\HTTPException\InternalServerErrorException
  */
 function notification($params)
 {
-       $a = DI::app();
+       /** @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'])) {
@@ -39,7 +56,7 @@ function notification($params)
        }
 
        // Ensure that the important fields are set at any time
-       $fields = ['notify-flags', 'language', 'username', 'email'];
+       $fields = ['nickname', 'page-flags', 'notify-flags', 'language', 'username', 'email'];
        $user = DBA::selectFirst('user', $fields, ['uid' => $params['uid']]);
 
        if (!DBA::isResult($user)) {
@@ -47,74 +64,64 @@ function notification($params)
                return false;
        }
 
-       $params['notify_flags'] = ($params['notify_flags'] ?? '') ?: $user['notify-flags'];
-       $params['language']     = ($params['language']     ?? '') ?: $user['language'];
-       $params['to_name']      = ($params['to_name']      ?? '') ?: $user['username'];
-       $params['to_email']     = ($params['to_email']     ?? '') ?: $user['email'];
+       // There is no need to create notifications for forum accounts
+       if (in_array($user['page-flags'], [User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_PRVGROUP])) {
+               return false;
+       }
+
+       $nickname = $user['nickname'];
+
+       $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($params['language']);
 
-       $banner = $l10n->t('Friendica Notification');
-       $product = FRIENDICA_PLATFORM;
+       if (!empty($params['cid'])) {
+               $contact = Contact::getById($params['cid'], ['url', 'name', 'photo']);
+               if (DBA::isResult($contact)) {
+                       $params['source_link'] = $contact['url'];
+                       $params['source_name'] = $contact['name'];
+                       $params['source_photo'] = $contact['photo'];
+               }
+       }
+
+       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);
-       $thanks = $l10n->t('Thank You,');
        $sitename = DI::config()->get('config', 'sitename');
-       if (DI::config()->get('config', 'admin_name')) {
-               $site_admin = $l10n->t('%1$s, %2$s Administrator', DI::config()->get('config', 'admin_name'), $sitename);
-       } else {
-               $site_admin = $l10n->t('%s Administrator', $sitename);
-       }
 
-       $sender_name = $sitename;
        $hostname = DI::baseUrl()->getHostname();
        if (strpos($hostname, ':')) {
                $hostname = substr($hostname, 0, strpos($hostname, ':'));
        }
 
-       $sender_email = $a->getSenderEmailAddress();
-
-       $user = DBA::selectFirst('user', ['nickname', 'page-flags'],
-               ['uid' => $params['uid']]);
-
-       // There is no need to create notifications for forum accounts
-       if (!DBA::isResult($user) || in_array($user["page-flags"], [User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_PRVGROUP])) {
-               return false;
-       }
-       $nickname = $user["nickname"];
+       // 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;
 
-       $additional_mail_header = "";
-       $additional_mail_header .= "Precedence: list\n";
-       $additional_mail_header .= "X-Friendica-Host: ".$hostname."\n";
-       $additional_mail_header .= "X-Friendica-Account: <".$nickname."@".$hostname.">\n";
-       $additional_mail_header .= "X-Friendica-Platform: ".FRIENDICA_PLATFORM."\n";
-       $additional_mail_header .= "X-Friendica-Version: ".FRIENDICA_VERSION."\n";
-       $additional_mail_header .= "List-ID: <notification.".$hostname.">\n";
-       $additional_mail_header .= "List-Archive: <".DI::baseUrl()."/notifications/system>\n";
-
-       if (array_key_exists('item', $params)) {
-               $title = $params['item']['title'];
-               $body = $params['item']['body'];
-       } else {
-               $title = $body = '';
-       }
+       $emailBuilder->setHeader('X-Friendica-Account', '<' . $nickname . '@' . $hostname . '>');
 
-       if (isset($params['item']['id'])) {
-               $item_id = $params['item']['id'];
-       } else {
-               $item_id = 0;
-       }
+       $title = $params['item']['title'] ?? '';
+       $body = $params['item']['body'] ?? '';
 
-       if (isset($params['parent'])) {
-               $parent_id = $params['parent'];
-       } else {
-               $parent_id = 0;
-       }
+       $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;
 
        $epreamble = '';
        $preamble  = '';
@@ -124,31 +131,32 @@ function notification($params)
        $hsitelink = '';
        $itemlink  = '';
 
-       if ($params['type'] == NOTIFY_MAIL) {
-               $itemlink = $siteurl.'/message/'.$params['item']['id'];
-               $params["link"] = $itemlink;
+       if ($params['type'] == Notification\Type::MAIL) {
+               $itemlink = $params['link'];
 
-               $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]');
 
                $sitelink = $l10n->t('Please visit %s to view and/or reply to your private messages.');
-               $tsitelink = sprintf($sitelink, $siteurl.'/message/'.$params['item']['id']);
-               $hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'/message/'.$params['item']['id'].'">'.$sitename.'</a>');
+               $tsitelink = sprintf($sitelink, $itemlink);
+               $hsitelink = sprintf($sitelink, '<a href="' . $itemlink . '">' . $sitename . '</a>');
+
+               // Mail notifications aren't using the "notify" table entry
+               $show_in_notification_page = false;
        }
 
-       if ($params['type'] == NOTIFY_COMMENT || $params['type'] == NOTIFY_TAGSELF) {
-               $thread = Item::selectFirstThreadForUser($params['uid'], ['ignored'], ['iid' => $parent_id, 'deleted' => false]);
-               if (DBA::isResult($thread) && $thread['ignored']) {
-                       Logger::log('Thread ' . $parent_id . ' will be ignored', Logger::DEBUG);
+       if ($params['type'] == Notification\Type::COMMENT || $params['type'] == Notification\Type::TAG_SELF) {
+               if (Post\ThreadUser::getIgnored($parent_uri_id, $params['uid'])) {
+                       Logger::info('Thread is ignored', ['parent' => $parent_id, 'parent-uri-id' => $parent_uri_id]);
                        return false;
                }
 
                // Check to see if there was already a tag notify or comment notify for this post.
                // If so don't create a second notification
                /// @todo In the future we should store the notification with the highest "value" and replace notifications
-               $condition = ['type' => [NOTIFY_TAGSELF, NOTIFY_COMMENT, NOTIFY_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;
@@ -156,17 +164,17 @@ function notification($params)
 
                // if it's a post figure out who's post it is.
                $item = null;
-               if ($params['otype'] === Notify::OTYPE_ITEM && $parent_id) {
-                       $item = Item::selectFirstForUser($params['uid'], Item::ITEM_FIELDLIST, ['id' => $parent_id, 'deleted' => false]);
+               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;
                }
 
-               $item_post_type = Item::postType($item);
+               $item_post_type = Item::postType($item, $l10n);
 
-               $content = ItemContent::getPlaintextPost($item, 70);
+               $content = Plaintext::getPost($item, 70);
                if (!empty($content['text'])) {
                        $title = '"' . trim(str_replace("\n", " ", $content['text'])) . '"';
                } else {
@@ -176,52 +184,52 @@ function notification($params)
                // First go for the general message
 
                // "George Bull's post"
-               if ($params['activity']['origin_comment']) {
-                       $message = '%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';
+               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 = '%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';
-                       } elseif ($params['activity']['explicit_tagged']) {
-                               $message = '%1$s tagged you on your %2$s %3$s';
+               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 = '%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';
-                       } elseif ($params['activity']['explicit_tagged']) {
-                               $message = '%1$s tagged you on their %2$s %3$s';
+                       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 = '%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.
                // So, we cannot have different subjects for notifications of the same thread.
                // Before this we have the name of the replier on the subject rendering
                // different subjects for messages on the same thread.
-               if ($params['activity']['explicit_tagged']) {
-                       $subject = $l10n->t('[Friendica:Notify] %s tagged you', $params['source_name']);
+               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('[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']);
                }
@@ -234,8 +242,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'] == 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]',
@@ -249,14 +257,24 @@ 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'] == 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]',
-                       $params['link']
-               );
+                       $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]',
+                               $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.',
+                               '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
+                               $params['link'], '[url='.$params['origin_link'].']'.$params['origin_name'].'[/url]'
+                       );
+               }
 
                $sitelink = $l10n->t('Please visit %s to view and/or reply to the conversation.');
                $tsitelink = sprintf($sitelink, $siteurl);
@@ -264,8 +282,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'] == 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].',
@@ -283,9 +301,9 @@ function notification($params)
                $itemlink =  $params['link'];
        }
 
-       if ($params['type'] == NOTIFY_TAGSHARE) {
+       if ($params['type'] == Notification\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]',
@@ -298,9 +316,9 @@ function notification($params)
                $hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'">'.$sitename.'</a>');
        }
 
-       if ($params['type'] == NOTIFY_INTRO) {
+       if ($params['type'] == Notification\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.',
@@ -317,7 +335,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',
@@ -327,7 +345,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',
@@ -341,9 +359,9 @@ function notification($params)
                }
        }
 
-       if ($params['type'] == NOTIFY_SUGGEST) {
+       if ($params['type'] == Notification\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.',
@@ -361,10 +379,10 @@ function notification($params)
                $hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'">'.$sitename.'</a>');
        }
 
-       if ($params['type'] == NOTIFY_CONFIRM) {
+       if ($params['type'] == Notification\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].',
@@ -379,7 +397,7 @@ function notification($params)
                        $hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'">'.$sitename.'</a>');
                } 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].',
@@ -397,7 +415,7 @@ function notification($params)
                }
        }
 
-       if ($params['type'] == NOTIFY_SYSTEM) {
+       if ($params['type'] == Notification\Type::SYSTEM) {
                switch($params['event']) {
                        case "SYSTEM_REGISTER_REQUEST":
                                $itemlink =  $params['link'];
@@ -454,19 +472,35 @@ function notification($params)
        $notify_id = 0;
 
        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'] ?? '',
-               ]);
+               $fields = [
+                       'name'          => $params['source_name'] ?? '',
+                       'name_cache'    => substr(strip_tags(BBCode::convertForUriId($uri_id, $params['source_name'])), 0, 255),
+                       'url'           => $params['source_link'] ?? '',
+                       'photo'         => $params['source_photo'] ?? '',
+                       'link'          => $itemlink ?? '',
+                       'uid'           => $params['uid'] ?? 0,
+                       'type'          => $params['type'] ?? '',
+                       'verb'          => $params['verb'] ?? '',
+                       'otype'         => $params['otype'] ?? '',
+               ];
+               if (!empty($item_id)) {
+                       $fields['iid'] = $item_id;
+               }
+               if (!empty($uri_id)) {
+                       $fields['uri-id'] = $uri_id;
+               }
+               if (!empty($parent_id)) {
+                       $fields['parent'] = $parent_id;
+               }
+               if (!empty($parent_uri_id)) {
+                       $fields['parent-uri-id'] = $parent_uri_id;
+               }
+               $notification = DI::notify()->insert($fields);
+
+               // 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]);
 
@@ -478,100 +512,73 @@ function notification($params)
 
        // send email notification if notification preferences permit
        if ((intval($params['notify_flags']) & intval($params['type']))
-               || $params['type'] == NOTIFY_SYSTEM) {
+               || $params['type'] == Notification\Type::SYSTEM) {
 
                Logger::log('sending notification email');
 
                if (isset($params['parent']) && (intval($params['parent']) != 0)) {
-                       $id_for_parent = $params['parent'] . "@" . $hostname;
+                       $parent = Post::selectFirst(['guid'], ['id' => $params['parent']]);
+                       $message_id = "<" . $parent['guid'] . "@" . gethostname() . ">";
 
                        // Is this the first email notification for this parent item and user?
-                       if (!DBA::exists('notify-threads', ['master-parent-item' => $params['parent'], 'receiver-uid' => $params['uid']])) {
+                       if (!DBA::exists('notify-threads', ['master-parent-uri-id' => $parent_uri_id, 'receiver-uid' => $params['uid']])) {
                                Logger::log("notify_id:" . intval($notify_id) . ", parent: " . intval($params['parent']) . "uid: " . intval($params['uid']), Logger::DEBUG);
 
-                               $fields = ['notify-id'    => $notify_id, 'master-parent-item' => $params['parent'],
-                                          'receiver-uid' => $params['uid'], 'parent-item' => 0];
+                               $fields = ['notify-id' => $notify_id, '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";
+                               $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";
                                Logger::log($log_msg, Logger::DEBUG);
                        } else {
                                // If not, just "follow" the thread.
-                               $additional_mail_header .= "References: <${id_for_parent}>\nIn-Reply-To: <${id_for_parent}>\n";
+                               $emailBuilder->setHeader('References', $message_id);
+                               $emailBuilder->setHeader('In-Reply-To', $message_id);
                                Logger::log("There's already a notification for this parent.", Logger::DEBUG);
                        }
                }
 
-               $textversion = BBCode::toPlaintext($body);
-               $htmlversion = BBCode::convert($body);
-
-               $datarray                 = [];
-               $datarray['banner']       = $banner;
-               $datarray['product']      = $product;
-               $datarray['preamble']     = $preamble;
-               $datarray['sitename']     = $sitename;
-               $datarray['siteurl']      = $siteurl;
-               $datarray['type']         = $params['type'];
-               $datarray['parent']       = $parent_id;
-               $datarray['source_name']  = $params['source_name'] ?? '';
-               $datarray['source_link']  = $params['source_link'] ?? '';
-               $datarray['source_photo'] = $params['source_photo'] ?? '';
-               $datarray['uid']          = $params['uid'];
-               $datarray['hsitelink']    = $hsitelink;
-               $datarray['tsitelink']    = $tsitelink;
-               $datarray['hitemlink']    = '<a href="' . $itemlink . '">' . $itemlink . '</a>';
-               $datarray['titemlink']    = $itemlink;
-               $datarray['thanks']       = $thanks;
-               $datarray['site_admin']   = $site_admin;
-               $datarray['title']        = stripslashes($title);
-               $datarray['htmlversion']  = $htmlversion;
-               $datarray['textversion']  = $textversion;
-               $datarray['subject']      = $subject;
-               $datarray['headers']      = $additional_mail_header;
+               $datarray = [
+                       'preamble'     => $preamble,
+                       'type'         => $params['type'],
+                       'parent'       => $parent_id,
+                       'source_name'  => $params['source_name'] ?? null,
+                       'source_link'  => $params['source_link'] ?? null,
+                       'source_photo' => $params['source_photo'] ?? null,
+                       'uid'          => $params['uid'],
+                       'hsitelink'    => $hsitelink,
+                       'tsitelink'    => $tsitelink,
+                       'itemlink'     => $itemlink,
+                       'title'        => $title,
+                       'body'         => $body,
+                       'subject'      => $subject,
+                       'headers'      => $emailBuilder->getHeaders(),
+               ];
 
                Hook::callAll('enotify_mail', $datarray);
 
-               // check whether sending post content in email notifications is allowed
-               $content_allowed = (!DI::config()->get('system', 'enotify_no_content'));
-
-               // load the template for private message notifications
-               $tpl             = Renderer::getMarkupTemplate('email/notify/html.tpl');
-               $email_html_body = Renderer::replaceMacros($tpl, [
-                       '$banner'          => $datarray['banner'],
-                       '$product'         => $datarray['product'],
-                       '$preamble'        => str_replace("\n", "<br>\n", $datarray['preamble']),
-                       '$sitename'        => $datarray['sitename'],
-                       '$siteurl'         => $datarray['siteurl'],
-                       '$source_name'     => $datarray['source_name'],
-                       '$source_link'     => $datarray['source_link'],
-                       '$source_photo'    => $datarray['source_photo'],
-                       '$hsitelink'       => $datarray['hsitelink'],
-                       '$hitemlink'       => $datarray['hitemlink'],
-                       '$thanks'          => $datarray['thanks'],
-                       '$site_admin'      => $datarray['site_admin'],
-                       '$title'           => $datarray['title'],
-                       '$htmlversion'     => $datarray['htmlversion'],
-                       '$content_allowed' => $content_allowed,
-               ]);
-
-               // load the template for private message notifications
-               $tpl             = Renderer::getMarkupTemplate('email/notify/text.tpl');
-               $email_text_body = Renderer::replaceMacros($tpl, [
-                       '$preamble'        => $datarray['preamble'],
-                       '$tsitelink'       => $datarray['tsitelink'],
-                       '$titemlink'       => $datarray['titemlink'],
-                       '$thanks'          => $datarray['thanks'],
-                       '$site_admin'      => $datarray['site_admin'],
-                       '$title'           => $datarray['title'],
-                       '$textversion'     => $datarray['textversion'],
-                       '$content_allowed' => $content_allowed,
-               ]);
-
-               $email = new Email($sender_name, $sender_email, $sender_email, $params['to_email'],
-                       $datarray['subject'], $email_html_body, $email_text_body,
-                       $datarray['headers'], $params['uid']);
+               $emailBuilder
+                       ->withHeaders($datarray['headers'])
+                       ->withRecipient($params['to_email'])
+                       ->forUser([
+                               'uid' => $datarray['uid'],
+                               'language' => $params['language'],
+                       ])
+                       ->withNotification($datarray['subject'], $datarray['preamble'], $datarray['title'], $datarray['body'])
+                       ->withSiteLink($datarray['tsitelink'], $datarray['hsitelink'])
+                       ->withItemLink($datarray['itemlink']);
+
+               // If a photo is present, add it to the email
+               if (!empty($datarray['source_photo'])) {
+                       $emailBuilder->withPhoto(
+                               $datarray['source_photo'],
+                               $datarray['source_link'] ?? $sitelink,
+                               $datarray['source_name'] ?? $sitename);
+               }
+
+               $email = $emailBuilder->build();
 
                // use the Emailer class to send the message
                return DI::emailer()->send($email);
@@ -583,81 +590,104 @@ function notification($params)
 /**
  * Checks for users who should be notified
  *
- * @param int $itemid ID of the item for which the check should be done
+ * @param int $uri_id URI ID of the item for which the check should be done
+ * @param int $uid    User ID of the item
  * @throws \Friendica\Network\HTTPException\InternalServerErrorException
  */
-function check_user_notification($itemid) {
-       // fetch all users with notifications
-       $useritems = DBA::select('user-item', ['uid', 'notification-type'], ['iid' => $itemid]);
-       while ($useritem = DBA::fetch($useritems)) {
-               check_item_notification($itemid, $useritem['uid'], $useritem['notification-type']);
+function check_user_notification(int $uri_id, int $uid) {
+       $condition = ['uri-id' => $uri_id];
+
+       // fetch all users with notifications on public posts
+       if ($uid != 0) {
+               $condition['uid'] = $uid;
+       }
+
+       $usernotifications = DBA::select('post-user-notification', ['uri-id', 'uid', 'notification-type'], $condition);
+       while ($usernotification = DBA::fetch($usernotifications)) {
+               check_item_notification($usernotification['uri-id'], $usernotification['uid'], $usernotification['notification-type'], $uid);
        }
-       DBA::close($useritems);
+       DBA::close($usernotifications);
 }
 
 /**
  * Checks for item related notifications and sends them
  *
- * @param int    $itemid            ID of the item for which the check should be done
+ * @param int    $uri_id            URI ID of the item for which the check should be done
  * @param int    $uid               User ID
  * @param int    $notification_type Notification bits
  * @return bool
  * @throws \Friendica\Network\HTTPException\InternalServerErrorException
  */
-function check_item_notification($itemid, $uid, $notification_type) {
-       $fields = ['id', 'mention', 'tag', 'parent', '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];
-       $item = Item::selectFirstForUser($uid, $fields, $condition);
+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['parent'] = $item['parent'];
        $params['link'] = DI::baseUrl() . '/display/' . urlencode($item['guid']);
-       $params['otype'] = 'item';
-       $params['source_name'] = $item['author-name'];
-       $params['source_link'] = $item['author-link'];
-       $params['source_photo'] = $item['author-avatar'];
 
        // Set the activity flags
-       $params['activity']['explicit_tagged'] = ($notification_type & UserItem::NOTIF_EXPLICIT_TAGGED);
-       $params['activity']['implicit_tagged'] = ($notification_type & UserItem::NOTIF_IMPLICIT_TAGGED);
-       $params['activity']['origin_comment'] = ($notification_type & UserItem::NOTIF_DIRECT_COMMENT);
-       $params['activity']['origin_thread'] = ($notification_type & UserItem::NOTIF_THREAD_COMMENT);
-       $params['activity']['thread_comment'] = ($notification_type & UserItem::NOTIF_COMMENT_PARTICIPATION);
-       $params['activity']['thread_activity'] = ($notification_type & UserItem::NOTIF_ACTIVITY_PARTICIPATION);
+       $params['activity']['explicit_tagged'] = ($notification_type & Post\UserNotification::NOTIF_EXPLICIT_TAGGED);
+       $params['activity']['implicit_tagged'] = ($notification_type & Post\UserNotification::NOTIF_IMPLICIT_TAGGED);
+       $params['activity']['origin_comment'] = ($notification_type & Post\UserNotification::NOTIF_DIRECT_COMMENT);
+       $params['activity']['origin_thread'] = ($notification_type & Post\UserNotification::NOTIF_THREAD_COMMENT);
+       $params['activity']['thread_comment'] = ($notification_type & Post\UserNotification::NOTIF_COMMENT_PARTICIPATION);
+       $params['activity']['thread_activity'] = ($notification_type & Post\UserNotification::NOTIF_ACTIVITY_PARTICIPATION);
 
        // Tagging a user in a direct post (first comment level) means a direct comment
-       if ($params['activity']['explicit_tagged'] && ($notification_type & UserItem::NOTIF_DIRECT_THREAD_COMMENT)) {
+       if ($params['activity']['explicit_tagged'] && ($notification_type & Post\UserNotification::NOTIF_DIRECT_THREAD_COMMENT)) {
                $params['activity']['origin_comment'] = true;
        }
 
-       if ($notification_type & UserItem::NOTIF_SHARED) {
-               $params['type'] = NOTIFY_SHARE;
+       if ($notification_type & Post\UserNotification::NOTIF_SHARED) {
+               $params['type'] = Notification\Type::SHARE;
                $params['verb'] = Activity::POST;
-       } elseif ($notification_type & UserItem::NOTIF_EXPLICIT_TAGGED) {
-               $params['type'] = NOTIFY_TAGSELF;
+
+               // 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 & UserItem::NOTIF_IMPLICIT_TAGGED) {
-               $params['type'] = NOTIFY_COMMENT;
+       } elseif ($notification_type & Post\UserNotification::NOTIF_IMPLICIT_TAGGED) {
+               $params['type'] = Notification\Type::COMMENT;
                $params['verb'] = Activity::POST;
-       } elseif ($notification_type & UserItem::NOTIF_THREAD_COMMENT) {
-               $params['type'] = NOTIFY_COMMENT;
+       } elseif ($notification_type & Post\UserNotification::NOTIF_THREAD_COMMENT) {
+               $params['type'] = Notification\Type::COMMENT;
                $params['verb'] = Activity::POST;
-       } elseif ($notification_type & UserItem::NOTIF_DIRECT_COMMENT) {
-               $params['type'] = NOTIFY_COMMENT;
+       } elseif ($notification_type & Post\UserNotification::NOTIF_DIRECT_COMMENT) {
+               $params['type'] = Notification\Type::COMMENT;
                $params['verb'] = Activity::POST;
-       } elseif ($notification_type & UserItem::NOTIF_COMMENT_PARTICIPATION) {
-               $params['type'] = NOTIFY_COMMENT;
+       } elseif ($notification_type & Post\UserNotification::NOTIF_COMMENT_PARTICIPATION) {
+               $params['type'] = Notification\Type::COMMENT;
                $params['verb'] = Activity::POST;
-       } elseif ($notification_type & UserItem::NOTIF_ACTIVITY_PARTICIPATION) {
-               $params['type'] = NOTIFY_COMMENT;
+       } elseif ($notification_type & Post\UserNotification::NOTIF_ACTIVITY_PARTICIPATION) {
+               $params['type'] = Notification\Type::COMMENT;
                $params['verb'] = Activity::POST;
        } else {
                return false;