Improved notification messages

diff --git a/include/enotify.php b/include/enotify.php
index ced0a285e4d1c17d8bbd98e735e834a4d220d705..b81f160390f333346dd9ff4c63d2c5a63717db3f 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -14,6 +14,7 @@ use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\DI;
 use Friendica\Model\Item;
+use Friendica\Model\ItemContent;
 use Friendica\Model\User;
 use Friendica\Model\UserItem;
 use Friendica\Protocol\Activity;
@@ -154,6 +155,7 @@ function notification($params)
 
                // Check to see if there was already a tag notify or comment notify for this post.
                // If so don't create a second notification
+               /// @todo In the future we should store the notification with the highest "value" and replace notifications
                $condition = ['type' => [NOTIFY_TAGSELF, NOTIFY_COMMENT, NOTIFY_SHARE],
                        'link' => $params['link'], 'uid' => $params['uid']];
                if (DBA::exists('notify', $condition)) {
@@ -166,82 +168,63 @@ function notification($params)
                        $item = Item::selectFirstForUser($params['uid'], Item::ITEM_FIELDLIST, ['id' => $parent_id, 'deleted' => false]);
                }
 
+               if (empty($item)) {
+                       return false;
+               }
+
                $item_post_type = Item::postType($item);
-               $itemlink = $item['plink'];
 
-               // "a post"
-               if ($params['type'] == NOTIFY_TAGSELF) {
-                       $dest_str = $l10n->t('%1$s tagged you on [url=%2$s]a %3$s[/url]',
-                               '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]',
-                               $itemlink,
-                               $item_post_type
-                       );
+               $content = ItemContent::getPlaintextPost($item, 70);
+               if (!empty($content['text'])) {
+                       $title = '"' . trim(str_replace("\n", " ", $content['text'])) . '"';
                } else {
-                       $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
-                       );
+                       $title = '';
                }
 
+               // First go for the general message
+
                // "George Bull's post"
-               if (DBA::isResult($item)) {
-                       if ($params['type'] == NOTIFY_TAGSELF) {
-                               $dest_str = $l10n->t('%1$s tagged you 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
-                               );
-                       } else {
-                               $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
-                               );
-                       }
+               if ($params['activity']['explicit_tagged']) {
+                       $message = '%1$s tagged you on %2$s\'s %3$s %4$s';
+               } elseif ($params['activity']['origin_comment']) {
+                       $message = '%1$s answered you on %2$s\'s %3$s %4$s';
+               } else {
+                       $message = '%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);
+
+               // Then look for the special cases
+
                // "your post"
-               if (DBA::isResult($item) && $item['owner-id'] == $item['author-id'] && $item['wall']) {
-                       if ($params['type'] == NOTIFY_TAGSELF) {
-                               $dest_str = $l10n->t('%1$s tagged you on [url=%2$s]your %3$s[/url]',
-                                       '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]',
-                                       $itemlink,
-                                       $item_post_type
-                               );
+               if ($params['activity']['origin_thread']) {
+                       if ($params['activity']['explicit_tagged']) {
+                               $message = '%1$s tagged you on your %2$s %3$s';
+                       } elseif ($params['activity']['origin_comment']) {
+                               $message = '%1$s answered you on your %2$s %3$s';
                        } else {
-                               $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
-                               );
+                               $message = '%1$s commented on your %2$s %3$s';
                        }
-               }
 
+                       $dest_str = $l10n->t($message, $params['source_name'], $item_post_type, $title);
                // "their post"
-               if (DBA::isResult($item) && $item['author-link'] == $params['source_link']) {
-                       if ($params['type'] == NOTIFY_TAGSELF) {
-                               $dest_str = $l10n->t('%1$s tagged you on [url=%2$s]their %3$s[/url]',
-                                       '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]',
-                                       $itemlink,
-                                       $item_post_type
-                               );
+               } elseif ($item['author-link'] == $params['source_link']) {
+                       if ($params['activity']['explicit_tagged']) {
+                               $message = '%1$s tagged you on their %2$s %3$s';
+                       } elseif ($params['activity']['origin_comment']) {
+                               $message = '%1$s answered you on their %2$s %3$s';
                        } else {
-                               $dest_str = $l10n->t('%1$s commented on [url=%2$s]their %3$s[/url]',
-                                       '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]',
-                                       $itemlink,
-                                       $item_post_type
-                               );
+                               $message = '%1$s commented on their %2$s %3$s';
                        }
+
+                       $dest_str = $l10n->t($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['type'] == NOTIFY_TAGSELF) {
+               if ($params['activity']['explicit_tagged']) {
                        $subject = $l10n->t('[Friendica:Notify] %s tagged you', $params['source_name']);
 
                        $preamble = $l10n->t('%1$s tagged you at %2$s', $params['source_name'], $sitename);
@@ -713,15 +696,23 @@ function check_item_notification($itemid, $uid, $notification_type) {
        $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);
+
        if ($notification_type & UserItem::NOTIF_SHARED) {
                $params['type'] = NOTIFY_SHARE;
-               $params['verb'] = Activity::TAG;
+               $params['verb'] = Activity::POST;
        } elseif ($notification_type & UserItem::NOTIF_EXPLICIT_TAGGED) {
                $params['type'] = NOTIFY_TAGSELF;
                $params['verb'] = Activity::TAG;
        } elseif ($notification_type & UserItem::NOTIF_IMPLICIT_TAGGED) {
-               $params['type'] = NOTIFY_TAGSELF;
-               $params['verb'] = Activity::TAG;
+               $params['type'] = NOTIFY_COMMENT;
+               $params['verb'] = Activity::POST;
        } elseif ($notification_type & UserItem::NOTIF_THREAD_COMMENT) {
                $params['type'] = NOTIFY_COMMENT;
                $params['verb'] = Activity::POST;