]> git.mxchange.org Git - friendica.git/blobdiff - include/enotify.php
The fetch function now centrally controls the content
[friendica.git] / include / enotify.php
index f7a93a10f9cddab1e313bf8292402937d2b953f8..00459ac5c09f5fbd8b78d6bab49c1fa5edc12e4b 100644 (file)
@@ -2,25 +2,25 @@
 /**
  * @file include/enotify.php
  */
-use Friendica\App;
+
+use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Emailer;
-
-require_once 'include/bbcode.php';
-require_once 'include/html2bbcode.php';
+use Friendica\Model\Item;
 
 /**
  * @brief 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
*                     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
  */
 function notification($params)
 {
@@ -35,9 +35,9 @@ function notification($params)
        $thanks = L10n::t('Thank You,');
        $sitename = $a->config['sitename'];
        if (!x($a->config['admin_name'])) {
-           $site_admin = sprintf(L10n::t('%s Administrator'), $sitename);
+               $site_admin = L10n::t('%s Administrator', $sitename);
        } else {
-           $site_admin = sprintf(L10n::t('%1$s, %2$s Administrator'), $a->config['admin_name'], $sitename);
+               $site_admin = L10n::t('%1$s, %2$s Administrator', $a->config['admin_name'], $sitename);
        }
 
        $sender_name = $sitename;
@@ -46,10 +46,7 @@ function notification($params)
                $hostname = substr($hostname, 0, strpos($hostname, ':'));
        }
 
-       $sender_email = $a->config['sender_email'];
-       if (empty($sender_email)) {
-               $sender_email = L10n::t('noreply').'@'.$hostname;
-       }
+       $sender_email = $a->getSenderEmailAddress();
 
        if ($params['type'] != SYSTEM_EMAIL) {
                $user = dba::selectFirst('user', ['nickname', 'page-flags'],
@@ -96,10 +93,10 @@ function notification($params)
        }
 
        if ($params['type'] == NOTIFY_MAIL) {
-               $subject = sprintf(t('[Friendica:Notify] New mail received at %s'), $sitename);
+               $subject = L10n::t('[Friendica:Notify] New mail received at %s', $sitename);
 
-               $preamble = sprintf(t('%1$s sent you a new private message at %2$s.'), $params['source_name'], $sitename);
-               $epreamble = sprintf(t('%1$s sent you %2$s.'), '[url='.$params['source_link'].']'.$params['source_name'].'[/url]', '[url=$itemlink]'.t('a private message').'[/url]');
+               $preamble = L10n::t('%1$s sent you a new private message at %2$s.', $params['source_name'], $sitename);
+               $epreamble = L10n::t('%1$s sent you %2$s.', '[url='.$params['source_link'].']'.$params['source_name'].'[/url]', '[url=$itemlink]'.L10n::t('a private message').'[/url]');
 
                $sitelink = L10n::t('Please visit %s to view and/or reply to your private messages.');
                $tsitelink = sprintf($sitelink, $siteurl.'/message/'.$params['item']['id']);
@@ -133,32 +130,35 @@ function notification($params)
                $item = null;
 
                if ($params['otype'] === 'item' && $parent_id) {
-                       $item = dba::selectFirst('item', [], ['id' => $parent_id]);
+                       $item = Item::selectFirstForUser($params['uid'], [], ['id' => $parent_id]);
                }
 
                $item_post_type = item_post_type($item);
 
                // "a post"
-               $dest_str = sprintf(t('%1$s commented on [url=%2$s]a %3$s[/url]'),
-                                                               '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
-                                                               $itemlink,
-                                                               $item_post_type);
+               $dest_str = L10n::t('%1$s commented on [url=%2$s]a %3$s[/url]',
+                       '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
+                       $itemlink,
+                       $item_post_type
+               );
 
                // "George Bull's post"
                if ($item) {
-                       $dest_str = sprintf(t('%1$s commented on [url=%2$s]%3$s\'s %4$s[/url]'),
-                                               '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
-                                               $itemlink,
-                                               $item['author-name'],
-                                               $item_post_type);
+                       $dest_str = L10n::t('%1$s commented on [url=%2$s]%3$s\'s %4$s[/url]',
+                               '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
+                               $itemlink,
+                               $item['author-name'],
+                               $item_post_type
+                       );
                }
 
                // "your post"
-               if (DBM::is_result($item) && $item['owner-name'] == $item['author-name'] && $item['wall']) {
-                       $dest_str = sprintf(t('%1$s commented on [url=%2$s]your %3$s[/url]'),
-                                                               '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
-                                                               $itemlink,
-                                                               $item_post_type);
+               if (DBM::is_result($item) && $item['owner-id'] == $item['author-id'] && $item['wall']) {
+                       $dest_str = L10n::t('%1$s commented on [url=%2$s]your %3$s[/url]',
+                               '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
+                               $itemlink,
+                               $item_post_type
+                       );
                }
 
                // Some mail softwares relies on subject field for threading.
@@ -166,9 +166,9 @@ function notification($params)
                // Before this we have the name of the replier on the subject rendering
                // differents subjects for messages on the same thread.
 
-               $subject = sprintf(t('[Friendica:Notify] Comment to conversation #%1$d by %2$s'), $parent_id, $params['source_name']);
+               $subject = L10n::t('[Friendica:Notify] Comment to conversation #%1$d by %2$s', $parent_id, $params['source_name']);
 
-               $preamble = sprintf(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;
 
                $sitelink = L10n::t('Please visit %s to view and/or reply to the conversation.');
@@ -178,12 +178,13 @@ function notification($params)
        }
 
        if ($params['type'] == NOTIFY_WALL) {
-               $subject = sprintf(t('[Friendica:Notify] %s posted to your profile wall'), $params['source_name']);
+               $subject = L10n::t('[Friendica:Notify] %s posted to your profile wall', $params['source_name']);
 
-               $preamble = sprintf(t('%1$s posted to your profile wall at %2$s'), $params['source_name'], $sitename);
-               $epreamble = sprintf(t('%1$s posted to [url=%2$s]your wall[/url]'),
-                                       '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
-                                       $params['link']);
+               $preamble = L10n::t('%1$s posted to your profile wall at %2$s', $params['source_name'], $sitename);
+               $epreamble = L10n::t('%1$s posted to [url=%2$s]your wall[/url]',
+                       '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
+                       $params['link']
+               );
 
                $sitelink = L10n::t('Please visit %s to view and/or reply to the conversation.');
                $tsitelink = sprintf($sitelink, $siteurl);
@@ -192,12 +193,13 @@ function notification($params)
        }
 
        if ($params['type'] == NOTIFY_TAGSELF) {
-               $subject = sprintf(t('[Friendica:Notify] %s tagged you'), $params['source_name']);
+               $subject = L10n::t('[Friendica:Notify] %s tagged you', $params['source_name']);
 
-               $preamble = sprintf(t('%1$s tagged you at %2$s'), $params['source_name'], $sitename);
-               $epreamble = sprintf(t('%1$s [url=%2$s]tagged you[/url].'),
-                                       '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
-                                       $params['link']);
+               $preamble = L10n::t('%1$s tagged you at %2$s', $params['source_name'], $sitename);
+               $epreamble = L10n::t('%1$s [url=%2$s]tagged you[/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);
@@ -206,12 +208,13 @@ function notification($params)
        }
 
        if ($params['type'] == NOTIFY_SHARE) {
-               $subject = sprintf(t('[Friendica:Notify] %s shared a new post'), $params['source_name']);
+               $subject = L10n::t('[Friendica:Notify] %s shared a new post', $params['source_name']);
 
-               $preamble = sprintf(t('%1$s shared a new post at %2$s'), $params['source_name'], $sitename);
-               $epreamble = sprintf(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']
+               );
 
                $sitelink = L10n::t('Please visit %s to view and/or reply to the conversation.');
                $tsitelink = sprintf($sitelink, $siteurl);
@@ -220,12 +223,13 @@ function notification($params)
        }
 
        if ($params['type'] == NOTIFY_POKE) {
-               $subject = sprintf(t('[Friendica:Notify] %1$s poked you'), $params['source_name']);
+               $subject = L10n::t('[Friendica:Notify] %1$s poked you', $params['source_name']);
 
-               $preamble = sprintf(t('%1$s poked you at %2$s'), $params['source_name'], $sitename);
-               $epreamble = sprintf(t('%1$s [url=%2$s]poked you[/url].'),
-                                       '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
-                                       $params['link']);
+               $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);
@@ -238,12 +242,13 @@ function notification($params)
        }
 
        if ($params['type'] == NOTIFY_TAGSHARE) {
-               $subject = sprintf(t('[Friendica:Notify] %s tagged your post'), $params['source_name']);
+               $subject = L10n::t('[Friendica:Notify] %s tagged your post', $params['source_name']);
 
-               $preamble = sprintf(t('%1$s tagged your post at %2$s'), $params['source_name'], $sitename);
-               $epreamble = sprintf(t('%1$s tagged [url=%2$s]your post[/url]'),
-                                       '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
-                                       $itemlink);
+               $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);
@@ -252,14 +257,15 @@ function notification($params)
        }
 
        if ($params['type'] == NOTIFY_INTRO) {
-               $subject = sprintf(t('[Friendica:Notify] Introduction received'));
+               $subject = L10n::t('[Friendica:Notify] Introduction received');
 
-               $preamble = sprintf(t('You\'ve received an introduction from \'%1$s\' at %2$s'), $params['source_name'], $sitename);
-               $epreamble = sprintf(t('You\'ve received [url=%1$s]an introduction[/url] from %2$s.'),
-                                       $itemlink,
-                                       '[url='.$params['source_link'].']'.$params['source_name'].'[/url]');
+               $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 = sprintf(t('You may visit their profile at %s'), $params['source_link']);
+               $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);
@@ -269,21 +275,23 @@ function notification($params)
                switch ($params['verb']) {
                        case ACTIVITY_FRIEND:
                                // someone started to share with user (mostly OStatus)
-                               $subject = sprintf(t('[Friendica:Notify] A new person is sharing with you'));
+                               $subject = L10n::t('[Friendica:Notify] A new person is sharing with you');
 
-                               $preamble = sprintf(t('%1$s is sharing with you at %2$s'), $params['source_name'], $sitename);
-                               $epreamble = sprintf(t('%1$s is sharing with you at %2$s'),
-                                                       '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
-                                                       $sitename);
+                               $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 = sprintf(t('[Friendica:Notify] You have a new follower'));
+                               $subject = L10n::t('[Friendica:Notify] You have a new follower');
 
-                               $preamble = sprintf(t('You have a new follower at %2$s : %1$s'), $params['source_name'], $sitename);
-                               $epreamble = sprintf(t('You have a new follower at %2$s : %1$s'),
-                                                       '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
-                                                       $sitename);
+                               $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
@@ -292,17 +300,18 @@ function notification($params)
        }
 
        if ($params['type'] == NOTIFY_SUGGEST) {
-               $subject = sprintf(t('[Friendica:Notify] Friend suggestion received'));
+               $subject = L10n::t('[Friendica:Notify] Friend suggestion received');
 
-               $preamble = sprintf(t('You\'ve received a friend suggestion from \'%1$s\' at %2$s'), $params['source_name'], $sitename);
-               $epreamble = sprintf(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]');
+               $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 .= sprintf(t('You may visit their profile at %s'), $params['item']['url']);
+               $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);
@@ -312,12 +321,13 @@ function notification($params)
 
        if ($params['type'] == NOTIFY_CONFIRM) {
                if ($params['verb'] == ACTIVITY_FRIEND) { // mutual connection
-                       $subject = sprintf(t('[Friendica:Notify] Connection accepted'));
+                       $subject = L10n::t('[Friendica:Notify] Connection accepted');
 
-                       $preamble = sprintf(t('\'%1$s\' has accepted your connection request at %2$s'), $params['source_name'], $sitename);
-                       $epreamble = sprintf(t('%2$s has accepted your [url=%1$s]connection request[/url].'),
-                                               $itemlink,
-                                               '[url='.$params['source_link'].']'.$params['source_name'].'[/url]');
+                       $preamble = L10n::t('\'%1$s\' has accepted your connection request at %2$s', $params['source_name'], $sitename);
+                       $epreamble = L10n::t('%2$s has accepted your [url=%1$s]connection request[/url].',
+                               $itemlink,
+                               '[url='.$params['source_link'].']'.$params['source_name'].'[/url]'
+                       );
 
                        $body =  L10n::t('You are now mutual friends and may exchange status updates, photos, and email without restriction.');
 
@@ -326,16 +336,17 @@ function notification($params)
                        $hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'">'.$sitename.'</a>');
                        $itemlink =  $params['link'];
                } else { // ACTIVITY_FOLLOW
-                       $subject = sprintf(t('[Friendica:Notify] Connection accepted'));
+                       $subject = L10n::t('[Friendica:Notify] Connection accepted');
 
-                       $preamble = sprintf(t('\'%1$s\' has accepted your connection request at %2$s'), $params['source_name'], $sitename);
-                       $epreamble = sprintf(t('%2$s has accepted your [url=%1$s]connection request[/url].'),
-                                               $itemlink,
-                                               '[url='.$params['source_link'].']'.$params['source_name'].'[/url]');
+                       $preamble = L10n::t('\'%1$s\' has accepted your connection request at %2$s', $params['source_name'], $sitename);
+                       $epreamble = L10n::t('%2$s has accepted your [url=%1$s]connection request[/url].',
+                               $itemlink,
+                               '[url='.$params['source_link'].']'.$params['source_name'].'[/url]'
+                       );
 
-                       $body =  sprintf(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('\'%1$s\' has chosen to accept you a fan, which restricts some forms of communication - such as private messaging and some profile interactions. If this is a celebrity or community page, these settings were applied automatically.', $params['source_name']);
                        $body .= "\n\n";
-                       $body .= sprintf(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('\'%1$s\' may choose to extend this into a two-way or more permissive relationship in the future.', $params['source_name']);
 
                        $sitelink = L10n::t('Please visit %s  if you wish to make any changes to this relationship.');
                        $tsitelink = sprintf($sitelink, $siteurl);
@@ -347,15 +358,19 @@ function notification($params)
        if ($params['type'] == NOTIFY_SYSTEM) {
                switch($params['event']) {
                        case "SYSTEM_REGISTER_REQUEST":
-                               $subject = sprintf(t('[Friendica System:Notify] registration request'));
+                               $subject = L10n::t('[Friendica System Notify]') . ' ' . L10n::t('registration request');
 
-                               $preamble = sprintf(t('You\'ve received a registration request from \'%1$s\' at %2$s'), $params['source_name'], $sitename);
-                               $epreamble = sprintf(t('You\'ve received a [url=%1$s]registration request[/url] from %2$s.'),
-                                                       $itemlink,
-                                                       '[url='.$params['source_link'].']'.$params['source_name'].'[/url]');
+                               $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 = sprintf(t('Full Name:   %1$s\nSite Location:    %2$s\nLogin Name:       %3$s (%4$s)'),
-                                                                       $params['source_name'], $siteurl, $params['source_mail'], $params['source_nick']);
+                               $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']);
@@ -429,10 +444,10 @@ function notification($params)
                $datarray = [];
                $datarray['hash']  = $hash;
                $datarray['name']  = $params['source_name'];
-               $datarray['name_cache'] = strip_tags(bbcode($params['source_name']));
+               $datarray['name_cache'] = strip_tags(BBCode::convert($params['source_name']));
                $datarray['url']   = $params['source_link'];
                $datarray['photo'] = $params['source_photo'];
-               $datarray['date']  = datetime_convert();
+               $datarray['date']  = DateTimeFormat::utcNow();
                $datarray['uid']   = $params['uid'];
                $datarray['link']  = $itemlink;
                $datarray['iid']   = $item_id;
@@ -500,7 +515,7 @@ function notification($params)
 
                $itemlink = System::baseUrl().'/notify/view/'.$notify_id;
                $msg = replace_macros($epreamble, ['$itemlink' => $itemlink]);
-               $msg_cache = format_notification_message($datarray['name_cache'], strip_tags(bbcode($msg)));
+               $msg_cache = format_notification_message($datarray['name_cache'], strip_tags(BBCode::convert($msg)));
                q("UPDATE `notify` SET `msg` = '%s', `msg_cache` = '%s' WHERE `id` = %d AND `uid` = %d",
                        dbesc($msg),
                        dbesc($msg_cache),
@@ -547,11 +562,8 @@ function notification($params)
                        }
                }
 
-               // textversion keeps linebreaks
-               $textversion = strip_tags(str_replace("<br>", "\n", html_entity_decode(bbcode(stripslashes(str_replace(["\\r\\n", "\\r", "\\n"], "\n",
-                       $body))),ENT_QUOTES, 'UTF-8')));
-               $htmlversion = html_entity_decode(bbcode(stripslashes(str_replace(["\\r\\n", "\\r", "\\n\\n", "\\n"],
-                       "<br />\n", $body))), ENT_QUOTES, 'UTF-8');
+               $textversion = BBCode::toPlaintext($body);
+               $htmlversion = BBCode::convert($body);
 
                $datarray = [];
                $datarray['banner'] = $banner;
@@ -712,27 +724,34 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
 
        $profiles = $profiles2;
 
-       $profile_list = "";
+       $ret = dba::select('contact', ['id'], ['uid' => 0, 'nurl' => $profiles]);
 
-       foreach ($profiles AS $profile) {
-               if ($profile_list != "")
-                       $profile_list .= "', '";
+       $contacts = [];
 
-               $profile_list .= dbesc($profile);
+       while ($contact = dba::fetch($ret)) {
+               $contacts[] = $contact['id'];
        }
 
-       $profile_list = "'".$profile_list."'";
+       $contact_list = implode(',', $contacts);
+
+       dba::close($ret);
 
        // Only act if it is a "real" post
        // We need the additional check for the "local_profile" because of mixed situations on connector networks
-       $item = q("SELECT `id`, `mention`, `tag`,`parent`, `title`, `body`, `author-name`, `author-link`, `author-avatar`, `guid`,
-                       `parent-uri`, `uri`, `contact-id`
+       $item = q("SELECT `id`, `mention`, `tag`,`parent`, `title`, `body`, `author-id`, `guid`,
+                       `parent-uri`, `uri`, `contact-id`, `network`
                        FROM `item` WHERE `id` = %d AND `verb` IN ('%s', '') AND `type` != 'activity' AND
-                               NOT (`author-link` IN ($profile_list))  LIMIT 1",
+                               NOT (`author-id` IN ($contact_list)) LIMIT 1",
                intval($itemid), dbesc(ACTIVITY_POST));
        if (!$item)
                return false;
 
+       if ($item[0]['network'] != NETWORK_FEED) {
+               $author = dba::selectFirst('contact', ['name', 'thumb', 'url'], ['id' => $item[0]['author-id']]);
+       } else {
+               $author = dba::selectFirst('contact', ['name', 'thumb', 'url'], ['id' => $item[0]['contact-id']]);
+       }
+
        // Generate the notification array
        $params = [];
        $params["uid"] = $uid;
@@ -744,9 +763,9 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
        $params["parent"] = $item[0]["parent"];
        $params["link"] = System::baseUrl().'/display/'.urlencode($item[0]["guid"]);
        $params["otype"] = 'item';
-       $params["source_name"] = $item[0]["author-name"];
-       $params["source_link"] = $item[0]["author-link"];
-       $params["source_photo"] = $item[0]["author-avatar"];
+       $params["source_name"] = $author["name"];
+       $params["source_link"] = $author["url"];
+       $params["source_photo"] = $author["thumb"];
 
        if ($item[0]["parent-uri"] === $item[0]["uri"]) {
                // Send a notification for every new post?
@@ -789,7 +808,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
        // Is it a post that the user had started or where he interacted?
        $parent = q("SELECT `thread`.`iid` FROM `thread` INNER JOIN `item` ON `item`.`parent` = `thread`.`iid`
                        WHERE `thread`.`iid` = %d AND NOT `thread`.`ignored` AND
-                               (`thread`.`mention` OR `item`.`author-link` IN ($profile_list))
+                               (`thread`.`mention` OR `item`.`author-id` IN ($contact_list))
                        LIMIT 1",
                        intval($item[0]["parent"]));