Move Notify::TYPE_SHARE

diff --git a/boot.php b/boot.php
index 84d4300341216a61538b3d6b64330171a4ce486e..df7dc85608e42f135c23bf47a8711af85a076324 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -140,7 +140,6 @@ define('MAX_LIKERS',    75);
  * Email notification options
  * @{
  */
-define('NOTIFY_SHARE',     1024);
 
 define('NOTIFY_SYSTEM',   32768);
 /* @}*/

diff --git a/include/enotify.php b/include/enotify.php
index 31983d8947ecb6a40769e72ad76052d7d5daca4f..6d261720e56ee71fae1c578b368d5249dbc8eb4e 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -126,7 +126,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\Type::TAG_SELF, Notify\Type::COMMENT, NOTIFY_SHARE],
+               $condition = ['type' => [Notify\Type::TAG_SELF, Notify\Type::COMMENT, Notify\Type::SHARE],
                        'link' => $params['link'], 'uid' => $params['uid']];
                if (DBA::exists('notify', $condition)) {
                        return false;
@@ -227,7 +227,7 @@ function notification($params)
                $itemlink =  $params['link'];
        }
 
-       if ($params['type'] == NOTIFY_SHARE) {
+       if ($params['type'] == Notify\Type::SHARE) {
                $subject = $l10n->t('[Friendica:Notify] %s shared a new post', $params['source_name']);
 
                $preamble = $l10n->t('%1$s shared a new post at %2$s', $params['source_name'], $sitename);
@@ -589,7 +589,7 @@ function check_item_notification($itemid, $uid, $notification_type) {
        }
 
        if ($notification_type & UserItem::NOTIF_SHARED) {
-               $params['type'] = NOTIFY_SHARE;
+               $params['type'] = Notify\Type::SHARE;
                $params['verb'] = Activity::POST;
        } elseif ($notification_type & UserItem::NOTIF_EXPLICIT_TAGGED) {
                $params['type'] = Notify\Type::TAG_SELF;

diff --git a/src/Model/Notify/Type.php b/src/Model/Notify/Type.php
index 80e5c493754f0b0f1254533aee61d90769ab62e5..f15c1b76a75989c0fc00a3110ba64aacb8cd649d 100644 (file)
--- a/src/Model/Notify/Type.php
+++ b/src/Model/Notify/Type.php
@@ -31,4 +31,6 @@ class Type
        const TAG_SHARE = 256;
        /** @var int Notification about getting poked/prodded/etc. */
        const POKE = 512;
+       /** @var int Notification about either a contact had posted something directly or the contact is a mentioned forum */
+       const SHARE = 1024;
 }